ndr_dev_support 6.1.9 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7875ce70d33cab9abdbd4533015f056d10ef15bb2d73aae049020897a2368dd5
-  data.tar.gz: 04b0fb0dfca79372c3029efeb6f3a579e47631f70a14574e3e1e9fde2aebb207
+  metadata.gz: cdf318e0af2171891382e2be7341affae46ff022b723e7777d0c505173d6b8d6
+  data.tar.gz: b9d3a7d0be0253ae46a864344db8745832efa5939e98689cf70bb465bd051ea4
 SHA512:
-  metadata.gz: 58d47f46201450941ce5533f47af8b571f9d6aa682894b179f21611114d5b2ea9adbbdb35f9efcde6877ef4b6c555794a5b31b32341893cea161a082a834f7f8
-  data.tar.gz: abf4bf639353e16de7ec6f6c33e0ce8797964e6cefa7b8a09a5a1a88b392d1612d0bed72a8ef67b206d94a87f271a699b69ec0692d9e84a52580024b62667f6b
+  metadata.gz: 11369ab5ca8d77ee56a2ec2151b3716263233a6b02c11f1522dcfecce2adeb58cd1b762dac984ef00c2460994952b8aeba61d4129260c9dd3362aaf7c9b95ca2
+  data.tar.gz: 64f3522b75f8d5a64ddd539e136d34e3094431f8b2dde7266002a2c9e0281d652f3d269ac52701ed70e33e6d1183eccace674afbf9d9a48af84c91b4b66dfebf

data/CHANGELOG.md

@@ -1,7 +1,13 @@
 ## [Unreleased]
-## [Unreleased]
 * No unreleased changes
 
+## 7.0.0 / 2022-10-05
+## Changed
+* Change default browser for integration tests to headless Chrome
+* Drop support for Poltergeist and PhantomJS
+* Replace Public Health England naming with NHS Digital
+* Drop support for Rails 5.2
+
 ## 6.1.9 / 2022-10-04
 ### Fixed
 * CD: don't post empty messages to Slack

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2016 Public Health England
+Copyright (c) 2011-2022 NHS Digital
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,7 +1,7 @@
-## NdrDevSupport [![Maintainability](https://api.codeclimate.com/v1/badges/2b2a644964f2aa930f81/maintainability)](https://codeclimate.com/github/PublicHealthEngland/ndr_dev_support/maintainability) [![Build Status](https://github.com/publichealthengland/ndr_dev_support/workflows/Test/badge.svg)](https://github.com/publichealthengland/ndr_dev_support/actions?query=workflow%3Atest) [![Gem Version](https://badge.fury.io/rb/ndr_dev_support.svg)](https://badge.fury.io/rb/ndr_dev_support)
+## NdrDevSupport [![Maintainability](https://api.codeclimate.com/v1/badges/2b2a644964f2aa930f81/maintainability)](https://codeclimate.com/github/PublicHealthEngland/ndr_dev_support/maintainability) [![Build Status](https://github.com/NHSDigital/ndr_dev_support/workflows/Test/badge.svg)](https://github.com/NHSDigital/ndr_dev_support/actions?query=workflow%3Atest) [![Gem Version](https://badge.fury.io/rb/ndr_dev_support.svg)](https://badge.fury.io/rb/ndr_dev_support)
 
-This is the Public Health England (PHE) National Disease Registers (NDR) Developer Support ruby gem,
-providing:
+This is the NHS Digital (NHS-D) National Disease Registration Service (NDRS) Developer Support ruby
+gem, providing:
 
 1. rake tasks to manage code auditing of ruby based projects
 2. rake tasks to limit Rubocop's output to changed (and related) code
@@ -95,7 +95,7 @@ $ find . -iregex .*\.rake$ | xargs rake rubocop:diff:file
 
 ndr_dev_support bundles a configured Rails integration testing environment.
 
-By default, it uses `capybara` and `poltergeist` to drive a PhantomJS headless browser, and includes some sensible configuration.
+By default, it uses `capybara` and `selenium` to drive a headless Chrome browser, and includes some sensible configuration.
 
 To use, simply add the following to your application's `test_helper.rb`
 
@@ -257,9 +257,9 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/PublicHealthEngland/ndr_dev_support. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/NHSDigital/ndr_dev_support. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-1. Fork it ( https://github.com/PublicHealthEngland/ndr_dev_support/fork )
+1. Fork it ( https://github.com/NHSDigital/ndr_dev_support/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/code_safety.yml

@@ -2,8 +2,8 @@
 file safety:
   ".github/CODEOWNERS":
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: ae4a81930ad3ab1b858474bc73b714aeed0f83a8
+    reviewed_by: brian.shand
+    safe_revision: '058996443438979550013c0c983c63b68d3fc58b'
   ".github/workflows/lint.yml":
     comments:
     reviewed_by: josh.pencheon
@@ -11,7 +11,7 @@ file safety:
   ".github/workflows/test.yml":
     comments:
     reviewed_by: brian.shand
-    safe_revision: c911246250d5387264d5a926c2572f98db58be6e
+    safe_revision: 7ce59c6d85cf81eb4791deb94e066dc91704713c
   ".gitignore":
     comments:
     reviewed_by: josh.pencheon
@@ -27,7 +27,7 @@ file safety:
   CHANGELOG.md:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 5d47f0c8574b6fbc69f9144ce508f169b95cd90c
+    safe_revision: dbfd8e8448033324dbde951950e0c73925dbeb6c
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -38,12 +38,12 @@ file safety:
     safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
   LICENSE.txt:
     comments:
-    reviewed_by: timgentry
-    safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
+    reviewed_by: brian.shand
+    safe_revision: f50cf0b5a10fd0aa6499e101fc70a142bc6e9171
   README.md:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: a18f35895baebb1b0971043b3b3f666bb4eb9b5c
+    reviewed_by: brian.shand
+    safe_revision: f50cf0b5a10fd0aa6499e101fc70a142bc6e9171
   Rakefile:
     comments:
     reviewed_by: josh.pencheon
@@ -60,10 +60,6 @@ file safety:
     comments:
     reviewed_by: josh.pencheon
     safe_revision: 05476acacadfa0ad7404f3c37cf3c17c4e0ba11b
-  gemfiles/Gemfile.rails52:
-    comments:
-    reviewed_by: joshpencheon
-    safe_revision: f25001ef74c44ab727eef5cb29cef9a54525d36f
   gemfiles/Gemfile.rails60:
     comments:
     reviewed_by: joshpencheon
@@ -94,8 +90,8 @@ file safety:
     safe_revision: 74a4cd909afaf2ee8bcabdd252b2383b1474b6d4
   lib/ndr_dev_support/capistrano/ndr_model.rb:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 57271c07e44808d8809e1fa11227a8c2e91a14bf
+    reviewed_by: brian.shand
+    safe_revision: 7daa8f47557444038fdf25beb2e56435d90e3339
   lib/ndr_dev_support/capistrano/restart.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -120,6 +116,10 @@ file safety:
     comments:
     reviewed_by: josh.pencheon
     safe_revision: a2b7c20eb58572c213f77677b36aa2f7e6db747e
+  lib/ndr_dev_support/daemon/cd_credentials.rb:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: c0909dd931655db714019a57005747259dc6abc2
   lib/ndr_dev_support/daemon/ci_server.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -127,11 +127,11 @@ file safety:
   lib/ndr_dev_support/daemon/stoppable.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: ff47991823556a6936a7457b4a1eb9373851ee57
+    safe_revision: e3d98ef2b728519d26efd8a5ab73cdb97f2a25f4
   lib/ndr_dev_support/integration_testing.rb:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 5b427cb12907bc87e5e0cb754dcaa524fdbfb1b9
+    reviewed_by: brian.shand
+    safe_revision: 55bf622a37081fc3afd8db9daba1b2f9840c7807
   lib/ndr_dev_support/integration_testing/drivers/chrome.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -144,14 +144,10 @@ file safety:
     comments:
     reviewed_by: josh.pencheon
     safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
-  lib/ndr_dev_support/integration_testing/drivers/poltergeist.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/drivers/switchable.rb:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: e9b74559d28e7520c0376d1bec4a2566aae14b05
+    reviewed_by: brian.shand
+    safe_revision: 55bf622a37081fc3afd8db9daba1b2f9840c7807
   lib/ndr_dev_support/integration_testing/dsl.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -222,29 +218,33 @@ file safety:
     safe_revision: 0c1489e51848d8e7a0903128ea934064c0ab254e
   lib/ndr_dev_support/slack_message_publisher.rb:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: ad38e92c6e56b9d81fdab10681d8f2924eeadf5a
+    reviewed_by: brian.shand
+    safe_revision: e3d98ef2b728519d26efd8a5ab73cdb97f2a25f4
   lib/ndr_dev_support/tasks.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 93f9ed210c6a19eee4884ea8a906067c65ee67f6
+    safe_revision: 189b6e38a0392a3ec0429ab33b456ac88a018a2b
   lib/ndr_dev_support/version.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 5d47f0c8574b6fbc69f9144ce508f169b95cd90c
+    safe_revision: dbfd8e8448033324dbde951950e0c73925dbeb6c
   lib/tasks/audit_bundle.rake:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 9682c3eb39a98d5a5256732af647a8bd7750826b
+    safe_revision: 664b4c343e9c21723b284a7bbd2b02e2c55806e6
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
     reviewed_by: brian.shand
-    safe_revision: 0d1c9d3e7192ad9e6c979d8d772ca49fc91f93cb
+    safe_revision: 1706666ce209cf65d93494a441ecec7212e82954
+  lib/tasks/cd/credentials.rake:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 189b6e38a0392a3ec0429ab33b456ac88a018a2b
   lib/tasks/ci/brakeman.rake:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: fe7dfc7f1775e8b85ae6968e8f475b9e930addf7
+    reviewed_by: brian.shand
+    safe_revision: 4bc70cfa2fced009b205a29154a1f5200b2105bf
   lib/tasks/ci/bundle_audit.rake:
     comments:
     reviewed_by: josh.pencheon
@@ -308,7 +308,7 @@ file safety:
   ndr_dev_support.gemspec:
     comments:
     reviewed_by: brian.shand
-    safe_revision: c911246250d5387264d5a926c2572f98db58be6e
+    safe_revision: 7ce59c6d85cf81eb4791deb94e066dc91704713c
   test/daemon/ci_server_test.rb:
     comments:
     reviewed_by: josh.pencheon

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

@@ -6,15 +6,8 @@ module NdrDevSupport
       # 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.
-
-      # 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
+        DEFAULT    = :chrome_headless
         CONFIGURED = ENV.fetch('INTEGRATION_DRIVER', DEFAULT).to_sym
 
         Capybara.register_driver(:switchable) do |app|

data/lib/ndr_dev_support/integration_testing.rb

@@ -29,7 +29,6 @@ Webdrivers.cache_time = 24.hours
 require 'ndr_dev_support/integration_testing/drivers/chrome'
 require 'ndr_dev_support/integration_testing/drivers/chrome_headless'
 require 'ndr_dev_support/integration_testing/drivers/firefox'
-require 'ndr_dev_support/integration_testing/drivers/poltergeist'
 require 'ndr_dev_support/integration_testing/drivers/switchable'
 
 Capybara.default_driver    = :switchable

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 = '6.1.9'
+  VERSION = '7.0.0'
 end

data/ndr_dev_support.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = []
   spec.summary       = 'NDR Developer Support library'
   spec.description   = 'Provides support to developers of NDR projects'
-  spec.homepage      = 'https://github.com/PublicHealthEngland/ndr_dev_support'
+  spec.homepage      = 'https://github.com/NHSDigital/ndr_dev_support'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").
@@ -37,13 +37,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capybara', '>= 3.34'
   spec.add_dependency 'capybara-screenshot'
   spec.add_dependency 'minitest', '~> 5.11'
-  spec.add_dependency 'poltergeist', '>= 1.8.0'
   spec.add_dependency 'selenium-webdriver'
-  spec.add_dependency 'show_me_the_cookies', '< 6.0' # Newer versions drop Poltergeist support
+  spec.add_dependency 'show_me_the_cookies'
   spec.add_dependency 'webdrivers', '>= 3.9'
 
   # CI server dependencies:
-  spec.add_dependency 'activesupport', '< 7.1'
+  spec.add_dependency 'activesupport', '>= 6.0', '< 7.1'
   spec.add_dependency 'brakeman', '>= 4.7.1'
   spec.add_dependency 'bundler-audit'
   spec.add_dependency 'github-linguist'
@@ -54,6 +53,7 @@ Gem::Specification.new do |spec|
 
   # Deployment dependencies:
   spec.add_dependency 'capistrano', '~> 2.15'
+  spec.add_dependency 'net-scp', '>= 2.0.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'mocha'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 6.1.9
+  version: 7.0.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.11'
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -196,16 +182,16 @@ dependencies:
   name: show_me_the_cookies
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +210,9 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -231,6 +220,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -346,6 +338,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.15'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -407,7 +413,6 @@ files:
 - bin/setup
 - code_safety.yml
 - config/rubocop/ndr.yml
-- gemfiles/Gemfile.rails52
 - gemfiles/Gemfile.rails60
 - gemfiles/Gemfile.rails61
 - gemfiles/Gemfile.rails70
@@ -429,7 +434,6 @@ files:
 - lib/ndr_dev_support/integration_testing/drivers/chrome.rb
 - lib/ndr_dev_support/integration_testing/drivers/chrome_headless.rb
 - lib/ndr_dev_support/integration_testing/drivers/firefox.rb
-- lib/ndr_dev_support/integration_testing/drivers/poltergeist.rb
 - lib/ndr_dev_support/integration_testing/drivers/switchable.rb
 - lib/ndr_dev_support/integration_testing/dsl.rb
 - lib/ndr_dev_support/integration_testing/flakey_tests.rb
@@ -471,7 +475,7 @@ files:
 - lib/tasks/ci/stats.rake
 - lib/tasks/rubocop.rake
 - ndr_dev_support.gemspec
-homepage: https://github.com/PublicHealthEngland/ndr_dev_support
+homepage: https://github.com/NHSDigital/ndr_dev_support
 licenses:
 - MIT
 metadata: {}

data/gemfiles/Gemfile.rails52

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-gemspec path: '..'
-
-gem 'activesupport', '~> 5.2.0'

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

@@ -1,18 +0,0 @@
-# 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 }
-
-  options.merge!(debug: true, inspector: true) if ENV['DEBUG_PHANTOM_JS']
-
-  Capybara::Poltergeist::Driver.new(app, options)
-end
-
-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)