From b5892f867bd101d3f07a00f414123345b21bc085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Barri=C3=A9?= Date: Tue, 30 Mar 2021 15:36:55 -0400 Subject: [PATCH] Rails 6.0 Active Storage compatibility for tests * Make service_name nullable because it does not exist in 6.0. * Make the download URL assertion compatible with the 6.0 download URLs. Co-authored-by: Adrianna Chang --- ...0210112141723_create_active_storage_tables.active_storage.rb | 2 +- test/dummy/db/schema.rb | 2 +- test/helpers/maintenance_tasks/tasks_helper_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/dummy/db/migrate/20210112141723_create_active_storage_tables.active_storage.rb b/test/dummy/db/migrate/20210112141723_create_active_storage_tables.active_storage.rb index 48cced06..b50249d1 100644 --- a/test/dummy/db/migrate/20210112141723_create_active_storage_tables.active_storage.rb +++ b/test/dummy/db/migrate/20210112141723_create_active_storage_tables.active_storage.rb @@ -7,7 +7,7 @@ def change t.string(:filename, null: false) t.string(:content_type) t.text(:metadata) - t.string(:service_name, null: false) + t.string(:service_name, null: true) t.bigint(:byte_size, null: false) t.string(:checksum, null: false) t.datetime(:created_at, null: false) diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb index 77f5a3c7..511e7cd9 100644 --- a/test/dummy/db/schema.rb +++ b/test/dummy/db/schema.rb @@ -27,7 +27,7 @@ t.string "filename", null: false t.string "content_type" t.text "metadata" - t.string "service_name", null: false + t.string "service_name" t.bigint "byte_size", null: false t.string "checksum", null: false t.datetime "created_at", null: false diff --git a/test/helpers/maintenance_tasks/tasks_helper_test.rb b/test/helpers/maintenance_tasks/tasks_helper_test.rb index bdf983b6..461c5daa 100644 --- a/test/helpers/maintenance_tasks/tasks_helper_test.rb +++ b/test/helpers/maintenance_tasks/tasks_helper_test.rb @@ -93,7 +93,7 @@ class TasksHelperTest < ActionView::TestCase csv = Rack::Test::UploadedFile.new(file_fixture("sample.csv"), "text/csv") run.csv_file.attach(csv) - assert_match %r{rails\/active_storage\/blobs\/redirect\/\S+\/sample.csv}, + assert_match %r{rails/active_storage/blobs/\S+/sample.csv}, csv_file_download_path(run) end end