diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-18 14:31:12 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-18 14:34:26 -0300 |
| commit | 12fb9372bf75d73481b3323b2c84d1851f5d6304 (patch) | |
| tree | 1cc73363544f2c291b19f5d2bb2769326b643f92 | |
| parent | 55d153ea8d3a6cc9e30636f0dbf423cac16c4ae7 (diff) | |
| download | rails-12fb9372bf75d73481b3323b2c84d1851f5d6304.tar.gz rails-12fb9372bf75d73481b3323b2c84d1851f5d6304.tar.bz2 rails-12fb9372bf75d73481b3323b2c84d1851f5d6304.zip | |
Fix the app_generator and plugin_new tests
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 3 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index e761e26b04..09ce81d0f9 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -138,12 +138,14 @@ module Rails end def rails_gemfile_entry + # TODO remove sprockets-rails from this list when the version 2.0 is realease if options.dev? <<-GEMFILE.strip_heredoc gem 'rails', path: '#{Rails::Generators::RAILS_DEV_PATH}' gem 'journey', github: 'rails/journey' gem 'arel', github: 'rails/arel' gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders' + gem 'sprockets-rails', github: 'rails/sprockets-rails' GEMFILE elsif options.edge? <<-GEMFILE.strip_heredoc @@ -151,6 +153,7 @@ module Rails gem 'journey', github: 'rails/journey' gem 'arel', github: 'rails/arel' gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders' + gem 'sprockets-rails', github: 'rails/sprockets-rails' GEMFILE else <<-GEMFILE.strip_heredoc diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 3d1252505a..62e1f3531e 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -223,7 +223,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\/rails\/railtie["']/, content) + assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content) assert_no_match(/config\.assets\.enabled = true/, content) end assert_file "Gemfile" do |content| |