Skip to content

Commit 6103261

Browse files
committed
Fix vendor test
1 parent 59f5fda commit 6103261

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ namespace :git do
6363
gemfiles/sprockets-rails_3_0.gemfile
6464
]
6565
gemfiles.each do |gemfile|
66-
env = { 'BUNDLE_GEMFILE' => gemfile, 'MT_COMPAT' => 'true' }
66+
env = { 'BUNDLE_GEMFILE' => gemfile, 'MT_COMPAT' => 'true', 'RUBYOPT' => '-rlogger' }
6767
sh(env, *%w[bundle install], chdir: submodule)
6868
sh(env, *%w[bundle exec rake test], chdir: submodule)
6969
end
@@ -77,7 +77,7 @@ namespace :git do
7777
test/gemfiles/rails_7_0_dartsass.gemfile
7878
]
7979
gemfiles.each do |gemfile|
80-
env = { 'BUNDLE_GEMFILE' => gemfile }
80+
env = { 'BUNDLE_GEMFILE' => gemfile, 'RUBYOPT' => '-rlogger' }
8181
sh(env, *%w[bundle install], chdir: submodule)
8282
sh(env, *%w[bundle exec rake], chdir: submodule)
8383
end

test/patches/bootstrap-rubygem.diff

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,55 @@
11
diff --git a/test/gemfiles/rails_6_0.gemfile b/test/gemfiles/rails_6_0.gemfile
2-
index daeffa5..834213c 100644
2+
index daeffa5..44e38be 100644
33
--- a/test/gemfiles/rails_6_0.gemfile
44
+++ b/test/gemfiles/rails_6_0.gemfile
5-
@@ -5,3 +5,10 @@ gem 'activesupport', '~> 6.0.3'
5+
@@ -5,3 +5,9 @@ gem 'activesupport', '~> 6.0.3'
66
gem 'sassc-rails', '~> 2.0'
77

88
gemspec path: '../../'
99
+
1010
+gem 'base64'
1111
+gem 'drb'
12-
+gem 'logger'
1312
+gem 'mutex_m'
1413
+gem 'sassc', github: 'sass/sassc-ruby', ref: 'refs/pull/233/head'
1514
+gem 'sassc-embedded', path: '../../../../../..'
1615
diff --git a/test/gemfiles/rails_6_1.gemfile b/test/gemfiles/rails_6_1.gemfile
17-
index 04342fb..b3854fc 100644
16+
index 04342fb..e59f402 100644
1817
--- a/test/gemfiles/rails_6_1.gemfile
1918
+++ b/test/gemfiles/rails_6_1.gemfile
20-
@@ -5,3 +5,10 @@ gem 'activesupport', '~> 6.1.3'
19+
@@ -5,3 +5,9 @@ gem 'activesupport', '~> 6.1.3'
2120
gem 'sassc-rails', '~> 2.0'
2221

2322
gemspec path: '../../'
2423
+
2524
+gem 'base64'
2625
+gem 'drb'
27-
+gem 'logger'
2826
+gem 'mutex_m'
2927
+gem 'sassc', github: 'sass/sassc-ruby', ref: 'refs/pull/233/head'
3028
+gem 'sassc-embedded', path: '../../../../../..'
3129
diff --git a/test/gemfiles/rails_7_0_dartsass.gemfile b/test/gemfiles/rails_7_0_dartsass.gemfile
32-
index 6df9142..07fb349 100644
30+
index 6df9142..759ab8d 100644
3331
--- a/test/gemfiles/rails_7_0_dartsass.gemfile
3432
+++ b/test/gemfiles/rails_7_0_dartsass.gemfile
35-
@@ -5,3 +5,9 @@ gem 'activesupport', '~> 7.0.4'
33+
@@ -5,3 +5,8 @@ gem 'activesupport', '~> 7.0.4'
3634
gem 'dartsass-sprockets', '~> 3.0'
3735

3836
gemspec path: '../../'
3937
+
4038
+gem 'base64'
4139
+gem 'drb'
42-
+gem 'logger'
4340
+gem 'mutex_m'
4441
+gem 'sassc-embedded', path: '../../../../../..'
4542
diff --git a/test/gemfiles/rails_7_0_sassc.gemfile b/test/gemfiles/rails_7_0_sassc.gemfile
46-
index 58fc039..4b5a393 100644
43+
index 58fc039..aa8c54b 100644
4744
--- a/test/gemfiles/rails_7_0_sassc.gemfile
4845
+++ b/test/gemfiles/rails_7_0_sassc.gemfile
49-
@@ -5,3 +5,10 @@ gem 'activesupport', '~> 7.0.4'
46+
@@ -5,3 +5,9 @@ gem 'activesupport', '~> 7.0.4'
5047
gem 'sassc-rails', '~> 2.0'
5148

5249
gemspec path: '../../'
5350
+
5451
+gem 'base64'
5552
+gem 'drb'
56-
+gem 'logger'
5753
+gem 'mutex_m'
5854
+gem 'sassc', github: 'sass/sassc-ruby', ref: 'refs/pull/233/head'
5955
+gem 'sassc-embedded', path: '../../../../../..'

0 commit comments

Comments
 (0)