File tree Expand file tree Collapse file tree 2 files changed +19
-6
lines changed Expand file tree Collapse file tree 2 files changed +19
-6
lines changed Original file line number Diff line number Diff line change @@ -34,9 +34,6 @@ def assets
34
34
env . context_class . class_eval do
35
35
include ::Sprockets ::Rails ::Helper
36
36
end
37
- env . context_class . assets_prefix = config . assets . prefix
38
- env . context_class . digest_assets = config . assets . digest
39
- env . context_class . config = config . action_controller
40
37
end
41
38
42
39
@assets
@@ -84,9 +81,16 @@ def configure(&block)
84
81
ActiveSupport . on_load ( :action_view ) do
85
82
include Sprockets ::Rails ::Helper
86
83
87
- self . debug_assets = app . config . assets . debug
88
- self . digest_assets = app . config . assets . digest
89
- self . assets_prefix = app . config . assets . prefix
84
+ # Copy relevant config to AV context
85
+ self . debug_assets = app . config . assets . debug
86
+ self . digest_assets = app . config . assets . digest
87
+ self . assets_prefix = app . config . assets . prefix
88
+
89
+ # Copy over to Sprockets as well
90
+ context = app . assets . context_class
91
+ context . assets_prefix = app . config . assets . prefix
92
+ context . digest_assets = app . config . assets . digest
93
+ context . config = app . config . action_controller
90
94
91
95
if app . config . assets . compile
92
96
self . assets_environment = app . assets
Original file line number Diff line number Diff line change @@ -131,4 +131,13 @@ def test_action_view_helper
131
131
assert_equal "/javascripts/xmlhr.js" , @view . javascript_path ( "xmlhr" )
132
132
assert_equal "/assets/foo.js" , @view . javascript_path ( "foo" )
133
133
end
134
+
135
+ def test_sprockets_context_helper
136
+ app . initialize!
137
+
138
+ assert env = app . assets
139
+ assert_equal "/assets" , env . context_class . assets_prefix
140
+ assert_equal false , env . context_class . digest_assets
141
+ assert_equal nil , env . context_class . config . asset_host
142
+ end
134
143
end
You can’t perform that action at this time.
0 commit comments