Skip to content

Commit

Permalink
Merge pull request #597 from jejacks0n/fix-ci
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
mathieujobin authored Apr 20, 2023
2 parents a168748 + fa9c3b4 commit f14d297
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 337 deletions.
19 changes: 6 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@ jobs:
fail-fast: false
matrix:
ruby:
- 3.0
- 2.7
- 2.6
- 2.5
- 3.0.6
- 2.7.8
#- jruby-9.2.15.0
gemfile:
- rails_4.2
- rails_5.0
- rails_5.1
- rails_5.2
Expand All @@ -31,18 +28,14 @@ jobs:
- rails_5_sprockets_4
- rails_6_sprockets_4
exclude:
- gemfile: rails_4.2
ruby: 2.7
- gemfile: rails_4.2
ruby: 3.0
- gemfile: rails_5.0
ruby: 3.0
ruby: 3.0.6
- gemfile: rails_5.1
ruby: 3.0
ruby: 3.0.6
- gemfile: rails_5.2
ruby: 3.0
ruby: 3.0.6
- gemfile: rails_5_sprockets_4
ruby: 3.0
ruby: 3.0.6

env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
Expand Down
14 changes: 0 additions & 14 deletions gemfiles/rails_4.2.gemfile

This file was deleted.

300 changes: 0 additions & 300 deletions gemfiles/rails_4.2.gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion spec/teaspoon/command_line_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
end

it "executes using Teaspoon::Console" do
expect(Teaspoon::Console).to receive(:new).with(files: ["file1", "file2"])
expect(Teaspoon::Console).to receive(:new).with({files: ["file1", "file2"]})
expect(console).to receive(:failures?)
subject.new
end
Expand Down
2 changes: 1 addition & 1 deletion spec/teaspoon/console_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

describe "#execute" do
it "calls #execute_without_handling and returns its value" do
expect(subject).to receive(:execute_without_handling).with(foo: "bar").and_return(true)
expect(subject).to receive(:execute_without_handling).with({foo: "bar"}).and_return(true)
expect(subject.execute(foo: "bar")).to be_truthy
end

Expand Down
11 changes: 6 additions & 5 deletions spec/teaspoon/driver/selenium_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@
end

describe "#run_specs" do
it "runs without errors" do
subject.run_specs(runner, "_url_")
end

it "loads firefox for the webdriver" do
if RUBY_VERSION >= "2.7"
expect(Selenium::WebDriver).to receive(:for).with(:firefox)
else
expect(Selenium::WebDriver).to receive(:for).with(:firefox, {})
end
pending "this is apparently no longer the case..." if RUBY_VERSION < "3.0"
expect(Selenium::WebDriver).to receive(:for).with(:firefox)
subject.run_specs(runner, "_url_")
end

Expand Down
Loading

0 comments on commit f14d297

Please sign in to comment.