Merge pull request #243 from moneyadviceservice/ruby-upgrade

Upgrade Ruby to 2.7.7

.github/workflows/test.yml

@@ -0,0 +1,41 @@
+name: Test
+
+on: push
+
+jobs:
+  test:
+    name: Run tests
+
+    runs-on: ubuntu-latest
+    env:
+      RAILS_ENV: test
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler: 1.17.2
+          bundler-cache: true
+
+      - name: Setup Node.js environment
+        uses: actions/[email protected]
+        with:
+          node-version: '14.x'
+
+      - name: Install bower
+        run: npm install -g bower
+
+      - name: Install bowndler packages
+        run: bundle exec bowndler install && bundle exec bowndler update
+
+      - name: Run npm install
+        run: npm install
+
+      - name: Run cucumber tests
+        run: bundle exec cucumber
+
+      - name: Run tests
+        run: bundle exec rspec

.ruby-version

@@ -1 +1 @@
-2.5.3
+2.7.7

Gemfile

@@ -1,14 +1,18 @@
 source 'https://rubygems.org'
-source 'http://gems.dev.mas.local'
+
+# force Bundler to use SSL
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Declare your gem's dependencies in wpcc.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
 
-ruby '2.5.3'
+ruby IO.read('.ruby-version').chomp
 
+gem 'bigdecimal', '1.3.5'
 gem 'bowndler'
+gem 'dough-ruby', github: 'moneyadviceservice/dough', branch: 'PostMessages_v5.45'
 gem 'rails', '~> 4.2.7'
 gem 'rubocop', '~> 0.63.1', require: false
 gem 'sass-rails'
@@ -27,13 +31,10 @@ group :development, :test do
 end
 
 group :test do
-  gem 'brakeman', '~> 4.5.1', require: false
   gem 'capybara', '< 3.0'
   gem 'cucumber-rails', require: false
-  gem 'danger', require: false
-  gem 'danger-rubocop', require: false
   gem 'poltergeist'
-  gem 'simplecov', require: false
+  gem 'phantomjs', require: 'phantomjs/poltergeist'
   gem 'site_prism'
   gem 'timecop'
   gem 'tzinfo-data'

lib/wpcc/version.rb

@@ -1,8 +1,8 @@
 module Wpcc
   module Version
     MAJOR = 3
-    MINOR = 1
-    PATCH = 1
+    MINOR = 2
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].join('.')
   end

spec/rails_helper.rb

@@ -3,18 +3,11 @@
 require File.expand_path('dummy/config/environment', __dir__)
 abort('Do not run the tests in production mode!!!') if Rails.env.production?
 require 'rspec/rails'
-require 'simplecov'
 
 Dir[
   ::Wpcc::Engine.root.join('spec/shared_examples/**.rb')
 ].each { |f| require f }
 
-SimpleCov.start do
-  add_filter '/spec/'
-end
-
-SimpleCov.minimum_coverage 85
-
 RSpec.configure do |config|
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
@@ -31,3 +24,24 @@
     with.library :rails
   end
 end
+
+# a workaround to avoid MonitorMixin double-initialize error
+# https://github.com/rails/rails/issues/34790#issuecomment-681034561
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+  if Gem::Version.new(Rails.version) < Gem::Version.new('5.0.0')
+    class ActionController::TestResponse < ActionDispatch::TestResponse
+      def recycle!
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0')
+          @mon_data = nil
+          @mon_data_owner_object_id = nil
+        else
+          @mon_mutex = nil
+          @mon_mutex_owner_object_id = nil
+        end
+        initialize
+      end
+    end
+  else
+    warn "Monkeypatch for ActionController::TestResponse is no longer needed"
+  end
+end

wpcc.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.test_files = Dir['spec/**/*']
 
-  s.add_dependency 'dough-ruby', '~> 5.38'
+  s.add_dependency 'dough-ruby', '< 6'
   s.add_dependency 'meta-tags'
   s.add_runtime_dependency 'modernizr-rails', '~> 2.6.2'