Skip to content

Commit

Permalink
Register the default RSpec formatter when none are configured. (#110)
Browse files Browse the repository at this point in the history
* Register the default RSpec formatter when none are configured.

RSpec typically adds its default "progress" formatter when no formatters
have been manually registered. Registering RSpec::Abq::Formatter causes
RSpec to skip this.

We recreate this functionality by adding the default formatter when no
formatters have been registered yet. This doesn't result in duplication
of the same formatter. Users can still manually configure their own
formatters in RSpec configuration.

* Bump version to 1.1.4.

* Bump rack to 2.2.6.4+ for security patches.

* Update test expectations for multiple versions of ABQ.

* Increase GHA timeout for tests.

ABQ recently changed to use a timeout when an underlying native process
fails instead of exiting immediately, in order to capture all the child
output. We expect this to be mitigated in the future, but for now we'll
increase the timeouts a bit to account for a few tests we have that
are testing failure scenarios.
  • Loading branch information
doxavore authored Mar 23, 2023
1 parent eeae557 commit 42970bf
Show file tree
Hide file tree
Showing 16 changed files with 118 additions and 83 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ jobs:
if: ${{ matrix.ruby == 3.1 && matrix.gemfile == 3.12 }}
env:
RWX_ACCESS_TOKEN: ${{ secrets.RWX_ACCESS_TOKEN }}
timeout-minutes: 2
timeout-minutes: 5
- name: run rspec without uploading to captain
run: |
bundle exec rspec \
--format json --out tmp/rspec.json \
--format documentation && bin/check_num_tests.rb
if: ${{ matrix.ruby != 3.1 || matrix.gemfile != 3.12 }}
timeout-minutes: 2
timeout-minutes: 5
- name: Upload Coverage
if: always()
uses: actions/upload-artifact@v3
Expand Down
44 changes: 22 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GIT
PATH
remote: .
specs:
rspec-abq (1.1.3)
rspec-abq (1.1.4)
rspec-core (>= 3.5.0, < 3.13.0)

GEM
Expand Down Expand Up @@ -52,18 +52,18 @@ GEM
nokogiri (1.14.2-x86_64-linux)
racc (~> 1.4)
parallel (1.22.1)
parser (3.2.1.0)
parser (3.2.1.1)
ast (~> 2.4.1)
prettier_print (1.2.0)
prettier_print (1.2.1)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
puma (6.1.0)
puma (6.1.1)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
rack (2.2.6.4)
rack-test (2.1.0)
rack (>= 1.3)
rainbow (3.1.1)
rake (13.0.6)
Expand All @@ -78,41 +78,41 @@ GEM
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.3)
rspec-mocks (3.12.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-support (3.12.0)
rubocop (1.44.1)
rubocop (1.48.1)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.24.1, < 2.0)
rubocop-ast (>= 1.26.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.26.0)
rubocop-ast (1.27.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.17.1)
rubocop (~> 1.41)
rubocop-performance (1.15.2)
rubocop-performance (1.16.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.18.1)
rubocop-rspec (2.19.0)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
ruby-lsp (0.4.0)
ruby-lsp (0.4.2)
language_server-protocol (~> 3.17.0)
sorbet-runtime
syntax_tree (>= 6, < 7)
ruby-progressbar (1.11.0)
syntax_tree (>= 6.0.2, < 7)
ruby-progressbar (1.13.0)
rubyzip (2.3.2)
selenium-webdriver (4.8.0)
selenium-webdriver (4.8.1)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand All @@ -122,12 +122,12 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
sorbet-runtime (0.5.10667)
standard (1.24.3)
sorbet-runtime (0.5.10735)
standard (1.25.3)
language_server-protocol (~> 3.17.0.2)
rubocop (= 1.44.1)
rubocop-performance (= 1.15.2)
syntax_tree (6.0.0)
rubocop (~> 1.48.1)
rubocop-performance (~> 1.16.0)
syntax_tree (6.1.1)
prettier_print (>= 1.2.0)
unicode-display_width (2.4.2)
webdrivers (5.2.0)
Expand All @@ -153,7 +153,7 @@ DEPENDENCIES
nokogiri (~> 1.14.2)
pry (~> 0.14.1)
puma (~> 6.1.0)
rack (~> 2.2.5)
rack (~> 2.2.6.4)
rake (~> 13.0)
rspec (~> 3.12)
rspec-abq!
Expand Down
12 changes: 6 additions & 6 deletions gemfiles/rspec-3.10.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GIT
PATH
remote: ..
specs:
rspec-abq (1.1.3)
rspec-abq (1.1.4)
rspec-core (>= 3.5.0, < 3.13.0)

GEM
Expand Down Expand Up @@ -51,11 +51,11 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
puma (6.1.0)
puma (6.1.1)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
rack (2.2.6.4)
rack-test (2.1.0)
rack (>= 1.3)
regexp_parser (2.7.0)
rexml (3.2.5)
Expand All @@ -75,7 +75,7 @@ GEM
rspec-core (> 3.3)
rspec-support (3.10.3)
rubyzip (2.3.2)
selenium-webdriver (4.8.0)
selenium-webdriver (4.8.1)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -104,7 +104,7 @@ DEPENDENCIES
nokogiri (~> 1.14.2)
pry (~> 0.14.1)
puma (~> 6.1.0)
rack (~> 2.2.5)
rack (~> 2.2.6.4)
rspec (~> 3.10, < 3.11)
rspec-abq!
rspec-retry (= 0.6.2)
Expand Down
12 changes: 6 additions & 6 deletions gemfiles/rspec-3.11.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GIT
PATH
remote: ..
specs:
rspec-abq (1.1.3)
rspec-abq (1.1.4)
rspec-core (>= 3.5.0, < 3.13.0)

GEM
Expand Down Expand Up @@ -51,11 +51,11 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
puma (6.1.0)
puma (6.1.1)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
rack (2.2.6.4)
rack-test (2.1.0)
rack (>= 1.3)
regexp_parser (2.7.0)
rexml (3.2.5)
Expand All @@ -75,7 +75,7 @@ GEM
rspec-core (> 3.3)
rspec-support (3.11.1)
rubyzip (2.3.2)
selenium-webdriver (4.8.0)
selenium-webdriver (4.8.1)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -104,7 +104,7 @@ DEPENDENCIES
nokogiri (~> 1.14.2)
pry (~> 0.14.1)
puma (~> 6.1.0)
rack (~> 2.2.5)
rack (~> 2.2.6.4)
rspec (~> 3.11, < 3.12)
rspec-abq!
rspec-retry (~> 0.6.2)
Expand Down
14 changes: 7 additions & 7 deletions gemfiles/rspec-3.12.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GIT
PATH
remote: ..
specs:
rspec-abq (1.1.3)
rspec-abq (1.1.4)
rspec-core (>= 3.5.0, < 3.13.0)

GEM
Expand Down Expand Up @@ -51,11 +51,11 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
puma (6.1.0)
puma (6.1.1)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
rack (2.2.6.4)
rack-test (2.1.0)
rack (>= 1.3)
regexp_parser (2.7.0)
rexml (3.2.5)
Expand All @@ -68,14 +68,14 @@ GEM
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.3)
rspec-mocks (3.12.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-support (3.12.0)
rubyzip (2.3.2)
selenium-webdriver (4.8.0)
selenium-webdriver (4.8.1)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -104,7 +104,7 @@ DEPENDENCIES
nokogiri (~> 1.14.2)
pry (~> 0.14.1)
puma (~> 6.1.0)
rack (~> 2.2.5)
rack (~> 2.2.6.4)
rspec (~> 3.12, < 3.13)
rspec-abq!
rspec-retry (~> 0.6.2)
Expand Down
12 changes: 6 additions & 6 deletions gemfiles/rspec-3.5.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GIT
PATH
remote: ..
specs:
rspec-abq (1.1.3)
rspec-abq (1.1.4)
rspec-core (>= 3.5.0, < 3.13.0)

GEM
Expand Down Expand Up @@ -51,11 +51,11 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
puma (6.1.0)
puma (6.1.1)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
rack (2.2.6.4)
rack-test (2.1.0)
rack (>= 1.3)
regexp_parser (2.7.0)
rexml (3.2.5)
Expand All @@ -75,7 +75,7 @@ GEM
rspec-core (> 3.3)
rspec-support (3.5.0)
rubyzip (2.3.2)
selenium-webdriver (4.8.0)
selenium-webdriver (4.8.1)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -104,7 +104,7 @@ DEPENDENCIES
nokogiri (~> 1.14.2)
pry (~> 0.14.1)
puma (~> 6.1.0)
rack (~> 2.2.5)
rack (~> 2.2.6.4)
rspec (~> 3.5, < 3.6)
rspec-abq!
rspec-retry (~> 0.6.2)
Expand Down
12 changes: 6 additions & 6 deletions gemfiles/rspec-3.6.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GIT
PATH
remote: ..
specs:
rspec-abq (1.1.3)
rspec-abq (1.1.4)
rspec-core (>= 3.5.0, < 3.13.0)

GEM
Expand Down Expand Up @@ -51,11 +51,11 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
puma (6.1.0)
puma (6.1.1)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
rack (2.2.6.4)
rack-test (2.1.0)
rack (>= 1.3)
regexp_parser (2.7.0)
rexml (3.2.5)
Expand All @@ -75,7 +75,7 @@ GEM
rspec-core (> 3.3)
rspec-support (3.6.0)
rubyzip (2.3.2)
selenium-webdriver (4.8.0)
selenium-webdriver (4.8.1)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -104,7 +104,7 @@ DEPENDENCIES
nokogiri (~> 1.14.2)
pry (~> 0.14.1)
puma (~> 6.1.0)
rack (~> 2.2.5)
rack (~> 2.2.6.4)
rspec (~> 3.6, < 3.7)
rspec-abq!
rspec-retry (~> 0.6.2)
Expand Down
12 changes: 6 additions & 6 deletions gemfiles/rspec-3.7.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GIT
PATH
remote: ..
specs:
rspec-abq (1.1.3)
rspec-abq (1.1.4)
rspec-core (>= 3.5.0, < 3.13.0)

GEM
Expand Down Expand Up @@ -51,11 +51,11 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
puma (6.1.0)
puma (6.1.1)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
rack (2.2.6.4)
rack-test (2.1.0)
rack (>= 1.3)
regexp_parser (2.7.0)
rexml (3.2.5)
Expand All @@ -75,7 +75,7 @@ GEM
rspec-core (> 3.3)
rspec-support (3.7.1)
rubyzip (2.3.2)
selenium-webdriver (4.8.0)
selenium-webdriver (4.8.1)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -104,7 +104,7 @@ DEPENDENCIES
nokogiri (~> 1.14.2)
pry (~> 0.14.1)
puma (~> 6.1.0)
rack (~> 2.2.5)
rack (~> 2.2.6.4)
rspec (~> 3.7, < 3.8)
rspec-abq!
rspec-retry (~> 0.6.2)
Expand Down
Loading

0 comments on commit 42970bf

Please sign in to comment.