Skip to content

Commit

Permalink
Merge pull request #1865 from alphagov/dependabot/bundler/govuk_test-…
Browse files Browse the repository at this point in the history
…2.0.0

Bump govuk_test from 1.0.3 to 2.0.0
  • Loading branch information
kevindew authored Sep 29, 2020
2 parents 35a333d + b5cf49a commit b48a87d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ gem "uglifier"

group :development, :test do
gem "govuk_schemas"
gem "govuk_test"
gem "jasmine"
gem "jasmine_selenium_runner", require: false
gem "jasmine_selenium_runner"
gem "rubocop-govuk"
gem "scss_lint-govuk", require: false
end
Expand All @@ -35,7 +36,6 @@ end
group :test do
gem "capybara"
gem "faker"
gem "govuk_test"
gem "minitest-reporters"
gem "mocha"
gem "webdrivers"
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ GEM
sprockets (< 4)
govuk_schemas (4.1.1)
json-schema (~> 2.8.0)
govuk_test (1.0.3)
govuk_test (2.0.0)
brakeman (~> 4.6)
capybara
puma
Expand Down Expand Up @@ -198,7 +198,7 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
puma (4.3.6)
puma (5.0.2)
nio4r (~> 2.0)
rack (2.2.3)
rack-test (1.1.0)
Expand Down Expand Up @@ -246,7 +246,7 @@ GEM
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (1.7.1)
regexp_parser (1.8.0)
request_store (1.5.0)
rack (>= 1.4)
rest-client (2.1.0)
Expand Down
17 changes: 5 additions & 12 deletions spec/javascripts/support/jasmine_helper.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
require "jasmine/runners/selenium"
require "webdrivers/chromedriver"
require "jasmine_selenium_runner/configure_jasmine"

Jasmine.configure do |config|
config.prevent_phantom_js_auto_install = true

config.runner = lambda { |formatter, jasmine_server_url|
options = Selenium::WebDriver::Chrome::Options.new
options.headless!

webdriver = Selenium::WebDriver.for(:chrome, options: options)
Jasmine::Runners::Selenium.new(formatter, jasmine_server_url, webdriver, 50)
}
class HeadlessChromeJasmineConfigurer < JasmineSeleniumRunner::ConfigureJasmine
def selenium_options
{ options: GovukTest.headless_chrome_selenium_options }
end
end
2 changes: 2 additions & 0 deletions spec/javascripts/support/jasmine_selenium_runner.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
browser: chrome
configuration_class: HeadlessChromeJasmineConfigurer

0 comments on commit b48a87d

Please sign in to comment.