ndr_dev_support 5.3.1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b32ca66c67616b510c163688cba811b0d36efbe7be719904506a24f1d754cbb5
-  data.tar.gz: 585a6c3671608cfa789e37bdc4e977eec4aa86a7c310702719a02c7072086e2f
+  metadata.gz: d0e0d87efe5b091c6083e781b712ebb2d20613d292f6593264b45cd7faa4d990
+  data.tar.gz: 77405caeed1891584a713451456df807bb3bcee98fae5c144f09d202ec2e4db5
 SHA512:
-  metadata.gz: a29f607a772393ec1a7237d7b8992d50c14ed2704387c35d930823733b26279b09b49e72e5970566c78d05cde6b15ec40b5b35974224c9db0a8c2023dc123730
-  data.tar.gz: 8a359e64301b814f14a04341942fadae35e0675a9dcc6d179cb1ec9c3f91009213b712f6a6186d899929fb829889839d2b2745ef3727f910beeb2268c1986663
+  metadata.gz: 2537e824771e6abbac152b2f2c1006613c9ec52582d65b0665040d9f81ddfe0a5407d7ac191b5e9ce2b5de7bde3b3362206d8cd4abd2deeac40c09e8175804a3
+  data.tar.gz: 24d97bdfa01f28f8da310c28282cabf2dcb5172b2a0ad39b9f8230467a05660929b4723d7780163ace34e5f25388126a864ebcdba183bf5c9d7003e4f2baee48

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.4.0 / 2019-05-30
+### Added
+* Introduce `show_me_the_cookies` into the integration testing DSL
+
+### Fixed
+* Use command line args to prevent headless Chrome hanging
+
 ## 5.3.1 / 2019-05-20
 ### Fixed
 * Use `webdrivers` gem for Selenium WebDriver managements.

data/code_safety.yml

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: b87abcd1e7a0a02efbab463f7f992bbdb4b1a958
+    safe_revision: ca4471b6dbd4f8ef72574738f66f7f523721218c
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -115,27 +115,27 @@ file safety:
   lib/ndr_dev_support/integration_testing/drivers/chrome.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1ecf54219c77969066a142a42b694e805d69f8b4
+    safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/drivers/chrome_headless.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1ecf54219c77969066a142a42b694e805d69f8b4
+    safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/drivers/firefox.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: e0b3871607c649565330d6e62740ffd860930338
+    safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/drivers/poltergeist.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: e0b3871607c649565330d6e62740ffd860930338
+    safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/drivers/switchable.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: e0b3871607c649565330d6e62740ffd860930338
+    safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/dsl.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: d347807124f115b337162646b524c42f59a0559e
+    safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/rake_ci/brakeman_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -203,7 +203,7 @@ file safety:
   lib/ndr_dev_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: b87abcd1e7a0a02efbab463f7f992bbdb4b1a958
+    safe_revision: ca4471b6dbd4f8ef72574738f66f7f523721218c
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
@@ -276,7 +276,7 @@ file safety:
   ndr_dev_support.gemspec:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1ecf54219c77969066a142a42b694e805d69f8b4
+    safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   test/daemon/ci_server_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_dev_support/integration_testing/drivers/chrome.rb

@@ -1,4 +1,5 @@
 require 'selenium-webdriver'
+require 'show_me_the_cookies'
 
 Capybara.register_driver(:chrome) do |app|
   Capybara::Selenium::Driver.new app, browser: :chrome
@@ -7,3 +8,5 @@ end
 Capybara::Screenshot.register_driver(:chrome) do |driver, path|
   driver.browser.save_screenshot(path)
 end
+
+ShowMeTheCookies.register_adapter(:chrome, ShowMeTheCookies::SeleniumChrome)

data/lib/ndr_dev_support/integration_testing/drivers/chrome_headless.rb

@@ -1,8 +1,15 @@
 require 'selenium-webdriver'
+require 'show_me_the_cookies'
 
 Capybara.register_driver(:chrome_headless) do |app|
   capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    'chromeOptions' => { args: %w[headless disable-gpu] }
+    chromeOptions: {
+      args: %w[
+        headless disable-gpu no-sandbox
+        --window-size=1920,1080
+        --enable-features=NetworkService,NetworkServiceInProcess
+      ]
+    }
   )
 
   Capybara::Selenium::Driver.new(
@@ -15,3 +22,5 @@ end
 Capybara::Screenshot.register_driver(:chrome_headless) do |driver, path|
   driver.browser.save_screenshot(path)
 end
+
+ShowMeTheCookies.register_adapter(:chrome_headless, ShowMeTheCookies::SeleniumChrome)

data/lib/ndr_dev_support/integration_testing/drivers/firefox.rb

@@ -1,4 +1,5 @@
 require 'selenium-webdriver'
+require 'show_me_the_cookies'
 
 Capybara.register_driver(:firefox) do |app|
   Capybara::Selenium::Driver.new app, browser: :firefox
@@ -7,3 +8,5 @@ end
 Capybara::Screenshot.register_driver(:firefox) do |driver, path|
   driver.browser.save_screenshot(path)
 end
+
+ShowMeTheCookies.register_adapter(:firefox, ShowMeTheCookies::Selenium)

data/lib/ndr_dev_support/integration_testing/drivers/poltergeist.rb

@@ -1,5 +1,6 @@
 # The driver for PhantomJS is poltergeist:
 require 'capybara/poltergeist'
+require 'show_me_the_cookies'
 
 Capybara.register_driver(:poltergeist) do |app|
   options = { phantomjs_options: ['--proxy-type=none'], timeout: 60 }
@@ -13,3 +14,5 @@ Capybara::Screenshot.register_driver(:poltergeist) do |driver, path|
   # Take full-height screenshots, rather than just capturing the viewport:
   driver.render(path, full: true)
 end
+
+ShowMeTheCookies.register_adapter(:poltergeist, ShowMeTheCookies::Poltergeist)

data/lib/ndr_dev_support/integration_testing/drivers/switchable.rb

@@ -1,21 +1,32 @@
-# A meta-driver that allows the driver to be set using the `INTEGRATION_DRIVER`
-# environment variable (e.g. for a CI matrix), assuming that driver has been pre-registered
-# with Capybara.
+require 'show_me_the_cookies'
 
-# Although the aim is to move to Chrome headless, we keep poltergeist as the default
-# driver for now. For motivation behind not changing immediately, see the "Differences
-# between Poltergeist and Selenium" section of:
-#
-#   https://about.gitlab.com/2017/12/19/moving-to-headless-chrome/
-#
-Capybara.register_driver(:switchable) do |app|
-  choice = ENV.fetch('INTEGRATION_DRIVER', 'poltergeist').to_sym
+module NdrDevSupport
+  module IntegrationTesting
+    module Drivers
+      # A meta-driver that allows the driver to be set using the `INTEGRATION_DRIVER`
+      # environment variable (e.g. for a CI matrix), assuming that driver has been pre-registered
+      # with Capybara.
 
-  Capybara.drivers.fetch(choice).call(app)
-end
+      # Although the aim is to move to Chrome headless, we keep poltergeist as the default
+      # driver for now. For motivation behind not changing immediately, see the "Differences
+      # between Poltergeist and Selenium" section of:
+      #
+      #   https://about.gitlab.com/2017/12/19/moving-to-headless-chrome/
+      #
+      module Switchable
+        DEFAULT    = :poltergeist
+        CONFIGURED = ENV.fetch('INTEGRATION_DRIVER', DEFAULT).to_sym
+
+        Capybara.register_driver(:switchable) do |app|
+          Capybara.drivers.fetch(CONFIGURED).call(app)
+        end
 
-Capybara::Screenshot.register_driver(:switchable) do |driver, path|
-  choice = ENV.fetch('INTEGRATION_DRIVER', 'poltergeist').to_sym
+        Capybara::Screenshot.register_driver(:switchable) do |driver, path|
+          Capybara::Screenshot.registered_drivers.fetch(CONFIGURED).call(driver, path)
+        end
 
-  Capybara::Screenshot.registered_drivers.fetch(choice).call(driver, path)
+        ShowMeTheCookies.register_adapter(:switchable, ShowMeTheCookies.adapters.fetch(CONFIGURED))
+      end
+    end
+  end
 end

data/lib/ndr_dev_support/integration_testing/dsl.rb

@@ -1,20 +1,25 @@
 require 'capybara/rails'
+require 'show_me_the_cookies'
 
 module NdrDevSupport
   module IntegrationTesting
     # Additional integration testing DSL:
     module DSL
-      # Instruct the headless browser to clear its session:
+      include ShowMeTheCookies
+
+      # Instruct the browser to clear its session:
       def clear_headless_session!
         page.driver.reset!
       end
 
-      # Get the headless browser to delete all of the cookies
+      # Get the browser to delete all of the cookies
       # for the current page without resetting:
       def delete_all_cookies!
-        page.driver.cookies.each_key do |name|
-          page.driver.remove_cookie(name)
-        end
+        ActiveSupport::Deprecation.warn(<<~MSG)
+          `delete_all_cookies!` is deprecated in favour of `expire_cookies`
+        MSG
+
+        expire_cookies
       end
 
       # Wrap up interacting with modals. The assumption is that the modal

data/lib/ndr_dev_support/version.rb

@@ -2,5 +2,5 @@
 # This defines the NdrDevSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks (and our own).
 module NdrDevSupport
-  VERSION = '5.3.1'.freeze
+  VERSION = '5.4.0'.freeze
 end

data/ndr_dev_support.gemspec

@@ -33,10 +33,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'unicode-display_width', '>= 1.3.3'
 
   # Integration test dependencies:
-  spec.add_dependency 'capybara'
+  spec.add_dependency 'capybara', '>= 3.20'
   spec.add_dependency 'capybara-screenshot'
   spec.add_dependency 'poltergeist', '>= 1.8.0'
   spec.add_dependency 'selenium-webdriver'
+  spec.add_dependency 'show_me_the_cookies'
   spec.add_dependency 'webdrivers', '>= 3.9'
 
   # CI server dependencies:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.20'
 - !ruby/object:Gem::Dependency
   name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: show_me_the_cookies
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement