Merge branch 'am-ruby-2.5' into 'master'

Use ruby 2.5 See merge request !104

Merge branch 'am-ruby-2.5' into 'master'
b5c73b7c · Arnold van der Meulen · d62eb065 · 174ff526 · b5c73b7c · b5c73b7c
Commit b5c73b7c authored 5 years ago by Arnold van der Meulen
--- a/.ruby-version
+++ b/.ruby-version
-ruby-2.3.6
+ruby-2.5.5
--- a/Dockerfile
+++ b/Dockerfile
 FROM registry.roqua.nl/roqua/screensmart:production as production

-FROM registry.roqua.nl/roqua/docker-base-images:ruby-2.3
+FROM registry.roqua.nl/roqua/docker-base-images:ruby-2.5

 ADD Gemfile /app
 ADD Gemfile.lock /app

--- a/Gemfile
+++ b/Gemfile
@@ -75,7 +75,7 @@ group :test do
  gem 'rspec-collection_matchers', '~> 1.1.2'
  gem 'rspec-rails'
  gem 'vcr', '~> 3.0.1'
-  gem 'webmock', '~> 1.24.2'
+  gem 'webmock', '~> 3.2'

  gem 'capybara'
  gem 'capybara-screenshot'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,25 +9,25 @@ GEM
  remote: https://rubygems.org/
  specs:
    Ascii85 (1.0.2)
-    actioncable (5.1.6.2)
-      actionpack (= 5.1.6.2)
+    actioncable (5.1.7)
+      actionpack (= 5.1.7)
      nio4r (~> 2.0)
      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.6.2)
-      actionpack (= 5.1.6.2)
-      actionview (= 5.1.6.2)
-      activejob (= 5.1.6.2)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (5.1.6.2)
-      actionview (= 5.1.6.2)
-      activesupport (= 5.1.6.2)
+    actionpack (5.1.7)
+      actionview (= 5.1.7)
+      activesupport (= 5.1.7)
      rack (~> 2.0)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6.2)
-      activesupport (= 5.1.6.2)
+    actionview (5.1.7)
+      activesupport (= 5.1.7)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
@@ -37,22 +37,22 @@ GEM
    active_model_serializers (0.9.7)
      activemodel (>= 3.2)
      concurrent-ruby (~> 1.0)
-    activejob (5.1.6.2)
-      activesupport (= 5.1.6.2)
+    activejob (5.1.7)
+      activesupport (= 5.1.7)
      globalid (>= 0.3.6)
-    activemodel (5.1.6.2)
-      activesupport (= 5.1.6.2)
-    activerecord (5.1.6.2)
-      activemodel (= 5.1.6.2)
-      activesupport (= 5.1.6.2)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
      arel (~> 8.0)
-    activesupport (5.1.6.2)
+    activesupport (5.1.7)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
    afm (0.2.2)
    appsignal (2.3.1)
      rack
@@ -94,12 +94,12 @@ GEM
      json
    colorize (0.8.1)
    concurrent-ruby (1.1.5)
-    connection_pool (2.2.1)
+    connection_pool (2.2.2)
    crack (0.4.3)
      safe_yaml (~> 1.0.0)
    crass (1.0.4)
    daemons (1.2.4)
-    database_cleaner (1.5.3)
+    database_cleaner (1.7.0)
    diff-lcs (1.3)
    docile (1.1.5)
    domain_name (0.5.20170404)
@@ -150,7 +150,7 @@ GEM
    guard-rubocop (1.2.0)
      guard (~> 2.0)
      rubocop (~> 0.20)
-    haml (5.0.1)
+    haml (5.0.4)
      temple (>= 0.8.0)
      tilt
    haml-rails (1.0.0)
@@ -159,7 +159,7 @@ GEM
      haml (>= 4.0.6, < 6.0)
      html2haml (>= 1.0.1)
      railties (>= 4.0.1)
-    hashdiff (0.3.2)
+    hashdiff (0.3.9)
    hashery (2.1.2)
    html2haml (2.2.0)
      erubis (~> 2.7.0)
@@ -212,7 +212,7 @@ GEM
    method_source (0.8.2)
    mime-types (3.2.2)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
    mimemagic (0.3.2)
    mini_portile2 (2.4.0)
    minitest (5.11.3)
@@ -226,7 +226,7 @@ GEM
    nenv (0.3.0)
    netrc (0.11.0)
    nio4r (2.3.1)
-    nokogiri (1.10.1)
+    nokogiri (1.10.3)
      mini_portile2 (~> 2.4.0)
    notiffany (0.1.1)
      nenv (~> 0.1)
@@ -264,21 +264,21 @@ GEM
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rack (2.0.6)
+    public_suffix (3.0.3)
+    rack (2.0.7)
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
-    rails (5.1.6.2)
-      actioncable (= 5.1.6.2)
-      actionmailer (= 5.1.6.2)
-      actionpack (= 5.1.6.2)
-      actionview (= 5.1.6.2)
-      activejob (= 5.1.6.2)
-      activemodel (= 5.1.6.2)
-      activerecord (= 5.1.6.2)
-      activesupport (= 5.1.6.2)
+    rails (5.1.7)
+      actioncable (= 5.1.7)
+      actionmailer (= 5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      activemodel (= 5.1.7)
+      activerecord (= 5.1.7)
+      activesupport (= 5.1.7)
      bundler (>= 1.3.0)
-      railties (= 5.1.6.2)
+      railties (= 5.1.7)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.1)
      actionpack (~> 5.x)
@@ -289,9 +289,9 @@ GEM
      nokogiri (>= 1.6)
    rails-html-sanitizer (1.0.4)
      loofah (~> 2.2, >= 2.2.2)
-    railties (5.1.6.2)
-      actionpack (= 5.1.6.2)
-      activesupport (= 5.1.6.2)
+    railties (5.1.7)
+      actionpack (= 5.1.7)
+      activesupport (= 5.1.7)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
@@ -357,9 +357,9 @@ GEM
    ruby-progressbar (1.9.0)
    ruby-rc4 (0.1.5)
    ruby_dep (1.5.0)
-    ruby_parser (3.9.0)
-      sexp_processor (~> 4.1)
-    safe_yaml (1.0.4)
+    ruby_parser (3.13.1)
+      sexp_processor (~> 4.9)
+    safe_yaml (1.0.5)
    sass (3.4.24)
    sass-rails (5.0.6)
      railties (>= 4.0.0, < 6)
@@ -367,7 +367,7 @@ GEM
      sprockets (>= 2.8, < 4.0)
      sprockets-rails (>= 2.0, < 4.0)
      tilt (>= 1.1, < 3)
-    sexp_processor (4.9.0)
+    sexp_processor (4.12.0)
    shellany (0.0.1)
    simplecov (0.14.1)
      docile (~> 1.1.0)
@@ -386,7 +386,7 @@ GEM
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
-    temple (0.8.0)
+    temple (0.8.1)
    therubyracer (0.12.3)
      libv8 (~> 3.16.14.15)
      ref
@@ -396,7 +396,7 @@ GEM
      rack (>= 1, < 3)
    thor (0.20.3)
    thread_safe (0.3.6)
-    tilt (2.0.7)
+    tilt (2.0.9)
    ttfunk (1.5.0)
    tzinfo (1.2.5)
      thread_safe (~> 0.1)
@@ -415,7 +415,7 @@ GEM
      activemodel (>= 5.0)
      bindex (>= 0.4.0)
      railties (>= 5.0)
-    webmock (1.24.6)
+    webmock (3.5.1)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
      hashdiff
@@ -487,7 +487,7 @@ DEPENDENCIES
  valid_email (~> 0.0)
  vcr (~> 3.0.1)
  web-console
-  webmock (~> 1.24.2)
+  webmock (~> 3.2)

 BUNDLED WITH
   1.17.1
--- a/config/initializers/new_framework_defaults.rb
+++ b/config/initializers/new_framework_defaults.rb
@@ -7,17 +7,17 @@
 # Read the Guide for Upgrading Ruby on Rails for more info on each option.

 # Enable per-form CSRF tokens. Previous versions had false.
-Rails.application.config.action_controller.per_form_csrf_tokens = false
+Rails.application.config.action_controller.per_form_csrf_tokens = true

 # Enable origin-checking CSRF mitigation. Previous versions had false.
-Rails.application.config.action_controller.forgery_protection_origin_check = false
+Rails.application.config.action_controller.forgery_protection_origin_check = true

 # Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
 # Previous versions had false.
-ActiveSupport.to_time_preserves_timezone = false
+ActiveSupport.to_time_preserves_timezone = true

 # Require `belongs_to` associations by default. Previous versions had false.
 Rails.application.config.active_record.belongs_to_required_by_default = true

 # Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = true
+ActiveSupport.halt_callback_chains_on_return_false = false
--- a/spec/cassettes/screensmart.yml
+++ b/spec/cassettes/screensmart.yml
@@ -2,7 +2,7 @@
 http_interactions:
 - request:
    method: get
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/info
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/info
    body:
      encoding: US-ASCII
      string: ''
@@ -59,11 +59,11 @@ http_interactions:
        \                   3.1.0), lintr (>= 1.0.0)\nRoxygenNote:        5.0.1\nNeedsCompilation:
        \  no\nPackaged:           2016-11-01 13:52:28 UTC; root\nBuilt:              R
        3.3.1; ; 2016-11-01 13:52:28 UTC; unix\n"
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 10:56:02 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
    body:
      encoding: UTF-8
      string: '{"answers":[],"domain":["POS-PQ"]}'
@@ -127,11 +127,11 @@ http_interactions:
            }
          }
        }
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 10:56:03 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
    body:
      encoding: UTF-8
      string: '{"answers":[{"EL02":2}],"estimate":1.0,"variance":0.5,"domain":["POS-PQ"]}'
@@ -199,11 +199,11 @@ http_interactions:
            }
          }
        }
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 10:56:04 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/get_itembank_rdata/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/get_itembank_rdata/json
    body:
      encoding: UTF-8
      string: "{}"
@@ -1168,11 +1168,11 @@ http_interactions:
            }
          ]
        }
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 10:56:06 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
    body:
      encoding: UTF-8
      string: '{"answers":[{"EL02":2}],"estimate":0.0,"variance":25.0,"domain":["POS-PQ"]}'
@@ -1240,11 +1240,11 @@ http_interactions:
            }
          }
        }
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 10:56:07 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
    body:
      encoding: UTF-8
      string: '{"answers":[{"enough_answers_to_be_done":1}],"estimate":0.0,"variance":25.0,"domain":["POS-PQ"]}'
@@ -1308,11 +1308,11 @@ http_interactions:
            }
          }
        }
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 10:56:08 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
    body:
      encoding: UTF-8
      string: '{"answers":[{"EL49":1}],"estimate":0.0,"variance":25.0,"domain":["POS-PQ"]}'
@@ -1380,11 +1380,11 @@ http_interactions:
            }
          }
        }
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 10:56:10 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
    body:
      encoding: UTF-8
      string: '{"answers":[{"EL49":2}],"estimate":0.0,"variance":25.0,"domain":["POS-PQ"]}'
@@ -1452,11 +1452,11 @@ http_interactions:
            }
          }
        }
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 10:56:12 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
    body:
      encoding: UTF-8
      string: '{"answers":[{"EL49":1,"EL37":1}],"estimate":-0.6777,"variance":0.6842,"domain":["POS-PQ"]}'
@@ -1525,11 +1525,11 @@ http_interactions:
            }
          }
        }
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 14:59:43 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
    body:
      encoding: UTF-8
      string: '{"answers":[{"EL49":1,"EL37":1,"EL03":1}],"estimate":-1.0326,"variance":0.5685,"domain":["POS-PQ"]}'
@@ -1599,11 +1599,11 @@ http_interactions:
            }
          }
        }
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 14:59:45 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
    body:
      encoding: UTF-8
      string: '{"answers":[{"EL49":1,"EL37":1,"EL03":1,"EL38":1}],"estimate":-1.3085,"variance":0.5082,"domain":["POS-PQ"]}'
@@ -1674,11 +1674,11 @@ http_interactions:
            }
          }
        }
-    http_version: 
+    http_version:
  recorded_at: Wed, 02 Nov 2016 14:59:46 GMT
 - request:
    method: post
-    uri: https://deploy:needed_for_opencpu_integration@opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
+    uri: https://opencpu.roqua-staging.nl/ocpu/library/screensmart/R/call_shadowcat/json
    body:
      encoding: UTF-8
      string: '{"answers":[],"domain":["NEG-PQ"]}'
@@ -1746,6 +1746,6 @@ http_interactions:
            }
          }
        }
-    http_version: 
+    http_version:
  recorded_at: Mon, 16 Jan 2017 10:21:51 GMT
 recorded_with: VCR 3.0.1
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -45,6 +45,8 @@ RSpec.configure do |config|

  Rails.application.routes.default_url_options[:host] = 'test_host'

+  DatabaseCleaner.allow_remote_database_url = true
+
  config.before(:suite) do
    DatabaseCleaner.clean_with(:truncation)
  end