Merge pull request #350 from craigisrael/find_erb_when_importing_glob

rafaelfranca · rafaelfranca · commit 6e4eee736bcb · 2015-10-20T14:59:18.000-02:00
Find erb when importing glob
diff --git a/lib/sass/rails/importer.rb b/lib/sass/rails/importer.rb
@@ -145,8 +145,8 @@ def deprecate_extra_css_extension(engine)
           end
       end
 
-      include Deprecated
       include ERB
+      include Deprecated
       include Globbing
 
       # Allow .css files to be @import'd
diff --git a/test/fixtures/scss_project/app/assets/stylesheets/globbed/nested/nested_glob_erb.scss.erb b/test/fixtures/scss_project/app/assets/stylesheets/globbed/nested/nested_glob_erb.scss.erb
@@ -0,0 +1,3 @@
+.nested-glob-erb {
+  color: <%= 'blue' %>;
+}
diff --git a/test/fixtures/scss_project/app/assets/stylesheets/globbed/nested/nested_glob_erb_css_scss.css.scss.erb b/test/fixtures/scss_project/app/assets/stylesheets/globbed/nested/nested_glob_erb_css_scss.css.scss.erb
@@ -0,0 +1,3 @@
+.nested-glob-erb-css-scss {
+  color: <%= 'blue' %>;
+}
diff --git a/test/sass_rails_test.rb b/test/sass_rails_test.rb
@@ -125,6 +125,8 @@ class SassRailsTest < Sass::Rails::TestCase
     assert_match /not-a-partial/,            css_output
     assert_match /globbed/,                  css_output
     assert_match /nested-glob/,              css_output
+    assert_match /nested-glob-erb/,          css_output
+    assert_match /nested-glob-erb-css-scss/, css_output
     assert_match /plain-old-css/,            css_output
     assert_match /another-plain-old-css/,    css_output
     assert_match /without-css-ext/,          css_output
