Skip to content
Browse files

The sprockets railtie was moved to sprockets/rails/railtie

  • Loading branch information...
1 parent 272d3d7 commit e8296a02880e2cb68b14586da3e77daf54c10125 @guilleiguaran guilleiguaran committed Mar 13, 2012
View
2 railties/lib/rails/all.rb
@@ -5,7 +5,7 @@
action_controller
action_mailer
rails/test_unit
- sprockets
+ sprockets/rails
).each do |framework|
begin
require "#{framework}/railtie"
View
2 railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -7,7 +7,7 @@
<%= comment_if :skip_active_record %>require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
-<%= comment_if :skip_sprockets %>require "sprockets/railtie"
+<%= comment_if :skip_sprockets %>require "sprockets/rails/railtie"
<%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
<% end -%>
View
2 railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
@@ -7,7 +7,7 @@
<%= comment_if :skip_active_record %>require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
-<%= comment_if :skip_sprockets %>require "sprockets/railtie"
+<%= comment_if :skip_sprockets %>require "sprockets/rails/railtie"
<%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
<% end -%>
View
2 railties/test/generators/app_generator_test.rb
@@ -213,7 +213,7 @@ 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)
+ assert_match(/#\s+require\s+["']sprockets\/rails\/railtie["']/, content)
assert_no_match(/config\.assets\.enabled = true/, content)
end
assert_file "Gemfile" do |content|

0 comments on commit e8296a0

Please sign in to comment.
Something went wrong with that request. Please try again.