Skip to content

Commit d67a424

Browse files
committed
Merge pull request #301 from rails/fix-glob-virtual-file
Fix glob caching bug
2 parents d8346a0 + 86f5ed9 commit d67a424

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

lib/sass/rails/importer.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def glob_imports(base, glob, options)
3535
end
3636
return nil if contents == ""
3737
Sass::Engine.new(contents, options.merge(
38+
:filename => base,
3839
:importer => self,
3940
:syntax => :scss
4041
))

test/sass_rails_test.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,23 @@ class SassRailsTest < Sass::Rails::TestCase
149149
end
150150
end
151151

152+
test 'globbed imports work when globbed file is changed' do
153+
project = 'scss_project'
154+
filename = 'application.scss'
155+
156+
within_rails_app(project) do |tmpdir|
157+
asset_output(filename)
158+
159+
new_file = File.join(tmpdir, 'app', 'assets', 'stylesheets', 'globbed', 'globbed.scss')
160+
File.open(new_file, 'w') do |file|
161+
file.puts '.changed-file-test { color: #000; }'
162+
end
163+
164+
css_output = asset_output(filename)
165+
assert_match /changed-file-test/, css_output
166+
end
167+
end
168+
152169
test 'sass asset paths work' do
153170
css_output = sprockets_render('scss_project', 'application.scss')
154171
assert_match %r{asset-path:\s*"/assets/rails.png"}, css_output, 'asset-path:\s*"/assets/rails.png"'

0 commit comments

Comments
 (0)