Merge pull request #9773 from opf/fix/bump_gems

Fix/bump gems
3 years ago · 23f765d391
parent e7042d53f1 e37b29b8fc
commit 23f765d391
5 changed files with 53 additions and 62 deletions
--- a/10
+++ b/10
@ -150,12 +150,12 @@ gem 'prawn-markup', '~> 0.3.0'
 gem 'cells-erb', '~> 0.1.0'
 gem 'cells-rails', '~> 0.0.9'

-gem 'meta-tags', '~> 2.15.0'
+gem 'meta-tags', '~> 2.16.0'

 group :production do
  # we use dalli as standard memcache client
  # requires memcached 1.4+
-  gem 'dalli', '~> 2.7.10'
+  gem 'dalli', '~> 3.0.3'
 end

 gem 'i18n-js', '~> 3.9.0'
@ -220,8 +220,8 @@ group :test do

  gem 'capybara', '~> 3.35.0'
  gem 'capybara-screenshot', '~> 1.0.17'
-  gem 'selenium-webdriver', '~> 3.14'
-  gem 'webdrivers', '~> 4.6.0'
+  gem 'selenium-webdriver', '~> 4.0'
+  gem 'webdrivers', '~> 5.0.0'

  gem 'fuubar', '~> 2.5.0'
  gem 'timecop', '~> 0.9.0'
@ -287,7 +287,7 @@ end
 gem 'bootsnap', '~> 1.9.1', require: false

 # API gems
-gem 'grape', '~> 1.5.0'
+gem 'grape', '~> 1.6.0'
 gem 'grape_logging', '~> 1.8.4'
 gem 'roar', '~> 1.1.0'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -164,7 +164,7 @@ PATH
  remote: modules/two_factor_authentication
  specs:
    openproject-two_factor_authentication (1.0.0)
-      aws-sdk-sns (~> 1.45.0)
+      aws-sdk-sns (~> 1.46.0)
      messagebird-rest (~> 1.4.2)
      rotp (~> 6.1)

@ -269,7 +269,7 @@ GEM
    afm (0.2.2)
    airbrake (12.0.0)
      airbrake-ruby (~> 6.0)
-    airbrake-ruby (6.0.0)
+    airbrake-ruby (6.0.1)
      rbtree3 (~> 0.5)
    ast (2.4.2)
    attr_required (1.0.1)
@ -278,21 +278,21 @@ GEM
    awesome_nested_set (3.4.0)
      activerecord (>= 4.0.0, < 7.0)
    aws-eventstream (1.2.0)
-    aws-partitions (1.510.0)
-    aws-sdk-core (3.121.1)
+    aws-partitions (1.518.0)
+    aws-sdk-core (3.121.3)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-kms (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-kms (1.50.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.104.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sdk-sns (1.45.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-sns (1.46.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
      aws-sigv4 (~> 1.1)
    aws-sigv4 (1.4.0)
      aws-eventstream (~> 1, >= 1.0.2)
@ -336,7 +336,7 @@ GEM
    cells-rails (0.0.9)
      actionpack (>= 3.0)
      cells (>= 4.1.6, < 5.0.0)
-    childprocess (3.0.0)
+    childprocess (4.1.0)
    claide (1.0.3)
    claide-plugins (0.9.2)
      cork
@ -357,8 +357,8 @@ GEM
    crowdin-api (0.6.0)
      rest-client (~> 2.0)
    daemons (1.4.1)
-    dalli (2.7.11)
-    danger (8.4.0)
+    dalli (3.0.3)
+    danger (8.4.1)
      claide (~> 1.0)
      claide-plugins (>= 0.9.2)
      colored2 (~> 3.1)
@ -409,7 +409,7 @@ GEM
      uber (< 0.2.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.5.3)
+    doorkeeper (5.5.4)
      railties (>= 5)
    dry-configurable (0.13.0)
      concurrent-ruby (~> 1.0)
@ -453,7 +453,7 @@ GEM
      tzinfo
    eventmachine (1.2.7)
    eventmachine_httpserver (0.2.1)
-    excon (0.86.0)
+    excon (0.87.0)
    factory_bot (6.2.0)
      activesupport (>= 5.0.0)
    factory_bot_rails (6.2.0)
@ -519,7 +519,7 @@ GEM
      i18n (>= 0.7)
      multi_json
      request_store (>= 1.0)
-    grape (1.5.3)
+    grape (1.6.0)
      activesupport
      builder
      dry-types (>= 1.1)
@ -549,12 +549,12 @@ GEM
      i18n (>= 0.6.6)
    icalendar (2.7.1)
      ice_cube (~> 0.16)
-    ice_cube (0.16.3)
+    ice_cube (0.16.4)
    interception (0.5)
    ipaddress (0.8.3)
    iso8601 (0.13.0)
    jmespath (1.4.0)
-    json (2.5.1)
+    json (2.6.1)
    json-jwt (1.13.0)
      activesupport (>= 4.2)
      aes_key_wrap
@ -602,14 +602,14 @@ GEM
      mini_mime (>= 0.1.1)
    marcel (1.0.2)
    messagebird-rest (1.4.2)
-    meta-tags (2.15.0)
-      actionpack (>= 3.2.0, < 6.2)
+    meta-tags (2.16.0)
+      actionpack (>= 3.2.0, < 7.1)
    method_source (1.0.0)
    mime-types (3.3.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2021.0901)
    mini_magick (4.11.0)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
    mini_portile2 (2.6.1)
    minisyntax (0.2.5)
    minitest (5.14.4)
@ -632,7 +632,7 @@ GEM
    octokit (4.21.0)
      faraday (>= 0.9)
      sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.13.8)
+    oj (3.13.9)
    okcomputer (1.18.4)
    omniauth-saml (1.10.3)
      omniauth (~> 1.3, >= 1.3.2)
@ -702,12 +702,12 @@ GEM
      eventmachine_httpserver
      http_parser.rb (~> 0.6.0)
      multi_json
-    puma (5.5.0)
+    puma (5.5.2)
      nio4r (~> 2.0)
    puma-plugin-statsd (2.0.0)
      puma (>= 5.0, < 6)
    raabro (1.4.0)
-    racc (1.5.2)
+    racc (1.6.0)
    rack (2.2.3)
    rack-accept (0.4.5)
      rack (>= 0.4)
@ -820,7 +820,7 @@ GEM
    rspec-retry (0.6.2)
      rspec-core (> 3.3)
    rspec-support (3.10.2)
-    rubocop (1.22.1)
+    rubocop (1.22.2)
      parallel (~> 1.10)
      parser (>= 3.0.0.0)
      rainbow (>= 2.2.2, < 4.0)
@ -831,7 +831,7 @@ GEM
      unicode-display_width (>= 1.4.0, < 3.0)
    rubocop-ast (1.12.0)
      parser (>= 3.0.1.1)
-    rubocop-rails (2.12.2)
+    rubocop-rails (2.12.4)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
      rubocop (>= 1.7.0, < 2.0)
@ -868,8 +868,9 @@ GEM
      addressable (>= 2.3.5)
      faraday (> 0.8, < 2.0)
    secure_headers (6.3.3)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    selenium-webdriver (4.0.3)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
      rubyzip (>= 1.2.2)
    semantic (1.6.1)
    sentry-delayed_job (4.7.3)
@ -909,7 +910,7 @@ GEM
      activesupport (>= 3)
      attr_required (>= 0.0.5)
      httpclient (>= 2.4)
-    sys-filesystem (1.4.2)
+    sys-filesystem (1.4.3)
      ffi (~> 1.1)
    table_print (1.5.7)
    temple (0.8.2)
@ -924,7 +925,7 @@ GEM
      rails (>= 5.0.4)
    tzinfo (2.0.4)
      concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.3)
+    tzinfo-data (1.2021.5)
      tzinfo (>= 1.0.0)
    uber (0.1.0)
    unf (0.1.4)
@ -942,10 +943,10 @@ GEM
      rack (>= 2.0.9)
    warden-basic_auth (0.2.1)
      warden (~> 1.2)
-    webdrivers (4.6.1)
+    webdrivers (5.0.0)
      nokogiri (~> 1.6)
      rubyzip (>= 1.3.0)
-      selenium-webdriver (>= 3.0, < 4.0)
+      selenium-webdriver (~> 4.0)
    webfinger (1.2.0)
      activesupport
      httpclient (>= 2.4)
@ -961,7 +962,7 @@ GEM
      activerecord (>= 4.2)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)

 PLATFORMS
  ruby
@ -995,7 +996,7 @@ DEPENDENCIES
  compare-xml (~> 0.66)
  costs!
  daemons
-  dalli (~> 2.7.10)
+  dalli (~> 3.0.3)
  danger-brakeman
  dashboards!
  database_cleaner (~> 2.0)
@ -1016,7 +1017,7 @@ DEPENDENCIES
  friendly_id (~> 5.4.0)
  fuubar (~> 2.5.0)
  gon (~> 6.4.0)
-  grape (~> 1.5.0)
+  grape (~> 1.6.0)
  grape_logging (~> 1.8.4)
  grids!
  html-pipeline (~> 2.14.0)
@ -1030,7 +1031,7 @@ DEPENDENCIES
  listen (~> 3.7.0)
  livingstyleguide (~> 2.1.0)
  lograge (~> 0.11.0)
-  meta-tags (~> 2.15.0)
+  meta-tags (~> 2.16.0)
  mini_magick (~> 4.11.0)
  multi_json (~> 1.15.0)
  my_page!
@ -1107,7 +1108,7 @@ DEPENDENCIES
  sanitize (~> 6.0.0)
  sassc-rails
  secure_headers (~> 6.3.0)
-  selenium-webdriver (~> 3.14)
+  selenium-webdriver (~> 4.0)
  semantic (~> 1.6.1)
  sentry-delayed_job (~> 4.7.0)
  sentry-rails (~> 4.7.0)
@ -1129,7 +1130,7 @@ DEPENDENCIES
  tzinfo-data (~> 1.2021.1)
  warden (~> 1.2)
  warden-basic_auth (~> 0.2.1)
-  webdrivers (~> 4.6.0)
+  webdrivers (~> 5.0.0)
  webmock (~> 3.12)
  will_paginate (~> 3.3.0)
  with_advisory_lock (~> 4.6.0)
--- a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec
+++ b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec
@ -15,5 +15,5 @@ Gem::Specification.new do |s|
  s.add_dependency 'messagebird-rest', '~> 1.4.2'
  s.add_dependency 'rotp', '~> 6.1'

-  s.add_dependency 'aws-sdk-sns', '~> 1.45.0'
+  s.add_dependency 'aws-sdk-sns', '~> 1.46.0'
 end
--- a/spec/support/browsers/chrome.rb
+++ b/spec/support/browsers/chrome.rb
@ -33,7 +33,7 @@ def register_chrome(language, name: :"chrome_#{language}")
    options.add_preference(:browser, set_download_behavior: { behavior: 'allow' })

    capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-      loggingPrefs: { browser: 'ALL' }
+      'goog:loggingPrefs': { browser: 'ALL' }
    )

    yield(options, capabilities) if block_given?
@ -46,9 +46,8 @@ def register_chrome(language, name: :"chrome_#{language}")

    driver_opts = {
      browser: is_grid ? :remote : :chrome,
-      desired_capabilities: capabilities,
-      http_client: client,
-      options: options,
+      capabilities: [capabilities, options],
+      http_client: client
    }

    if is_grid
--- a/spec/support/browsers/firefox.rb
+++ b/spec/support/browsers/firefox.rb
@ -6,10 +6,10 @@ def register_firefox(language, name: :"firefox_#{language}")
  require 'selenium/webdriver'

  Capybara.register_driver name do |app|
-    if ENV['CI']
-      client = Selenium::WebDriver::Remote::Http::Default.new
-      client.timeout = 180
-    end
+    client = if ENV['CI']
+               Selenium::WebDriver::Remote::Http::Default.new(open_timeout: 180,
+                                                              read_timeout: 180)
+             end

    profile = Selenium::WebDriver::Firefox::Profile.new
    profile['intl.accept_languages'] = language
@ -24,16 +24,8 @@ def register_firefox(language, name: :"firefox_#{language}")
    # only one FF process
    profile['dom.ipc.processCount'] = 1

-    # use native instead of synthetic events
-    # https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities
-    profile.native_events = true
-
    options = Selenium::WebDriver::Firefox::Options.new(profile: profile)

-    capabilities = Selenium::WebDriver::Remote::Capabilities.firefox(
-      loggingPrefs: { browser: 'ALL' }
-    )
-
    yield(profile, options, capabilities) if block_given?

    unless ActiveRecord::Type::Boolean.new.cast(ENV['OPENPROJECT_TESTING_NO_HEADLESS'])
@ -45,9 +37,8 @@ def register_firefox(language, name: :"firefox_#{language}")
    driver_opts = {
      browser: is_grid ? :remote : :firefox,
      url: ENV['SELENIUM_GRID_URL'],
-      desired_capabilities: capabilities,
      http_client: client,
-      options: options,
+      capabilities: options
    }

    if is_grid