Skip to content

Commit

Permalink
Merge pull request #488 from sanger/dependabot/bundler/rexml-3.3.9
Browse files Browse the repository at this point in the history
chore(deps-dev): Bump rexml from 3.3.5 to 3.3.9
  • Loading branch information
yoldas authored Nov 21, 2024
2 parents c677a90 + 26bdd90 commit d127bc8
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 28 deletions.
22 changes: 12 additions & 10 deletions .github/workflows/ruby_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,45 +9,47 @@ jobs:
runs-on: ubuntu-latest
env:
TZ: Europe/London
DISPLAY: ':99.0'
#DISPLAY: ':99.0'
# Services
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idservices
services:
mysql:
# Use the Mysql docker image https://hub.docker.com/_/mysql
image: mysql:8.0
ports:
- 3306:3306 # Default port mappings
# Monitor the health of the container to mesaure when it is ready
- 3306:3306 # Default port mappings
# Monitor the health of the container to mesaure when it is ready
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
env:
MYSQL_ROOT_PASSWORD: '' # Set root PW to nothing
MYSQL_ROOT_PASSWORD: "" # Set root PW to nothing
MYSQL_ALLOW_EMPTY_PASSWORD: yes

steps:
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # Runs bundle install and caches gems. See the ruby_test.yml
# example if you need more control over bundler.
bundler-cache:
true # Runs bundle install and caches gems. See the ruby_test.yml
# example if you need more control over bundler.
- name: Setup database
run: bundle exec rake db:setup
- name: Test & publish code coverage
uses: paambaati/[email protected]
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID || '5e399530a457db7a41cd5785ce0536b79e9022b3c2d4382f101310b3b166eb38' }}
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID || '5e399530a457db7a41cd5785ce0536b79e9022b3c2d4382f101310b3b166eb38' }}
with:
coverageCommand: bundle exec rspec

lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # Runs bundle install and caches gems. See the ruby_test.yml
# example if you need more control over bundler.
bundler-cache:
true # Runs bundle install and caches gems. See the ruby_test.yml
# example if you need more control over bundler.
- name: Lint
run: bundle exec rubocop
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ group :test do
gem 'launchy'
gem 'rspec-collection_matchers'
gem 'rspec-rails'
gem 'selenium-webdriver', require: false
gem 'selenium-webdriver', '~> 4.1', require: false
gem 'simplecov', require: false
gem 'timecop'
end
6 changes: 2 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,7 @@ GEM
rdoc (6.6.3.1)
psych (>= 4.0.0)
regexp_parser (2.9.2)
rexml (3.3.5)
strscan
rexml (3.3.9)
rspec-collection_matchers (1.2.1)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.5.4)
Expand Down Expand Up @@ -283,7 +282,6 @@ GEM
activesupport (>= 6.1)
sprockets (>= 3.0.0)
stringio (3.1.0)
strscan (3.1.0)
thor (1.3.1)
tilt (2.0.11)
timecop (0.9.10)
Expand Down Expand Up @@ -338,7 +336,7 @@ DEPENDENCIES
rubocop-rspec
sass-rails (~> 6.0)
sdoc (~> 2.4.0)
selenium-webdriver
selenium-webdriver (~> 4.1)
simplecov
spring
timecop
Expand Down
18 changes: 5 additions & 13 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,20 @@
require 'selenium/webdriver'

Capybara.register_driver :chrome do |app|
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)
Capybara::Selenium::Driver.new(app, browser: :chrome)
end

Capybara.register_driver :headless_chrome do |app|
options = Selenium::WebDriver::Chrome::Options.new

options.add_argument('--headless')
options.add_argument('--headless=old')
options.add_argument('--disable_gpu')
# options.add_argument('--disable-popup-blocking')
options.add_argument('--window-size=1600,3200')

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)
options.add_argument('--disable-search-engine-choice-screen')
Capybara::Selenium::Driver.new(app, browser: :chrome, options:)
end

Capybara.javascript_driver = :headless_chrome
Capybara.default_max_wait_time = 5
Capybara.default_max_wait_time = 120

# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
RSpec.configure do |config|
Expand Down

0 comments on commit d127bc8

Please sign in to comment.