From 67e39b57d5c4c6588d18911a392dfb510c2f82ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 30 Apr 2019 06:39:56 +0000 Subject: [PATCH 1/4] Bump govuk_test from 0.4.2 to 0.4.3 Bumps [govuk_test](https://github.com/alphagov/govuk_test) from 0.4.2 to 0.4.3. - [Release notes](https://github.com/alphagov/govuk_test/releases) - [Changelog](https://github.com/alphagov/govuk_test/blob/master/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk_test/compare/v0.4.2...v0.4.3) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 29 +++++++++++++---------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 74b0af54..df950fdc 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem "docker-api", "~> 1.34" gem "docker-compose", "~> 1.1" gem "faker", "~> 1.9" gem "govuk-lint", "~> 3.11.0" -gem "govuk_test", "~> 0.4.2" +gem "govuk_test", "~> 0.4.3" gem "httparty" gem "parallel_tests" gem "plek", "~> 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index c17e825c..94c7e9f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,12 +3,10 @@ GEM specs: addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - archive-zip (0.12.0) - io-like (~> 0.3.0) ast (2.4.0) backticks (1.0.2) byebug (11.0.1) - capybara (3.16.2) + capybara (3.18.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -22,11 +20,8 @@ GEM capybara-select2 (1.0.1) capybara rspec - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - chromedriver-helper (2.1.1) - archive-zip (~> 0.10) - nokogiri (~> 1.8) + childprocess (1.0.1) + rake (< 13.0) concurrent-ruby (1.1.5) diff-lcs (1.3) docker-api (1.34.2) @@ -42,18 +37,16 @@ GEM rubocop (~> 0.64) rubocop-rspec (~> 1.28) scss_lint - govuk_test (0.4.2) + govuk_test (0.4.3) capybara - chromedriver-helper - ptools puma selenium-webdriver + webdrivers httparty (0.16.4) mime-types (~> 3.0) multi_xml (>= 0.5.2) i18n (1.6.0) concurrent-ruby (~> 1.0) - io-like (0.3.0) jaro_winkler (1.5.2) launchy (2.4.3) addressable (~> 2.3) @@ -64,7 +57,7 @@ GEM mini_portile2 (2.4.0) multi_json (1.13.1) multi_xml (0.6.0) - nokogiri (1.10.2) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) parallel (1.14.0) parallel_tests (2.28.0) @@ -122,10 +115,14 @@ GEM scss_lint (0.57.1) rake (>= 0.9, < 13) sass (~> 3.5, >= 3.5.5) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) + selenium-webdriver (3.142.0) + childprocess (>= 0.5, < 2.0) rubyzip (~> 1.2, >= 1.2.2) unicode-display_width (1.4.1) + webdrivers (3.8.0) + nokogiri (~> 1.6) + rubyzip (~> 1.0) + selenium-webdriver (~> 3.0) xpath (3.2.0) nokogiri (~> 1.8) @@ -140,7 +137,7 @@ DEPENDENCIES docker-compose (~> 1.1) faker (~> 1.9) govuk-lint (~> 3.11.0) - govuk_test (~> 0.4.2) + govuk_test (~> 0.4.3) httparty parallel_tests plek (~> 2.0) From f829c3c5278ea78ee67d6f07f175cc4e9d78cad3 Mon Sep 17 00:00:00 2001 From: Edward Kerry Date: Wed, 1 May 2019 10:16:55 +0100 Subject: [PATCH 2/4] Cofigure GovukTest --- spec/spec_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e2193f54..c198d860 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -28,6 +28,8 @@ Dir["./spec/support/*.rb"].each { |f| require f } +GovukTest.configure + RSpec.configure do |config| # rspec-expectations config goes here. You can use an alternate # assertion/expectation library such as wrong or the stdlib/minitest From 2f9dfa97be057c86f1b3a5bd38921d649b42c0d0 Mon Sep 17 00:00:00 2001 From: Thomas Leese Date: Wed, 1 May 2019 12:01:11 +0100 Subject: [PATCH 3/4] Move govuk_test configuration into support file --- spec/spec_helper.rb | 2 -- spec/support/govuk_test.rb | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 spec/support/govuk_test.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c198d860..e2193f54 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -28,8 +28,6 @@ Dir["./spec/support/*.rb"].each { |f| require f } -GovukTest.configure - RSpec.configure do |config| # rspec-expectations config goes here. You can use an alternate # assertion/expectation library such as wrong or the stdlib/minitest diff --git a/spec/support/govuk_test.rb b/spec/support/govuk_test.rb new file mode 100644 index 00000000..41ca4c6c --- /dev/null +++ b/spec/support/govuk_test.rb @@ -0,0 +1,3 @@ +require "govuk_test" + +GovukTest.configure From f55b1eadf8c92aa8badcb9574be0130b1c3f8b7f Mon Sep 17 00:00:00 2001 From: Thomas Leese Date: Wed, 1 May 2019 12:40:41 +0100 Subject: [PATCH 4/4] Remove chromedriver-helper initialisation --- spec/spec_helper.rb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e2193f54..69a44610 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -116,15 +116,6 @@ config.add_setting :reload_page_wait_time, default: 60 end -chromedriver_from_path = File.which("chromedriver") - -if chromedriver_from_path - # Use the installed chromedriver, rather than chromedriver-helper - Selenium::WebDriver::Chrome.driver_path = chromedriver_from_path -else - require "chromedriver-helper" -end - Capybara.register_driver :headless_chrome do |app| capabilities = Selenium::WebDriver::Remote::Capabilities.chrome( acceptInsecureCerts: true,