Merge pull request #431 from Crown-Commercial-Service/release-1.5.1

STAGING - Release 1.5.1

.github/dependabot.yml

@@ -1,10 +1,17 @@
 version: 2
 updates:
-  - package-ecosystem: "bundler"
+  - package-ecosystem: bundler
     directory: "/"
     schedule:
-      interval: "weekly"
-  - package-ecosystem: "npm"
+      interval: weekly
+      day: sunday
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: weekly
+      day: sunday
+  - package-ecosystem: github-actions
     directory: "/"
     schedule:
       interval: weekly
+      day: sunday

.github/workflows/rubyonrails.yml

@@ -0,0 +1,52 @@
+name: "Ruby on Rails CI"
+
+on:
+  push:
+    branches-ignore:
+      - develop
+      - staging
+      - main
+  pull_request:
+
+jobs:
+  unit-test:
+    runs-on: ubuntu-20.04
+
+    services:
+      postgres:
+        image: postgis/postgis:11-2.5
+        ports:
+          - "5432:5432"
+        env:
+          POSTGRES_DB: rails_test
+          POSTGRES_USER: rails
+          POSTGRES_PASSWORD: password
+
+    env:
+      RAILS_ENV: test
+      DATABASE_URL: "postgis://rails:password@localhost:5432/rails_test"
+      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install Ruby and gems
+        uses: ruby/[email protected]
+        with:
+          bundler-cache: true
+
+      - name: Set up database schema
+        run: bin/rails db:test:prepare
+
+      - name: Compile assets
+        run: NODE_OPTIONS=--openssl-legacy-provider bin/rails assets:precompile
+
+      - name: Run unit tests
+        run: bin/rake
+
+      - name: publish code coverage
+        uses: paambaati/[email protected]
+        with:
+          debug: true
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'develop' }}

.nvmrc

@@ -0,0 +1 @@
+16

.travis.yml

@@ -16,6 +16,11 @@ deploy:
     repo: Crown-Commercial-Service/pmp-idam
     all_branches: true
     condition: $DEPLOY_BRANCH = TRUE
+branches:
+  only:
+    - develop
+    - staging
+    - main
 env:
   global:
     - RAILS_ENV=test

Gemfile

@@ -6,21 +6,21 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '2.7.6'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.1.7'
+gem 'rails', '~> 6.1.7', '>= 6.1.7.2'
 # Use sqlite3 as the database for Active Record
-gem 'sqlite3', '~> 1.5'
+gem 'sqlite3', '~> 1.6'
 # Use Puma as the app server
-gem 'puma', '~> 6.0'
+gem 'puma', '~> 6.1'
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem 'webpacker', '~> 5.4', '>= 5.4.3'
+gem 'webpacker', '~> 5.4', '>= 5.4.4'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 # gem 'turbolinks', '~> 5'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.11', '>= 2.11.5'
 # Use Active Model has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 # for cognito
-gem 'aws-sdk-cognitoidentityprovider', '~> 1.70.0'
+gem 'aws-sdk-cognitoidentityprovider', '~> 1.73.0'
 # importing creds
 gem 'aws-sdk-s3', '~> 1'
 # Reduces boot times through caching; required in config/boot.rb
@@ -31,12 +31,12 @@ gem 'arask', '1.2.3'
 
 # for postgresql
 gem 'activerecord-postgis-adapter', '~> 7.1.1'
-gem 'pg', '~> 1.4.4'
+gem 'pg', '~> 1.4.6'
 # remove if not option two taken in project
 gem 'jwt'
 gem 'rest-client', '~> 2.1'
 gem 'rollbar'
-gem 'roo', '~> 2.9.0'
+gem 'roo', '~> 2.10.0'
 # remove if not option two taken in project
 
 # For canonical urls
@@ -53,18 +53,18 @@ group :development, :test do
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
   gem 'dotenv-rails', '>= 2.8.1'
   gem 'i18n-tasks', '>= 1.0.12'
-  gem 'rspec-rails', '>= 5.1.2'
+  gem 'rspec-rails', '>= 6.0.1'
   gem 'rubocop', '>= 0.91.1'
   gem 'rubocop-performance', '>= 1.8.1'
-  gem 'rubocop-rails', '>= 2.16.1'
+  gem 'rubocop-rails', '>= 2.18.0'
   gem 'rubocop-rspec', '>= 1.43.2' # or gem 'rubocop-minitest'
   gem 'brakeman'
   gem 'pry-rails'
 end
 
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem 'listen', '~> 3.7'
+  gem 'listen', '~> 3.8'
   gem 'web-console', '>= 4.2.0'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'