Merge branch 'staging'

Author: Chris Smith

.github/workflows/test.yml

@@ -0,0 +1,48 @@
+name: Ruby
+
+env:
+  TZ: Europe/London
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_DATABASE: mixtio_test
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+    env:
+      RAILS_ENV: test
+      DB_PORT: 3306
+      DB_PASSWORD: root
+
+    steps:
+    - name: Start MySQL
+      run: sudo service mysql start
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true # Runs bundle install and caches gems. See the ruby_test.yml
+                            # example if you need more control over bundler.
+    - name: Set up environment
+      run: |
+        bundle exec rails db:setup
+
+    - name: Run tests
+      run: bundle exec rspec

.gitignore

@@ -14,10 +14,6 @@ node_modules
 
 # TODO Comment out these rules if you are OK with secrets being uploaded to the repo
 config/initializers/secret_token.rb
-config/secrets.yml
-config/ldap.yml
-config/print_service.yml
-config/mailer.yml
 
 ## Environment normalisation:
 /.bundle

.travis.yml

@@ -7,7 +7,8 @@ git_source(:github) do |repo_name|
 end
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0'
+gem 'rails', '~> 6.1.0'
+gem 'mysql2', '~> 0.5.0'
 gem 'bootsnap'
 gem 'rails-controller-testing'
 # Use SCSS for stylesheets
@@ -16,8 +17,6 @@ gem 'sass-rails'
 gem 'uglifier'
 # Use CoffeeScript for .coffee assets and views
 gem 'coffee-rails'
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
 gem 'launchy'
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
@@ -61,14 +60,12 @@ end
 
 group :test do
   gem 'capybara'
-  gem 'selenium-webdriver'
+  gem 'webdrivers', '~> 4.0', require: false
   gem 'database_cleaner'
   gem 'rake'
 end
 
 group :development, :test do
-  # Use sqlite3 as the database for Active Record
-  gem 'sqlite3'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
@@ -77,14 +74,9 @@ group :development, :test do
   gem 'rspec-rails'
   gem 'with_model'
   gem 'raml_ruby'
-  # Headless browser testing
-  gem 'phantomjs'
-  gem 'poltergeist'
-  gem 'teaspoon-jasmine'
   gem 'listen'
 end
 
 group :deployment do
   gem 'therubyracer'
-  gem 'mysql2', '~> 0.5.0'
 end