diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-13 16:08:13 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-13 16:08:13 -0700 |
| commit | c1f397f82c7b3f352500832a399b5dbdc500b9c8 (patch) | |
| tree | 218de73b69ff4c7d4dd1847926436146d6546edd /railties/test/generators | |
| parent | adafefb51d8ffda7d9f30a874d61ee4ce1b998bb (diff) | |
| parent | e823c8bd6f34ef297393e0c543f55627f6165c87 (diff) | |
| download | rails-c1f397f82c7b3f352500832a399b5dbdc500b9c8.tar.gz rails-c1f397f82c7b3f352500832a399b5dbdc500b9c8.tar.bz2 rails-c1f397f82c7b3f352500832a399b5dbdc500b9c8.zip | |
Merge pull request #5409 from rails/sprockets-rails
Remove sprockets integration from actionpack
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index cf6f9b90c9..4db0cdc28e 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -213,7 +213,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_generator_if_skip_sprockets_is_given run_generator [destination_root, "--skip-sprockets"] assert_file "config/application.rb" do |content| - assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content) + assert_match(/#\s+require\s+["']sprockets\/rails\/railtie["']/, content) assert_no_match(/config\.assets\.enabled = true/, content) end assert_file "Gemfile" do |content| |