Skip to content

Commit e8120c6

Browse files
committed
more updates for sprockets-rails 3
1 parent 1d9e0d5 commit e8120c6

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ end
77

88
namespace :tests do
99
gemfiles = %w[
10+
sprockets-rails_3_0
11+
sprockets-rails_2_3
1012
sprockets_2_12
1113
sprockets_3_0
1214
rails_4_2

gemfiles/sprockets-rails_2_3.gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source 'https://rubygems.org'
2+
3+
gem "sprockets-rails", "~> 2.3.0"
4+
5+
# Specify your gem's dependencies in sassc-rails.gemspec
6+
gemspec path: "../"

gemfiles/sprockets-rails_3_0.gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem "sprockets", "~> 3.0.0"
4-
gem "sprockets-rails", github: "rails/sprockets-rails"
3+
gem "sprockets-rails", "~> 3.0.0"
54

65
# Specify your gem's dependencies in sassc-rails.gemspec
76
gemspec path: "../"

test/sassc_rails_test.rb

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ def setup
2222
@app.config.sass.line_comments = false
2323

2424
# Add a fake compressor for testing purposes
25-
@app.config.assets.configure do |env|
26-
env.register_compressor "text/css", :test, TestCompressor
27-
end
25+
Sprockets.register_compressor "text/css", :test, TestCompressor
2826

2927
Rails.backtrace_cleaner.remove_silencers!
3028
end
@@ -41,26 +39,16 @@ def render_asset(asset)
4139
def initialize!
4240
Rails.env = "test"
4341
@app.initialize!
44-
handle_sass_rails
4542
end
4643

4744
def initialize_dev!
4845
Rails.env = "development"
4946
@app.initialize!
50-
handle_sass_rails
5147
end
5248

5349
def initialize_prod!
5450
Rails.env = "production"
5551
@app.initialize!
56-
handle_sass_rails
57-
end
58-
59-
def handle_sass_rails
60-
if defined?(Sass::Rails)
61-
Rails.application.assets.register_engine '.sass', SassC::Rails::SassTemplate
62-
Rails.application.assets.register_engine '.scss', SassC::Rails::ScssTemplate
63-
end
6452
end
6553

6654
def test_setup_works

0 commit comments

Comments
 (0)