diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-21 15:55:15 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-21 19:59:09 -0300 |
| commit | 35c8a896fc75c222834e1324fe4710c1ba2645c4 (patch) | |
| tree | c5c29201feddd96b99f59515e417db34a56cf0a3 /railties/test | |
| parent | 63d3809e31cc9c0ed3b2e30617310407ae614fd4 (diff) | |
| download | rails-35c8a896fc75c222834e1324fe4710c1ba2645c4.tar.gz rails-35c8a896fc75c222834e1324fe4710c1ba2645c4.tar.bz2 rails-35c8a896fc75c222834e1324fe4710c1ba2645c4.zip | |
Merge pull request #2620 from cesario/3-1-0
Fix CI and rename 1 misleading test case.
Diffstat (limited to 'railties/test')
| -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 fb7ebaa1fa..2415195a17 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -189,7 +189,7 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "test/performance/browsing_test.rb" end - def test_generator_if_skip_active_record_is_given + 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) |