Skip to content

Commit b6b18e3

Browse files
committed
Fix test
1 parent 4574423 commit b6b18e3

File tree

3 files changed

+36
-4
lines changed

3 files changed

+36
-4
lines changed

Rakefile

Lines changed: 2 additions & 2 deletions
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', 'RUBYOPT' => '-rlogger' }
66+
env = { 'BUNDLE_GEMFILE' => gemfile, 'MT_COMPAT' => 'true' }
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, 'RUBYOPT' => '-rlogger' }
80+
env = { 'BUNDLE_GEMFILE' => gemfile }
8181
sh(env, *%w[bundle install], chdir: submodule)
8282
sh(env, *%w[bundle exec rake], chdir: submodule)
8383
end

test/patches/bootstrap-rubygem.diff

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
diff --git a/Rakefile b/Rakefile
2+
index 52402cc..b874105 100644
3+
--- a/Rakefile
4+
+++ b/Rakefile
5+
@@ -7,7 +7,7 @@ $:.unshift(lib_path) unless $:.include?(lib_path)
6+
require 'rake/testtask'
7+
Rake::TestTask.new do |t|
8+
t.libs << 'test'
9+
- t.test_files = FileList['test/**/*_test.rb']
10+
+ t.test_files = FileList['test/**/*_test.rb'].exclude('**/vendor/bundle/**/*')
11+
t.verbose = false
12+
t.warning = false
13+
end
114
diff --git a/test/gemfiles/rails_6_0.gemfile b/test/gemfiles/rails_6_0.gemfile
215
index daeffa5..44e38be 100644
316
--- a/test/gemfiles/rails_6_0.gemfile
@@ -54,10 +67,16 @@ index 58fc039..aa8c54b 100644
5467
+gem 'sassc', github: 'sass/sassc-ruby', ref: 'refs/pull/233/head'
5568
+gem 'sassc-embedded', path: '../../../../../..'
5669
diff --git a/test/test_helper.rb b/test/test_helper.rb
57-
index da89690..dd535dc 100644
70+
index da89690..0a88fcd 100644
5871
--- a/test/test_helper.rb
5972
+++ b/test/test_helper.rb
60-
@@ -34,9 +34,9 @@ end
73+
@@ -1,3 +1,5 @@
74+
+require 'logger'
75+
+
76+
require 'minitest/autorun'
77+
require 'minitest/reporters'
78+
Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
79+
@@ -34,9 +36,9 @@ end
6180

6281
Capybara.configure do |config|
6382
config.server = :webrick

test/patches/sassc-rails.diff

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,16 @@ index a15110d..452a251 100644
176176
CSS
177177
end
178178

179+
diff --git a/test/test_helper.rb b/test/test_helper.rb
180+
index 8b38c02..d44166e 100644
181+
--- a/test/test_helper.rb
182+
+++ b/test/test_helper.rb
183+
@@ -5,6 +5,8 @@ ENV["RAILS_ENV"] = "test"
184+
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
185+
$LOAD_PATH.unshift(File.dirname(__FILE__))
186+
187+
+require 'logger'
188+
+
189+
require "pry"
190+
require "fileutils"
191+
require 'rails'

0 commit comments

Comments
 (0)