diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-07-02 01:23:28 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-07-02 02:05:07 +0900 |
| commit | 0ba55d2e0c251451eede1da069666eb15e86b2c7 (patch) | |
| tree | 0577d96f740182c04fcf8a7f6bb8f31da1077eaf /activerecord/test | |
| parent | 310918f6a194bf5752fe1025930881756f5d8a8e (diff) | |
| download | rails-0ba55d2e0c251451eede1da069666eb15e86b2c7.tar.gz rails-0ba55d2e0c251451eede1da069666eb15e86b2c7.tar.bz2 rails-0ba55d2e0c251451eede1da069666eb15e86b2c7.zip | |
Fix `test_copying_migrations_preserving_magic_comments`
Since #29540, `# frozen_string_literal: true` included original
migration files.
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/migration_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/migrations/magic/1_currencies_have_symbols.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 3a49a41580..eff6e09eb7 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -1015,8 +1015,8 @@ class CopyMigrationsTest < ActiveRecord::TestCase assert File.exist?(@migrations_path + "/4_currencies_have_symbols.bukkits.rb") assert_equal [@migrations_path + "/4_currencies_have_symbols.bukkits.rb"], copied.map(&:filename) - expected = "# coding: ISO-8859-15\n# This migration comes from bukkits (originally 1)" - assert_equal expected, IO.readlines(@migrations_path + "/4_currencies_have_symbols.bukkits.rb")[0..1].join.chomp + expected = "# frozen_string_literal: true\n# coding: ISO-8859-15\n# This migration comes from bukkits (originally 1)" + assert_equal expected, IO.readlines(@migrations_path + "/4_currencies_have_symbols.bukkits.rb")[0..2].join.chomp files_count = Dir[@migrations_path + "/*.rb"].length copied = ActiveRecord::Migration.copy(@migrations_path, bukkits: MIGRATIONS_ROOT + "/magic") diff --git a/activerecord/test/migrations/magic/1_currencies_have_symbols.rb b/activerecord/test/migrations/magic/1_currencies_have_symbols.rb index d4b0e6cd95..2ba2875751 100644 --- a/activerecord/test/migrations/magic/1_currencies_have_symbols.rb +++ b/activerecord/test/migrations/magic/1_currencies_have_symbols.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # coding: ISO-8859-15 class CurrenciesHaveSymbols < ActiveRecord::Migration::Current |