Skip to content

Commit

Permalink
Merge pull request #452 from sanger/depfu/update/rubocop-rspec-3.0.4
Browse files Browse the repository at this point in the history
Update rubocop-rspec 3.0.3 → 3.0.4 (patch)
  • Loading branch information
dasunpubudumal authored Aug 15, 2024
2 parents ea5b882 + aa2e4a3 commit c677a90
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 17 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ruby_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
MYSQL_ALLOW_EMPTY_PASSWORD: yes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -34,15 +34,16 @@ jobs:
- name: Setup database
run: bundle exec rake db:setup
- name: Test & publish code coverage
uses: paambaati/codeclimate-action@v3.0.0
uses: paambaati/codeclimate-action@v8.0.0
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID || '5e399530a457db7a41cd5785ce0536b79e9022b3c2d4382f101310b3b166eb38' }}
with:
coverageCommand: bundle exec rspec

lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ group :test do
gem 'factory_bot'
gem 'launchy'
gem 'rspec-collection_matchers'
gem 'rspec-rails', '~> 3.5.0'
gem 'rspec-rails'
gem 'selenium-webdriver', require: false
gem 'simplecov', require: false
gem 'timecop'
Expand Down
20 changes: 9 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ GEM
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
logger (1.6.0)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand Down Expand Up @@ -155,8 +154,8 @@ GEM
nokogiri (1.16.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
parallel (1.25.1)
parser (3.3.4.0)
parallel (1.26.2)
parser (3.3.4.2)
ast (~> 2.4.1)
racc
pry (0.14.2)
Expand All @@ -167,7 +166,7 @@ GEM
public_suffix (6.0.0)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.8.0)
racc (1.8.1)
rack (2.2.9)
rack-mini-profiler (3.3.1)
rack (>= 1.2.0)
Expand Down Expand Up @@ -206,7 +205,7 @@ GEM
rdoc (6.6.3.1)
psych (>= 4.0.0)
regexp_parser (2.9.2)
rexml (3.3.4)
rexml (3.3.5)
strscan
rspec-collection_matchers (1.2.1)
rspec-expectations (>= 2.99.0.beta1)
Expand All @@ -227,7 +226,7 @@ GEM
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rubocop (1.65.0)
rubocop (1.65.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -238,7 +237,7 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
rubocop-ast (1.32.0)
parser (>= 3.3.1.0)
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
Expand All @@ -248,7 +247,7 @@ GEM
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (3.0.3)
rubocop-rspec (3.0.4)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
rubyzip (2.3.2)
Expand All @@ -264,9 +263,8 @@ GEM
tilt
sdoc (2.4.0)
rdoc (>= 5.0)
selenium-webdriver (4.23.0)
selenium-webdriver (4.18.1)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -333,7 +331,7 @@ DEPENDENCIES
rack-mini-profiler
rails (~> 7.0.8)
rspec-collection_matchers
rspec-rails (~> 3.5.0)
rspec-rails
rubocop
rubocop-performance
rubocop-rails
Expand Down
11 changes: 9 additions & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
require 'selenium/webdriver'

Capybara.register_driver :chrome do |app|
Capybara::Selenium::Driver.new(app, browser: :chrome)
client = Selenium::WebDriver::Remote::Http::Default.new
client.read_timeout = 120 # Set the read timeout to 120 seconds

Capybara::Selenium::Driver.new(app, browser: :chrome, http_client: client)
end

Capybara.register_driver :headless_chrome do |app|
Expand All @@ -35,7 +38,11 @@
options.add_argument('--disable_gpu')
# options.add_argument('--disable-popup-blocking')
options.add_argument('--window-size=1600,3200')
Capybara::Selenium::Driver.new(app, browser: :chrome, options:)

client = Selenium::WebDriver::Remote::Http::Default.new
client.read_timeout = 120 # Set the read timeout to 120 seconds

Capybara::Selenium::Driver.new(app, browser: :chrome, options:, http_client: client)
end

Capybara.javascript_driver = :headless_chrome
Expand Down

0 comments on commit c677a90

Please sign in to comment.