aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-04-17 12:24:15 +0200
committerGitHub <noreply@github.com>2017-04-17 12:24:15 +0200
commit612572746c311b69d617a7f0d6eb6bdbad82780c (patch)
tree5408f951c50605b22b0697b69d648a329d8fec36 /railties/test
parentee8beaa41bbe6ed47d40be45ce37abb3fb1b79be (diff)
parenta4c1282854795d1f0d7696ce1ccbabf94b3d9098 (diff)
downloadrails-612572746c311b69d617a7f0d6eb6bdbad82780c.tar.gz
rails-612572746c311b69d617a7f0d6eb6bdbad82780c.tar.bz2
rails-612572746c311b69d617a7f0d6eb6bdbad82780c.zip
Merge pull request #28685 from rails/smooth-form-with-upgrading
Smooth form with upgrading
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 7965bd68d0..d3e131db94 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -410,7 +410,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
assert_no_match(/config\.assets\.js_compressor = :uglifier/, content)
assert_no_match(/config\.assets\.css_compressor = :sass/, content)
end
- assert_no_file "config/initializers/new_framework_defaults_5_1.rb"
end
def test_generator_if_skip_yarn_is_given