Merge pull request #8606 from opf/fix/bump_gems

Fix/bump gems
4 years ago · 084c0db045
parent 79bfe2a922 c9ad82af1c
commit 084c0db045
3 changed files with 36 additions and 46 deletions
--- a/16
+++ b/16
@ -42,7 +42,7 @@ gem 'rdoc', '>= 2.4.2'
 # Maintain our own omniauth due to relative URL root issues
 # see upstream PR: https://github.com/omniauth/omniauth/pull/903
 gem 'omniauth', git: 'https://github.com/opf/omniauth', ref: 'fe862f986b2e846e291784d2caa3d90a658c67f0'
-gem 'doorkeeper', '~> 5.3.1'
+gem 'doorkeeper', '~> 5.4.0'
 gem 'request_store', '~> 1.5.0'

 gem 'warden', '~> 1.2'
@ -77,13 +77,13 @@ gem 'commonmarker', '~> 0.21.0'

 # HTML pipeline for transformations on text formatter output
 # such as sanitization or additional features
-gem 'html-pipeline', '~> 2.12.0'
+gem 'html-pipeline', '~> 2.14.0'
 # Tasklist parsing and renderer
 gem 'deckar01-task_list', '~> 2.3.1'
 # Requires escape-utils for faster escaping
 gem 'escape_utils', '~> 1.0'
 # Syntax highlighting used in html-pipeline with rouge
-gem 'rouge', '~> 3.17.0'
+gem 'rouge', '~> 3.22.0'
 # HTML sanitization used for html-pipeline
 gem 'sanitize', '~> 5.2.1'
 # HTML autolinking for mails and urls (replaces autolink)
@ -137,10 +137,10 @@ gem 'lograge', '~> 0.11.0'

 # catch exceptions and send them to any airbrake compatible backend
 # don't require by default, instead load on-demand when actually configured
-gem 'airbrake', '~> 9.4.3', require: false
+gem 'airbrake', '~> 11.0.0', require: false

 gem 'prawn', '~> 2.2'
-gem 'prawn-markup', '~> 0.2.1'
+gem 'prawn-markup', '~> 0.3.0'

 gem 'cells-erb', '~> 0.1.0'
 gem 'cells-rails', '~> 0.0.9'
@ -187,7 +187,7 @@ gem 'ruby-progressbar', '~> 1.10.0', require: false
 group :test do
  gem 'launchy', '~> 2.5.0'
  gem 'rack-test', '~> 1.1.0'
-  gem 'shoulda-context', '~> 1.2'
+  gem 'shoulda-context', '~> 2.0'

  # Test prof provides factories from code
  # and other niceties
@ -226,12 +226,12 @@ group :test do
  gem 'webmock', '~> 3.8.2', require: false

  # Mock selenium requests through proxy (for feature tests)
-  gem 'puffing-billy', '~> 2.3.1'
+  gem 'puffing-billy', '~> 2.4.0'
  gem 'table_print', '~> 1.5.6'

  gem 'equivalent-xml', '~> 0.6'
  gem 'json_spec', '~> 1.1.4'
-  gem 'shoulda-matchers', '~> 3.1', require: nil
+  gem 'shoulda-matchers', '~> 4.4', require: nil

  gem 'parallel_tests', '~> 3.1'
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -284,9 +284,9 @@ GEM
      public_suffix (>= 2.0.2, < 5.0)
    aes_key_wrap (1.1.0)
    afm (0.2.2)
-    airbrake (9.4.3)
-      airbrake-ruby (~> 4.6)
-    airbrake-ruby (4.6.0)
+    airbrake (11.0.0)
+      airbrake-ruby (~> 5.0)
+    airbrake-ruby (5.0.2)
      rbtree3 (~> 0.5)
    ast (2.4.1)
    attr_required (1.0.1)
@ -295,7 +295,7 @@ GEM
    awesome_nested_set (3.2.1)
      activerecord (>= 4.0.0, < 7.0)
    aws-eventstream (1.1.0)
-    aws-partitions (1.359.0)
+    aws-partitions (1.361.0)
    aws-sdk-core (3.105.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.239.0)
@ -304,7 +304,7 @@ GEM
    aws-sdk-kms (1.37.0)
      aws-sdk-core (~> 3, >= 3.99.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.79.0)
+    aws-sdk-s3 (1.79.1)
      aws-sdk-core (~> 3, >= 3.104.3)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.1)
@ -315,7 +315,6 @@ GEM
      aws-eventstream (~> 1, >= 1.0.2)
    backports (3.11.4)
    bcrypt (3.1.15)
-    bigdecimal (2.0.0)
    bindata (2.4.8)
    binding_of_caller (0.8.0)
      debug_inspector (>= 0.0.1)
@ -444,7 +443,7 @@ GEM
      uber (< 0.2.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.3.1)
+    doorkeeper (5.4.0)
      railties (>= 5)
    dry-configurable (0.11.6)
      concurrent-ruby (~> 1.0)
@ -501,7 +500,7 @@ GEM
    fastimage (2.1.7)
    ffi (1.13.1)
    flamegraph (0.9.5)
-    fog-aws (3.6.6)
+    fog-aws (3.6.7)
      fog-core (~> 2.1)
      fog-json (~> 1.1)
      fog-xml (~> 0.1)
@ -523,7 +522,7 @@ GEM
    fuubar (2.5.0)
      rspec-core (~> 3.0)
      ruby-progressbar (~> 1.4)
-    get_process_mem (0.2.5)
+    get_process_mem (0.2.7)
      ffi (~> 1.0)
    gherkin (5.1.0)
    git (1.7.0)
@ -546,7 +545,7 @@ GEM
    hashdiff (1.0.1)
    hashery (2.1.2)
    hashie (3.6.0)
-    html-pipeline (2.12.3)
+    html-pipeline (2.14.0)
      activesupport (>= 2)
      nokogiri (>= 1.4)
    htmldiff (0.0.1)
@ -603,7 +602,7 @@ GEM
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.6.0)
+    loofah (2.7.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
@ -644,8 +643,7 @@ GEM
    octokit (4.18.0)
      faraday (>= 0.9)
      sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.10.12)
-      bigdecimal (>= 1.0, < 3)
+    oj (3.10.13)
    okcomputer (1.18.2)
    omniauth-saml (1.10.2)
      omniauth (~> 1.3, >= 1.3.2)
@ -664,7 +662,7 @@ GEM
    openproject-token (2.1.3)
      activemodel
    parallel (1.19.2)
-    parallel_tests (3.1.0)
+    parallel_tests (3.2.0)
      parallel
    parser (2.7.1.4)
      ast (~> 2.4.1)
@ -674,7 +672,7 @@ GEM
    pdf-core (0.8.1)
    pdf-inspector (1.3.0)
      pdf-reader (>= 1.0, < 3.0.a)
-    pdf-reader (2.2.0)
+    pdf-reader (2.4.0)
      Ascii85 (~> 1.0.0)
      afm (~> 0.2.1)
      hashery (~> 2.0)
@ -689,7 +687,7 @@ GEM
    prawn (2.3.0)
      pdf-core (~> 0.8.1)
      ttfunk (~> 1.6)
-    prawn-markup (0.2.2)
+    prawn-markup (0.3.0)
      nokogiri
      prawn
      prawn-table
@ -710,7 +708,7 @@ GEM
      binding_of_caller (~> 0.7)
      pry (~> 0.13)
    public_suffix (4.0.5)
-    puffing-billy (2.3.1)
+    puffing-billy (2.4.0)
      addressable (~> 2.5)
      em-http-request (~> 1.1, >= 1.1.0)
      em-synchrony
@ -783,7 +781,7 @@ GEM
    rainbow (3.0.0)
    raindrops (0.19.1)
    rake (13.0.1)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    rbtree3 (0.6.0)
@ -813,7 +811,7 @@ GEM
    roar (1.1.0)
      representable (~> 3.0.0)
    rotp (6.1.0)
-    rouge (3.17.0)
+    rouge (3.22.0)
    rspec (3.9.0)
      rspec-core (~> 3.9.0)
      rspec-expectations (~> 3.9.0)
@ -886,9 +884,9 @@ GEM
      childprocess (>= 0.5, < 4.0)
      rubyzip (>= 1.2.2)
    semantic (1.6.1)
-    shoulda-context (1.2.2)
-    shoulda-matchers (3.1.3)
-      activesupport (>= 4.0.0)
+    shoulda-context (2.0.0)
+    shoulda-matchers (4.4.1)
+      activesupport (>= 4.2.0)
    spreadsheet (1.2.6)
      ruby-ole (>= 1.0)
    spring (2.1.1)
@ -985,7 +983,7 @@ DEPENDENCIES
  acts_as_list (~> 0.9.9)
  acts_as_tree (~> 2.9.0)
  addressable (~> 2.7.0)
-  airbrake (~> 9.4.3)
+  airbrake (~> 11.0.0)
  auto_strip_attributes (~> 2.5)
  awesome_nested_set (~> 3.2.0)
  aws-sdk-core (~> 3.105.0)
@ -1017,7 +1015,7 @@ DEPENDENCIES
  delayed_cron_job (~> 0.7.2)
  delayed_job_active_record (~> 4.1.4)
  disposable (~> 0.4.7)
-  doorkeeper (~> 5.3.1)
+  doorkeeper (~> 5.4.0)
  equivalent-xml (~> 0.6)
  escape_utils (~> 1.0)
  factory_bot (~> 6.1.0)
@ -1030,7 +1028,7 @@ DEPENDENCIES
  gon (~> 6.3.2)
  grape (~> 1.3.0)
  grids!
-  html-pipeline (~> 2.12.0)
+  html-pipeline (~> 2.14.0)
  htmldiff
  i18n-js (~> 3.7.0)
  json_spec (~> 1.1.4)
@ -1080,12 +1078,12 @@ DEPENDENCIES
  plaintext (~> 0.3.2)
  posix-spawn (~> 0.3.13)
  prawn (~> 2.2)
-  prawn-markup (~> 0.2.1)
+  prawn-markup (~> 0.3.0)
  pry-byebug (~> 3.9.0)
  pry-rails (~> 0.3.6)
  pry-rescue (~> 1.5.2)
  pry-stack_explorer (~> 0.5.1)
-  puffing-billy (~> 2.3.1)
+  puffing-billy (~> 2.4.0)
  puma (~> 4.3.5)
  rack-attack (~> 6.3.1)
  rack-cors (~> 1.1.1)
@ -1105,7 +1103,7 @@ DEPENDENCIES
  retriable (~> 3.1.1)
  rinku (~> 2.0.4)
  roar (~> 1.1.0)
-  rouge (~> 3.17.0)
+  rouge (~> 3.22.0)
  rspec (~> 3.9.0)
  rspec-activemodel-mocks (~> 1.1.0)!
  rspec-rails (~> 4.0.0)
@ -1120,8 +1118,8 @@ DEPENDENCIES
  secure_headers (~> 6.3.0)
  selenium-webdriver (~> 3.14)
  semantic (~> 1.6.1)
-  shoulda-context (~> 1.2)
-  shoulda-matchers (~> 3.1)
+  shoulda-context (~> 2.0)
+  shoulda-matchers (~> 4.4)
  spring
  spring-commands-rspec
  sprockets (~> 3.7.0)
--- a/modules/global_roles/spec/models/principal_role_spec.rb
+++ b/modules/global_roles/spec/models/principal_role_spec.rb
@ -29,14 +29,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

 describe PrincipalRole, type: :model do
-  describe 'ATTRIBUTES' do
-    before :each do
-    end
-
-    it { is_expected.to belong_to :principal }
-    it { is_expected.to belong_to :role }
-  end
-
  describe '#valid?' do
    before(:each) do
      @principal_role = FactoryBot.build(:principal_role)