aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-30 17:42:19 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-30 17:42:19 -0200
commit692bb7cebc7df6494adf6b068321eb3fc29acaf9 (patch)
treed1ce31577d8dc835fba0c52a2a9b5ee389da31ca /railties
parentf390bd42b8fec6423567e782a2716bda95295f9d (diff)
downloadrails-692bb7cebc7df6494adf6b068321eb3fc29acaf9.tar.gz
rails-692bb7cebc7df6494adf6b068321eb3fc29acaf9.tar.bz2
rails-692bb7cebc7df6494adf6b068321eb3fc29acaf9.zip
Add sass-rails back to the default Gemfile
It was removed by mistake at 877a411d0c16baa4e670dae9a28f5cfcc201adc1
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
-rw-r--r--railties/test/generators/app_generator_test.rb7
2 files changed, 9 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 064b109a6f..297ccb1dbf 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -281,6 +281,8 @@ module Rails
return [] if options[:skip_sprockets]
gems = []
+ gems << GemfileEntry.version('sass-rails', '~> 5.0',
+ 'Use SCSS for stylesheets')
gems << GemfileEntry.version('uglifier',
'>= 1.3.0',
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 314d8c50b0..e5480180ce 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -361,6 +361,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
end
end
+ def test_generator_has_assets_gems
+ run_generator
+
+ assert_gem 'sass-rails'
+ assert_gem 'uglifier'
+ end
+
def test_generator_if_skip_sprockets_is_given
run_generator [destination_root, "--skip-sprockets"]
assert_no_file "config/initializers/assets.rb"