Merge pull request #8092 from opf/fix/bump_gems

Fix/bump gems
5 years ago · 9e00efd1cd
parent 5c3e801418 69b2db5e1a
commit 9e00efd1cd
3 changed files with 47 additions and 52 deletions
--- a/19
+++ b/19
@ -50,8 +50,7 @@ gem 'warden-basic_auth', '~> 0.2.1'

 gem 'will_paginate', '~> 3.1.7'

-# Replace once friendly_id release supports rails 6
-gem 'friendly_id', git: 'https://github.com/norman/friendly_id', ref: '67422c04e1bfed4207b2a04826bc67ec0e231ce7'
+gem 'friendly_id', '~> 5.3.0'

 gem 'acts_as_list', '~> 0.9.9'
 gem 'acts_as_tree', '~> 2.9.0'
@ -104,19 +103,19 @@ gem 'posix-spawn', '~> 0.3.13', require: false

 gem 'bcrypt', '~> 3.1.6'

-gem 'multi_json', '~> 1.13.1'
-gem 'oj', '~> 3.9.1'
+gem 'multi_json', '~> 1.14.1'
+gem 'oj', '~> 3.10.2'

 gem 'daemons'
 gem 'delayed_job_active_record', '~> 4.1.4'

-gem 'rack-protection', '~> 2.0.0'
+gem 'rack-protection', '~> 2.0.8'

 # Rack::Attack is a rack middleware to protect your web app from bad clients.
 # It allows whitelisting, blacklisting, throttling, and tracking based
 # on arbitrary properties of the request.
 # https://github.com/kickstarter/rack-attack
-gem 'rack-attack', '~> 6.1.0'
+gem 'rack-attack', '~> 6.2.2'

 # CSP headers
 gem 'secure_headers', '~> 6.3.0'
@ -127,7 +126,7 @@ gem 'browser', '~> 2.6.1'
 # Providing health checks
 gem 'okcomputer', '~> 1.18.1'

-gem 'gon', '~> 6.2.1'
+gem 'gon', '~> 6.3.2'

 # Lograge to provide sane and non-verbose logging
 gem 'lograge', '~> 0.10.0'
@ -153,9 +152,9 @@ group :production do
  gem 'unicorn-worker-killer', require: false
 end

-gem 'autoprefixer-rails', '~> 9.4.5'
+gem 'autoprefixer-rails', '~> 9.7.4'
 gem 'bourbon', '~> 6.0.0'
-gem 'i18n-js', '~> 3.2.0'
+gem 'i18n-js', '~> 3.6.0'
 gem 'sassc-rails', '~> 2.1.0'
 gem 'sprockets', '~> 3.7.0'

@ -284,7 +283,7 @@ gem 'roar', '~> 1.1.0'

 platforms :mri, :mingw, :x64_mingw do
  group :postgres do
-    gem 'pg', '~> 1.1.0'
+    gem 'pg', '~> 1.2.2'
  end

  # Support application loading when no database exists yet.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -31,14 +31,6 @@ GIT
      capybara
      rspec

-GIT
-  remote: https://github.com/norman/friendly_id
-  revision: 67422c04e1bfed4207b2a04826bc67ec0e231ce7
-  ref: 67422c04e1bfed4207b2a04826bc67ec0e231ce7
-  specs:
-    friendly_id (5.2.5)
-      activerecord (>= 4.0.0)
-
 GIT
  remote: https://github.com/opf/omniauth
  revision: fe862f986b2e846e291784d2caa3d90a658c67f0
@ -304,7 +296,7 @@ GEM
      rbtree3 (~> 0.5)
    ast (2.4.0)
    attr_required (1.0.1)
-    autoprefixer-rails (9.4.7)
+    autoprefixer-rails (9.7.4)
      execjs
    awesome_nested_set (3.2.0)
      activerecord (>= 4.0.0, < 7.0)
@ -332,7 +324,7 @@ GEM
    bindata (2.4.4)
    binding_of_caller (0.8.0)
      debug_inspector (>= 0.0.1)
-    bootsnap (1.4.5)
+    bootsnap (1.4.6)
      msgpack (~> 1.0)
    bourbon (6.0.0)
      thor (~> 0.19)
@ -378,7 +370,7 @@ GEM
      ruby-enum (~> 0.5)
    compare-xml (0.66)
      nokogiri (~> 1.8)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
    cork (0.3.0)
      colored2 (~> 3.1)
    crack (0.4.3)
@ -516,6 +508,8 @@ GEM
      fog-core
      nokogiri (>= 1.5.11, < 2.0.0)
    formatador (0.2.5)
+    friendly_id (5.3.0)
+      activerecord (>= 4.0.0)
    fuubar (2.3.2)
      rspec-core (~> 3.0)
      ruby-progressbar (~> 1.4)
@ -524,8 +518,9 @@ GEM
    git (1.5.0)
    globalid (0.4.2)
      activesupport (>= 4.2.0)
-    gon (6.2.1)
-      actionpack (>= 3.0)
+    gon (6.3.2)
+      actionpack (>= 3.0.20)
+      i18n (>= 0.7)
      multi_json
      request_store (>= 1.0)
    grape (1.3.0)
@ -539,7 +534,7 @@ GEM
    hashdiff (1.0.0)
    hashery (2.1.2)
    hashie (3.6.0)
-    html-pipeline (2.12.0)
+    html-pipeline (2.12.3)
      activesupport (>= 2)
      nokogiri (>= 1.4)
    htmldiff (0.0.1)
@ -548,7 +543,7 @@ GEM
    httpclient (2.8.3)
    i18n (1.8.2)
      concurrent-ruby (~> 1.0)
-    i18n-js (3.2.1)
+    i18n-js (3.6.0)
      i18n (>= 0.6.6)
    icalendar (2.5.3)
      ice_cube (~> 0.16)
@ -556,7 +551,7 @@ GEM
    interception (0.5)
    ipaddress (0.8.3)
    iso8601 (0.12.1)
-    jaro_winkler (1.5.3)
+    jaro_winkler (1.5.4)
    jmespath (1.4.0)
    jquery-tablesorter (1.27.0)
      railties (~> 6.0.0, >= 3.2)
@ -616,8 +611,8 @@ GEM
    minisyntax (0.2.5)
    minitest (5.14.0)
    mixlib-shellout (2.1.0)
-    msgpack (1.3.1)
-    multi_json (1.13.1)
+    msgpack (1.3.3)
+    multi_json (1.14.1)
    multi_test (0.1.2)
    multipart-post (2.1.1)
    mustermann (1.1.1)
@ -630,13 +625,13 @@ GEM
    newrelic_rpm (6.6.0.358)
    nio4r (2.5.2)
    no_proxy_fix (0.1.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
      mini_portile2 (~> 2.4.0)
    nokogumbo (2.0.1)
      nokogiri (~> 1.8, >= 1.8.4)
    octokit (4.14.0)
      sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.9.1)
+    oj (3.10.3)
    okcomputer (1.18.1)
    omniauth-saml (1.10.1)
      omniauth (~> 1.3, >= 1.3.2)
@ -653,10 +648,10 @@ GEM
      validate_url
      webfinger (>= 1.0.1)
    openproject-token (1.0.2)
-    parallel (1.17.0)
+    parallel (1.19.1)
    parallel_tests (2.29.2)
      parallel
-    parser (2.6.4.0)
+    parser (2.7.0.4)
      ast (~> 2.4.0)
    passenger (6.0.2)
      rack
@ -670,7 +665,7 @@ GEM
      hashery (~> 2.0)
      ruby-rc4
      ttfunk
-    pg (1.1.4)
+    pg (1.2.2)
    plaintext (0.3.3)
      activesupport (> 2.2.1)
      nokogiri (~> 1.10, >= 1.10.4)
@ -700,12 +695,12 @@ GEM
      binding_of_caller (>= 0.7)
      pry (>= 0.9.11)
    public_suffix (4.0.1)
-    puma (4.3.1)
+    puma (4.3.3)
      nio4r (~> 2.0)
-    rack (2.1.1)
+    rack (2.2.2)
    rack-accept (0.4.5)
      rack (>= 0.4)
-    rack-attack (6.1.0)
+    rack-attack (6.2.2)
      rack (>= 1.0, < 3)
    rack-mini-profiler (1.0.1)
      rack (>= 1.2.0)
@ -715,7 +710,7 @@ GEM
      httpclient
      json-jwt (>= 1.9.0)
      rack
-    rack-protection (2.0.7)
+    rack-protection (2.0.8.1)
      rack
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
@ -789,6 +784,7 @@ GEM
      mime-types (>= 1.16, < 4.0)
      netrc (~> 0.8)
    retriable (3.1.2)
+    rexml (3.2.4)
    rinku (2.0.4)
    roar (1.1.0)
      representable (~> 3.0.0)
@ -817,11 +813,12 @@ GEM
    rspec-retry (0.6.1)
      rspec-core (> 3.3)
    rspec-support (3.9.0)
-    rubocop (0.74.0)
+    rubocop (0.80.1)
      jaro_winkler (~> 1.5.1)
      parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
      rainbow (>= 2.2.2, < 4.0)
+      rexml
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 1.4.0, < 1.7)
    ruby-duration (3.2.3)
@ -911,7 +908,7 @@ GEM
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.7.5)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
    unicorn (5.5.1)
      kgio (~> 2.6)
      raindrops (~> 0.7)
@ -960,7 +957,7 @@ DEPENDENCIES
  acts_as_tree (~> 2.9.0)
  addressable (~> 2.7.0)
  airbrake (~> 9.4.3)
-  autoprefixer-rails (~> 9.4.5)
+  autoprefixer-rails (~> 9.7.4)
  awesome_nested_set (~> 3.2.0)
  aws-sdk-core (~> 3.66.0)
  aws-sdk-s3 (~> 1.48.0)
@ -996,14 +993,14 @@ DEPENDENCIES
  faker
  flamegraph
  fog-aws
-  friendly_id!
+  friendly_id (~> 5.3.0)
  fuubar (~> 2.3.2)
-  gon (~> 6.2.1)
+  gon (~> 6.3.2)
  grape (~> 1.3.0)
  grids!
  html-pipeline (~> 2.12.0)
  htmldiff
-  i18n-js (~> 3.2.0)
+  i18n-js (~> 3.6.0)
  json_spec (~> 1.1.4)
  ladle
  launchy (~> 2.4.3)
@ -1012,12 +1009,12 @@ DEPENDENCIES
  livingstyleguide (~> 2.1.0)
  lograge (~> 0.10.0)
  meta-tags (~> 2.11.0)
-  multi_json (~> 1.13.1)
+  multi_json (~> 1.14.1)
  my_page!
  net-ldap (~> 0.16.0)
  newrelic_rpm
  nokogiri (~> 1.10.8)
-  oj (~> 3.9.1)
+  oj (~> 3.10.2)
  okcomputer (~> 1.18.1)
  omniauth!
  omniauth-openid-connect!
@ -1047,7 +1044,7 @@ DEPENDENCIES
  overviews!
  parallel_tests (~> 2.29.2)
  passenger (~> 6.0.1)
-  pg (~> 1.1.0)
+  pg (~> 1.2.2)
  plaintext (~> 0.3.2)
  posix-spawn (~> 0.3.13)
  prawn (~> 2.2)
@ -1057,9 +1054,9 @@ DEPENDENCIES
  pry-rescue (~> 1.5.0)
  pry-stack_explorer (~> 0.4.9.2)
  puma (~> 4.3.1)
-  rack-attack (~> 6.1.0)
+  rack-attack (~> 6.2.2)
  rack-mini-profiler
-  rack-protection (~> 2.0.0)
+  rack-protection (~> 2.0.8)
  rack-test (~> 1.1.0)
  rack_session_access
  rails (~> 6.0.2)
--- a/modules/bim/spec/requests/api/bcf/v2_1/topics_api_spec.rb
+++ b/modules/bim/spec/requests/api/bcf/v2_1/topics_api_spec.rb
@ -678,11 +678,10 @@ describe 'BCF 2.1 topics resource', type: :request, content_type: :json, with_ma

    it_behaves_like 'bcf api successful response' do
      let(:expected_body) do
-        issue = Bim::Bcf::Issue.last
-        work_package = WorkPackage.last
+        work_package.reload

        {
-          guid: issue&.uuid,
+          guid: bcf_issue&.uuid,
          topic_type: type.name,
          topic_status: status.name,
          priority: priority.name,