Bump govuk_test from 2.1.2 to 2.2.0

.dockerignore

@@ -0,0 +1,3 @@
+.git
+.gitignore
+README.md

.github/dependabot.yml

@@ -0,0 +1,59 @@
+version: 2
+updates:
+  - package-ecosystem: bundler
+    directory: /
+    schedule:
+      interval: daily
+    allow:
+      # Internal gems
+      - dependency-name: "govuk*"
+        dependency-type: direct
+      - dependency-name: gds-api-adapters
+        dependency-type: direct
+      - dependency-name: gds-sso
+        dependency-type: direct
+      - dependency-name: govspeak
+        dependency-type: direct
+      - dependency-name: plek
+        dependency-type: direct
+      - dependency-name: rubocop-govuk
+        dependency-type: direct
+      # Framework gems
+      - dependency-name: factory_bot
+        dependency-type: direct
+      - dependency-name: mongo
+        dependency-type: direct
+      - dependency-name: mongoid
+        dependency-type: direct
+      - dependency-name: rails
+        dependency-type: direct
+      - dependency-name: rspec-rails
+        dependency-type: direct
+      - dependency-name: sassc-rails
+        dependency-type: direct
+
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: daily
+    allow:
+      # Internal packages
+      - dependency-name: stylelint-config-gds
+        dependency-type: direct
+      # Framework packages
+      - dependency-name: standardx
+        dependency-type: direct
+      - dependency-name: stylelint
+        dependency-type: direct
+
+  # Ruby needs to be upgraded manually in multiple places, so cannot
+  # be upgraded by Dependabot. That effectively makes the below
+  # config redundant, as ruby is the only updatable thing in the
+  # Dockerfile, although this may change in the future. We hope this
+  # config will save a dev from trying to upgrade ruby via Dependabot.
+  - package-ecosystem: docker
+    ignore:
+      - dependency-name: ruby
+    directory: /
+    schedule:
+      interval: weekly

.gitignore

@@ -1,6 +1,14 @@
-log
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+/log/*
+!/log/.keep
 tmp
 coverage
 /coverage
-.DS_Store
-.idea
+node_modules
+yarn-error.log
+public/assets

.rubocop.yml

@@ -0,0 +1,12 @@
+inherit_gem:
+  rubocop-govuk:
+    - config/default.yml
+    - config/rails.yml
+
+inherit_mode:
+  merge:
+    - Exclude
+
+# This app does not have a DB
+Rails/SaveBang:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-2.2.4
+2.7.2

Dockerfile

@@ -0,0 +1,32 @@
+FROM ruby:2.7.2
+
+RUN apt-get update -qq && apt-get upgrade -y && apt-get install -y build-essential nodejs && apt-get clean
+
+# https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit#debian--ubuntu
+RUN apt-get install -y qt5-default libqt5webkit5-dev gstreamer1.0-plugins-base gstreamer1.0-tools gstreamer1.0-x
+
+RUN gem install foreman
+
+# This is not a valid key but it needs to be in the correct format for the ruby client
+ENV GOVUK_NOTIFY_API_KEY test-b56ea330-006a-459b-8af3-8015bb51a0e7-77b95465-3c02-4b09-9371-44e33cbdf9c6
+
+ENV GOVUK_APP_NAME specialist-publisher
+ENV MONGODB_URI mongodb://mongo/govuk-content
+ENV PORT 3064
+ENV RAILS_ENV development
+ENV REDIS_HOST redis
+ENV TEST_MONGODB_URI mongodb://mongo/specialist-publisher-test
+
+ENV APP_HOME /app
+RUN mkdir $APP_HOME
+
+WORKDIR $APP_HOME
+ADD Gemfile* $APP_HOME/
+RUN bundle install
+ADD . $APP_HOME
+
+RUN GOVUK_APP_DOMAIN=www.gov.uk GOVUK_WEBSITE_ROOT=www.gov.uk RAILS_ENV=production bundle exec rails assets:precompile
+
+HEALTHCHECK CMD curl --silent --fail localhost:$PORT || exit 1
+
+CMD foreman run web

Gemfile

@@ -1,55 +1,51 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rails', '4.2.6'
+gem "rails", "6.0.3.6"
 
-gem 'airbrake', '~> 4.2.1'
-gem 'logstasher', '0.6.2'
-gem 'unicorn', '~> 4.9.0'
-gem 'sass-rails', '~> 4.0.3'
-gem 'mongoid', '5.0.1'
-gem 'uglifier', '>= 1.3.0'
-gem 'jquery-rails', '~> 3.1.4'
-gem 'select2-rails', '~> 3.5.9'
-gem 'govuk_sidekiq', '~> 0.0.4'
+gem "bootstrap-kaminari-views"
+gem "fog-aws"
+gem "gds-api-adapters"
+gem "gds-sso"
+gem "govspeak"
+gem "govuk_admin_template"
+gem "govuk_app_config"
+gem "govuk_frontend_toolkit"
+gem "govuk_sidekiq"
+gem "hashdiff"
+gem "jquery-rails"
 gem "kaminari"
-gem 'bootstrap-kaminari-views', '0.0.5'
-gem 'pundit'
-# GDS managed dependencies
-gem 'plek', '~> 1.10'
-gem 'gds-sso', '11.0.0'
-gem 'govuk_admin_template', '~> 3.4.0'
-gem "govuk_frontend_toolkit", "0.44.0"
+gem "kaminari-mongoid"
+gem "mail-notify"
+gem "mongo"
+gem "mongoid"
+gem "plek"
+gem "pundit"
+gem "sassc-rails"
+gem "select2-rails", "< 4" # v4 changes the generated HTML and breaks the e2e tests
+gem "stringex"
+gem "uglifier"
 
-if ENV["GOVSPEAK_DEV"]
-  gem "govspeak", path: "../govspeak"
-else
-  gem "govspeak", "~> 3.5"
-end
-
-if ENV["API_DEV"]
-  gem "gds-api-adapters", path: "../gds-api-adapters"
-else
-  gem "gds-api-adapters", "32.1.0"
+group :development do
+  gem "listen"
 end
 
 group :development, :test do
-  gem 'better_errors', '~> 2.1.1'
-  gem 'binding_of_caller', '~> 0.7.2'
-  gem 'pry-rails'
-  gem 'foreman', '0.74.0'
-  gem 'rspec-rails', '~> 3.3'
-  gem 'simplecov', '0.10.0', require: false
-  gem 'simplecov-rcov', '0.2.3', require: false
-  gem 'database_cleaner', '1.5.1'
-  gem 'factory_girl'
-  gem "capybara", "2.5.0"
-  gem 'capybara-webkit', '1.7.1'
-  gem 'timecop', '0.8.0'
-  gem 'govuk-content-schema-test-helpers', '1.4.0'
-  gem 'govuk-lint'
-  gem 'hashdiff'
+  gem "better_errors"
+  gem "binding_of_caller"
+  gem "capybara-select-2"
+  gem "database_cleaner"
+  gem "factory_bot"
+  gem "govuk-content-schema-test-helpers"
+  gem "govuk_test"
+  gem "pry-rails"
+  gem "puma"
+  gem "rspec-rails"
+  gem "rubocop-govuk"
+  gem "simplecov", require: false
+  gem "timecop"
 end
 
 group :test do
-  gem 'webmock'
+  gem "rails-controller-testing"
+  gem "webmock"
 end