Skip to content

Commit 087adf9

Browse files
ntkmeglebm
authored andcommitted
Fix tests
1 parent decb961 commit 087adf9

File tree

7 files changed

+55
-26
lines changed

7 files changed

+55
-26
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
ruby_version: ['2.5', '2.6', '2.7', '3.0', '3.1']
15+
ruby_version: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
1616
gemfile:
17-
- test/gemfiles/rails_5_0.gemfile
18-
- test/gemfiles/rails_5_1.gemfile
19-
- test/gemfiles/rails_5_2.gemfile
2017
- test/gemfiles/rails_6_0.gemfile
2118
- test/gemfiles/rails_6_1.gemfile
2219
- test/gemfiles/rails_7_0_sassc.gemfile
@@ -26,36 +23,34 @@ jobs:
2623
gemfile: test/gemfiles/rails_4_2.gemfile
2724
- ruby_version: '2.6'
2825
gemfile: test/gemfiles/rails_4_2.gemfile
29-
exclude:
3026
- ruby_version: '2.5'
31-
gemfile: test/gemfiles/rails_7_0_sassc.gemfile
32-
- ruby_version: '2.5'
33-
gemfile: test/gemfiles/rails_7_0_dartsass.gemfile
34-
- ruby_version: '2.6'
35-
gemfile: test/gemfiles/rails_7_0_sassc.gemfile
27+
gemfile: test/gemfiles/rails_5_0.gemfile
3628
- ruby_version: '2.6'
37-
gemfile: test/gemfiles/rails_7_0_dartsass.gemfile
38-
- ruby_version: '3.0'
3929
gemfile: test/gemfiles/rails_5_0.gemfile
40-
- ruby_version: '3.0'
41-
gemfile: test/gemfiles/rails_5_1.gemfile
42-
- ruby_version: '3.0'
43-
gemfile: test/gemfiles/rails_5_2.gemfile
44-
- ruby_version: '3.1'
30+
- ruby_version: '2.7'
4531
gemfile: test/gemfiles/rails_5_0.gemfile
46-
- ruby_version: '3.1'
32+
- ruby_version: '2.5'
4733
gemfile: test/gemfiles/rails_5_1.gemfile
48-
- ruby_version: '3.1'
34+
- ruby_version: '2.6'
35+
gemfile: test/gemfiles/rails_5_1.gemfile
36+
- ruby_version: '2.7'
37+
gemfile: test/gemfiles/rails_5_1.gemfile
38+
- ruby_version: '2.5'
39+
gemfile: test/gemfiles/rails_5_2.gemfile
40+
- ruby_version: '2.6'
41+
gemfile: test/gemfiles/rails_5_2.gemfile
42+
- ruby_version: '2.7'
4943
gemfile: test/gemfiles/rails_5_2.gemfile
50-
- ruby_version: '3.1'
51-
gemfile: test/gemfiles/rails_6_0.gemfile
5244
runs-on: ubuntu-latest
5345
steps:
54-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v6
5547
- name: Set up Ruby
5648
uses: ruby/setup-ruby@v1
5749
with:
5850
ruby-version: ${{ matrix.ruby_version }}
5951
bundler-cache: true # 'bundle install' and cache
52+
- name: Disable AppArmor # https://chromium.googlesource.com/chromium/src/+/main/docs/security/apparmor-userns-restrictions.md
53+
if: runner.os == 'Linux'
54+
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
6055
- name: Build and test with Rake
6156
run: bundle exec rake --trace

bootstrap.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
1919
s.add_development_dependency 'rake'
2020

2121
# Testing dependencies
22-
s.add_development_dependency 'minitest', '~> 5.14.4'
22+
s.add_development_dependency 'minitest', '>= 5.14.4', '< 7'
2323
s.add_development_dependency 'minitest-reporters', '~> 1.4.3'
2424
s.add_development_dependency 'term-ansicolor'
2525
# Integration testing

test/gemfiles/rails_6_0.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@ gem 'activesupport', '~> 6.0.3'
55
gem 'sassc-rails', '~> 2.0'
66

77
gemspec path: '../../'
8+
9+
# no longer bundled as default gems in newer ruby
10+
gem 'base64'
11+
gem 'benchmark'
12+
gem 'drb'
13+
gem 'mutex_m'
14+
gem 'ruby2_keywords'
15+
gem 'tsort'

test/gemfiles/rails_6_1.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@ gem 'activesupport', '~> 6.1.3'
55
gem 'sassc-rails', '~> 2.0'
66

77
gemspec path: '../../'
8+
9+
# no longer bundled as default gems in newer ruby
10+
gem 'base64'
11+
gem 'benchmark'
12+
gem 'drb'
13+
gem 'mutex_m'
14+
gem 'ruby2_keywords'
15+
gem 'tsort'

test/gemfiles/rails_7_0_dartsass.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@ gem 'activesupport', '~> 7.0.4'
55
gem 'dartsass-sprockets', '~> 3.0'
66

77
gemspec path: '../../'
8+
9+
# no longer bundled as default gems in newer ruby
10+
gem 'base64'
11+
gem 'benchmark'
12+
gem 'drb'
13+
gem 'mutex_m'
14+
gem 'ruby2_keywords'
15+
gem 'tsort'

test/gemfiles/rails_7_0_sassc.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@ gem 'activesupport', '~> 7.0.4'
55
gem 'sassc-rails', '~> 2.0'
66

77
gemspec path: '../../'
8+
9+
# no longer bundled as default gems in newer ruby
10+
gem 'base64'
11+
gem 'benchmark'
12+
gem 'drb'
13+
gem 'mutex_m'
14+
gem 'ruby2_keywords'
15+
gem 'tsort'

test/test_helper.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
require 'logger'
2+
13
require 'minitest/autorun'
24
require 'minitest/reporters'
35
Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
@@ -26,17 +28,17 @@
2628
options = {
2729
window_size: [1280, 1024],
2830
timeout: 30,
29-
process_timeout: 30
31+
process_timeout: 60
3032
}
3133
options[:browser_path] = browser_path if browser_path
3234
Capybara::Cuprite::Driver.new(app, options)
3335
end
3436

3537
Capybara.configure do |config|
3638
config.server = :webrick
37-
config.app_host = 'http://localhost:7000'
39+
config.app_host = 'http://localhost:8000'
3840
config.default_driver = :cuprite
3941
config.javascript_driver = :cuprite
40-
config.server_port = 7000
42+
config.server_port = 8000
4143
config.default_max_wait_time = 10
4244
end

0 commit comments

Comments
 (0)