Dpl680 version rails 6 0 minor changes

.github/workflows/ruby_test.yml

@@ -117,6 +117,8 @@ jobs:
         env:
           CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
           CI_NODE_INDEX: ${{ matrix.ci_node_index }}
+          KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
+          KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
           DBPORT: ${{ job.services.mysql.ports[3306] }}
         run: bin/knapsack_pro_rspec
       - name: Upload capybara artifacts
@@ -135,7 +137,7 @@ jobs:
   cucumber_tests:
     runs-on: ubuntu-latest
     env:
-      RAILS_ENV: cucumber
+      RAILS_ENV: test
       BUNDLE_WITHOUT: "deployment profile development test"
     # Services
     # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idservices
@@ -178,12 +180,19 @@ jobs:
         run: |
           bin/setup
           bundle exec rake assets:precompile
+          echo "Reset database database cucumber"
+          RAILS_ENV=cucumber bundle exec rake db:reset
+          echo "Seed database"
+          RAILS_ENV=cucumber bundle exec rake db:seed
       # Actually run our tests
       - name: Run Cucumber tests
         env:
           CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
           CI_NODE_INDEX: ${{ matrix.ci_node_index }}
+          KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
+          KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
           DBPORT: ${{ job.services.mysql.ports[3306] }}
+          RAILS_ENV: cucumber
         run: bin/knapsack_pro_cucumber
       - name: Upload capybara artifacts
         uses: actions/upload-artifact@v2

.rubocop.yml

@@ -39,9 +39,10 @@ Rails/SkipsModelValidations:
     - "features/support/step_definitions/*.rb"
 
 Style/Documentation:
-  Exclude:
-    - "test/**/*"
-    - "spec/**/*"
+  Enabled: false
+  #Exclude:
+  #  - "test/**/*"
+  #  - "spec/**/*"
 
 Rails:
   Enabled: true
@@ -176,7 +177,7 @@ Rails/UniqueValidationWithoutIndex:
   Enabled: false
 
 # Disabling newly introduced cops until we have time to sort out the offenses
-RSpec/FactoryBot/ConsistentParenthesesStyle:
+FactoryBot/ConsistentParenthesesStyle:
   Enabled: false
 
 Rails/I18nLocaleTexts: # new in 2.14
@@ -193,3 +194,28 @@ Rails/ActionControllerTestCase: # new in 2.14
 
 RSpec/NoExpectationExample: # new in 2.13
   Enabled: false
+
+# New in ruby 3 upgrade
+RSpec/IndexedLet:
+  Enabled: false
+
+RSpec/SpecFilePathFormat:
+  Enabled: false
+
+RSpec/PendingWithoutReason:
+  Enabled: false
+
+Capybara/ClickLinkOrButtonStyle:
+  Enabled: false
+
+FactoryBot/FactoryAssociationWithStrategy:
+  Enabled: false
+
+Performance/MapMethodChain:
+  Enabled: false
+
+Rails/ThreeStateBooleanColumn:
+  Enabled: false
+
+RSpec/ExpectInHook:
+  Enabled: false

.rubocop_todo.yml

@@ -589,6 +589,7 @@ RSpec/ContextWording:
     - 'spec/shared_contexts/limber_shared_context.rb'
     - 'spec/uat_actions/integration_suite_tools_spec.rb'
     - 'spec/uat_actions/test_submission_spec.rb'
+    - 'spec/features/gpl207_bug_incorrect_submission_id_on_transfer_spec.rb'
 
 # Offense count: 4
 RSpec/EmptyExampleGroup:
@@ -1860,3 +1861,8 @@ Style/ZeroLengthPredicate:
     - 'app/models/sequencing_pipeline.rb'
     - 'features/support/step_definitions/samples_steps.rb'
     - 'test/shoulda_macros/sanger_macros/resource_test.rb'
+
+Metrics/ClassLength:
+  Exclude:
+    - 'app/middleware/api/endpoint_handler.rb'
+    - 'lib/tasks/add_templates_and_printers_to_pmb.rake'

.ruby-version

@@ -1 +1 @@
-2.7.8
+3.0.6

Dockerfile

@@ -2,7 +2,7 @@ ARG CHIPSET=default
 
 # Use the correct base image depending on the architecture
 # For Apple M1 Chip, run: docker build --build-arg CHIPSET=m1
-FROM ruby:2.7.8-slim AS base_default
+FROM ruby:3.0.6-slim AS base_default
 FROM --platform=linux/amd64 ruby:2.7.8-slim AS base_m1
 FROM base_${CHIPSET} AS base
 
@@ -45,6 +45,7 @@ ADD . /code/
 
 # Install Chrome for being able to run tests
 RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+RUN apt update
 RUN apt install -y ./google-chrome-stable_current_amd64.deb
 RUN rm ./google-chrome-stable_current_amd64.deb
 

Gemfile

@@ -28,7 +28,7 @@ group :default do
 
   # Provides bulk insert capabilities
   gem 'activerecord-import'
-  gem 'record_loader'
+  gem 'record_loader', git: 'https://github.com/sanger/record_loader', branch: 'dpl680_upgrade_ruby3'
 
   gem 'mysql2', platforms: :mri
   gem 'will_paginate'
@@ -40,7 +40,7 @@ group :default do
   gem 'will_paginate-bootstrap'
 
   # Provides eg. error_messages_for previously in rails 2, now deprecated.
-  gem 'dynamic_form'
+  #gem 'dynamic_form'
 
   gem 'daemons'
   gem 'puma'
@@ -186,9 +186,7 @@ group :test, :cucumber do
   gem 'shoulda'
   gem 'simplecov', require: false
   gem 'timecop', require: false
-end
 
-group :cucumber do
   gem 'cucumber_github_formatter'
   gem 'cucumber-rails', require: false
 end