From ef7090cca18f6f69e904a8deedbc90824e2eb18a Mon Sep 17 00:00:00 2001 From: Aqeel Nazeer Date: Fri, 2 Mar 2018 18:04:55 +0530 Subject: [PATCH 1/2] fix the ordering so that specialised files are correctly picked --- lib/sassc/rails/importer.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/sassc/rails/importer.rb b/lib/sassc/rails/importer.rb index dd13704..4264682 100644 --- a/lib/sassc/rails/importer.rb +++ b/lib/sassc/rails/importer.rb @@ -75,13 +75,13 @@ def import_for(full_path, parent_dir, options) EXTENSIONS = [ CssScssExtension.new, CssSassExtension.new, - Extension.new(".scss"), - Extension.new(".sass"), - CSSExtension.new, + SassERBExtension.new, ERBExtension.new(".scss.erb"), ERBExtension.new(".css.erb"), - SassERBExtension.new - ] + Extension.new(".scss"), + Extension.new(".sass"), + CSSExtension.new + ].freeze PREFIXS = [ "", "_" ] GLOB = /(\A|\/)(\*|\*\*\/\*)\z/ From 70d4aeebc0f4aeed0d2bd9f888dd80812a8a8fd8 Mon Sep 17 00:00:00 2001 From: Aqeel Nazeer Date: Wed, 13 Mar 2019 12:31:56 +0530 Subject: [PATCH 2/2] Add test --- .../stylesheets/glob_multiple_extensions_test.scss | 1 + .../globbed_multiple_extensions/glob.scss.erb | 3 +++ test/sassc_rails_test.rb | 10 ++++++++++ 3 files changed, 14 insertions(+) create mode 100644 test/dummy/app/assets/stylesheets/glob_multiple_extensions_test.scss create mode 100644 test/dummy/app/assets/stylesheets/globbed_multiple_extensions/glob.scss.erb diff --git a/test/dummy/app/assets/stylesheets/glob_multiple_extensions_test.scss b/test/dummy/app/assets/stylesheets/glob_multiple_extensions_test.scss new file mode 100644 index 0000000..b797a98 --- /dev/null +++ b/test/dummy/app/assets/stylesheets/glob_multiple_extensions_test.scss @@ -0,0 +1 @@ +@import "globbed_multiple_extensions/**/*"; diff --git a/test/dummy/app/assets/stylesheets/globbed_multiple_extensions/glob.scss.erb b/test/dummy/app/assets/stylesheets/globbed_multiple_extensions/glob.scss.erb new file mode 100644 index 0000000..5f0aa6d --- /dev/null +++ b/test/dummy/app/assets/stylesheets/globbed_multiple_extensions/glob.scss.erb @@ -0,0 +1,3 @@ +.glob { + margin: <%= 0 %>; +} diff --git a/test/sassc_rails_test.rb b/test/sassc_rails_test.rb index 321fcd8..9f63ebe 100644 --- a/test/sassc_rails_test.rb +++ b/test/sassc_rails_test.rb @@ -271,6 +271,16 @@ def test_allows_for_inclusion_of_inline_source_maps # assert_match /\.import-css-application/, css_output #end + def test_globbed_imports_work_with_multiple_extensions + initialize! + + asset = render_asset("glob_multiple_extensions_test.css") + + assert_equal <<-CSS, asset +.glob{margin:0} + CSS + end + def test_globbed_imports_work_when_globbed_file_is_changed skip "This seems to work in practice, possible test setup problem"