From 046472d6d1265724865cf99ad9929880fd33bb03 Mon Sep 17 00:00:00 2001 From: ulferts Date: Tue, 3 Sep 2019 10:50:36 +0200 Subject: [PATCH 01/43] bump oj --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ae224ad25f..05bf936086 100644 --- a/Gemfile +++ b/Gemfile @@ -104,7 +104,7 @@ gem 'posix-spawn', '~> 0.3.13', require: false gem 'bcrypt', '~> 3.1.6' gem 'multi_json', '~> 1.13.1' -gem 'oj', '~> 3.7.0' +gem 'oj', '~> 3.9.1' gem 'daemons' gem 'delayed_job_active_record', '~> 4.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index 2f187abb57..e161194285 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -594,7 +594,7 @@ GEM mini_portile2 (~> 2.4.0) nokogumbo (2.0.1) nokogiri (~> 1.8, >= 1.8.4) - oj (3.7.8) + oj (3.9.1) okcomputer (1.17.3) omniauth-saml (1.10.1) omniauth (~> 1.3, >= 1.3.2) @@ -963,7 +963,7 @@ DEPENDENCIES net-ldap (~> 0.16.0) newrelic_rpm nokogiri (~> 1.10.4) - oj (~> 3.7.0) + oj (~> 3.9.1) okcomputer (~> 1.17.3) omniauth! omniauth-openid-connect! From b95a3e6d2436f339329caa815dccd98de7c597f5 Mon Sep 17 00:00:00 2001 From: ulferts Date: Tue, 3 Sep 2019 10:52:20 +0200 Subject: [PATCH 02/43] bump bourbon --- Gemfile | 3 +-- Gemfile.lock | 12 +++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 05bf936086..6cf4595aac 100644 --- a/Gemfile +++ b/Gemfile @@ -156,8 +156,7 @@ group :production do end gem 'autoprefixer-rails', '~> 9.4.5' -# use until proper release no longer requiring sass exists -gem 'bourbon', git: 'https://github.com/sikachu/bourbon', ref: 'a12ca168e74d3468c80500b21b525a4e12a19ef9' +gem 'bourbon', '~> 6.0.0' gem 'i18n-js', '~> 3.2.0' gem 'sassc-rails', '~> 2.1.0' gem 'sprockets', '~> 3.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index e161194285..47bc8b5e3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,14 +82,6 @@ GIT activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) -GIT - remote: https://github.com/sikachu/bourbon - revision: a12ca168e74d3468c80500b21b525a4e12a19ef9 - ref: a12ca168e74d3468c80500b21b525a4e12a19ef9 - specs: - bourbon (5.1.0) - thor (~> 0.19) - PATH remote: modules/auth_plugins specs: @@ -350,6 +342,8 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.3.2) msgpack (~> 1.0) + bourbon (6.0.0) + thor (~> 0.19) browser (2.5.3) builder (3.2.3) byebug (10.0.2) @@ -916,7 +910,7 @@ DEPENDENCIES aws-sdk-s3 (~> 1.30.1) bcrypt (~> 3.1.6) bootsnap (~> 1.3.2) - bourbon! + bourbon (~> 6.0.0) browser (~> 2.5.3) capybara (~> 3.13.0) capybara-screenshot (~> 1.0.17) From e0dda673b4619a3ff617f9aeba1d2a2561bdc59a Mon Sep 17 00:00:00 2001 From: ulferts Date: Tue, 3 Sep 2019 10:59:06 +0200 Subject: [PATCH 03/43] bump rubocop --- Gemfile.lock | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 47bc8b5e3a..fb862d4bd8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -520,7 +520,7 @@ GEM io-like (0.3.0) ipaddress (0.8.3) iso8601 (0.12.1) - jaro_winkler (1.5.2) + jaro_winkler (1.5.3) jmespath (1.4.0) jquery-tablesorter (1.25.5) railties (>= 3.2, < 6) @@ -606,10 +606,10 @@ GEM webfinger (>= 1.0.1) openproject-token (1.0.1) activemodel (~> 5.0) - parallel (1.13.0) + parallel (1.17.0) parallel_tests (2.27.1) parallel - parser (2.6.0.0) + parser (2.6.4.0) ast (~> 2.4.0) passenger (6.0.1) rack @@ -629,7 +629,6 @@ GEM nokogiri (~> 1.10, >= 1.10.4) rubyzip (~> 1.2.1) posix-spawn (0.3.13) - powerpack (0.1.2) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -760,14 +759,13 @@ GEM rspec-retry (0.6.1) rspec-core (> 3.3) rspec-support (3.8.0) - rubocop (0.63.1) + rubocop (0.74.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) + unicode-display_width (>= 1.4.0, < 1.7) ruby-duration (3.2.3) activesupport (>= 3.0.0) i18n @@ -776,7 +774,7 @@ GEM i18n ruby-ole (1.2.12.2) ruby-prof (0.17.0) - ruby-progressbar (1.10.0) + ruby-progressbar (1.10.1) ruby-rc4 (0.1.5) ruby-saml (1.9.0) nokogiri (>= 1.5.10) @@ -854,7 +852,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.4.1) + unicode-display_width (1.6.0) unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) From b0a45f8f43b6df88bcb5166685f395dc3f24cfeb Mon Sep 17 00:00:00 2001 From: ulferts Date: Tue, 3 Sep 2019 11:00:10 +0200 Subject: [PATCH 04/43] bump spring --- Gemfile.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb862d4bd8..a37d329415 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -809,8 +809,7 @@ GEM simplecov-html (0.10.2) spreadsheet (0.8.9) ruby-ole (>= 1.0) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprockets (3.7.2) From 3bb03e066f5cb0e50a5ec9b4666670364c16cda2 Mon Sep 17 00:00:00 2001 From: ulferts Date: Tue, 3 Sep 2019 11:05:39 +0200 Subject: [PATCH 05/43] bump dalli --- Gemfile | 5 +---- Gemfile.lock | 10 ++-------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 6cf4595aac..02566f8fdf 100644 --- a/Gemfile +++ b/Gemfile @@ -146,10 +146,7 @@ gem 'meta-tags', '~> 2.11.0' group :production do # we use dalli as standard memcache client # requires memcached 1.4+ - # see https://github.clientom/mperham/dalli - gem 'dalli', - git: 'https://github.com/petergoldstein/dalli', - ref: '0ff39199b5e91c6dbdaabc7c085b81938d0f08d2' + gem 'dalli', '~> 2.7.10' # Unicorn worker killer to restart unicorn child workers gem 'unicorn-worker-killer', require: false diff --git a/Gemfile.lock b/Gemfile.lock index a37d329415..13b0713c89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,13 +66,6 @@ GIT mixlib-shellout (~> 2.1.0) rubyzip -GIT - remote: https://github.com/petergoldstein/dalli - revision: 0ff39199b5e91c6dbdaabc7c085b81938d0f08d2 - ref: 0ff39199b5e91c6dbdaabc7c085b81938d0f08d2 - specs: - dalli (2.7.9) - GIT remote: https://github.com/rspec/rspec-activemodel-mocks revision: 6136a778f8b21f4f45f6b4ad5c2e2533e6d4ddc6 @@ -412,6 +405,7 @@ GEM cucumber-tag_expressions (1.1.1) cucumber-wire (0.0.1) daemons (1.3.1) + dalli (2.7.10) database_cleaner (1.7.0) date_validator (0.9.0) activemodel @@ -920,7 +914,7 @@ DEPENDENCIES cucumber (~> 3.1.0) cucumber-rails (~> 1.6.0) daemons - dalli! + dalli (~> 2.7.10) dashboards! database_cleaner (~> 1.6) date_validator (~> 0.9.0) From 953b21806fcbd49fd5bf3568f9d98474966ecf6a Mon Sep 17 00:00:00 2001 From: ulferts Date: Tue, 3 Sep 2019 11:07:32 +0200 Subject: [PATCH 06/43] bump pry-byebug --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 02566f8fdf..3da16ebd32 100644 --- a/Gemfile +++ b/Gemfile @@ -257,7 +257,7 @@ group :development, :test do gem 'ruby-prof', require: false gem 'stackprof', require: false - gem 'pry-byebug', '~> 3.6.0', platforms: [:mri] + gem 'pry-byebug', '~> 3.7.0', platforms: [:mri] gem 'pry-rails', '~> 0.3.6' gem 'pry-rescue', '~> 1.5.0' gem 'pry-stack_explorer', '~> 0.4.9.2' diff --git a/Gemfile.lock b/Gemfile.lock index 13b0713c89..50a88c65e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -339,7 +339,7 @@ GEM thor (~> 0.19) browser (2.5.3) builder (3.2.3) - byebug (10.0.2) + byebug (11.0.1) capybara (3.13.2) addressable mini_mime (>= 0.1.3) @@ -631,8 +631,8 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) pry-rails (0.3.9) pry (>= 0.10.4) @@ -983,7 +983,7 @@ DEPENDENCIES posix-spawn (~> 0.3.13) prawn (~> 2.2) prawn-table (~> 0.2.2) - pry-byebug (~> 3.6.0) + pry-byebug (~> 3.7.0) pry-rails (~> 0.3.6) pry-rescue (~> 1.5.0) pry-stack_explorer (~> 0.4.9.2) From 2fed1e9ca3c72f1d9bf12493a26443181e32f613 Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 4 Sep 2019 12:38:50 +0200 Subject: [PATCH 07/43] bump acts_as_tree --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3da16ebd32..d32c50abec 100644 --- a/Gemfile +++ b/Gemfile @@ -53,7 +53,7 @@ gem 'will_paginate', '~> 3.1.7' gem 'friendly_id', '~> 5.2.1' gem 'acts_as_list', '~> 0.9.9' -gem 'acts_as_tree', '~> 2.8.0' +gem 'acts_as_tree', '~> 2.9.0' gem 'awesome_nested_set', '~> 3.1.3' gem 'rubytree', git: 'https://github.com/dr0verride/RubyTree.git', ref: '06f53ee' gem 'typed_dag', '~> 2.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index 50a88c65e3..c12e5d6d04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -287,7 +287,7 @@ GEM tzinfo (~> 1.1) acts_as_list (0.9.19) activerecord (>= 3.0) - acts_as_tree (2.8.0) + acts_as_tree (2.9.0) activerecord (>= 3.0.0) addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) @@ -892,7 +892,7 @@ DEPENDENCIES activerecord-nulldb-adapter (~> 0.3.9) activerecord-session_store (~> 1.1.0) acts_as_list (~> 0.9.9) - acts_as_tree (~> 2.8.0) + acts_as_tree (~> 2.9.0) addressable (~> 2.6.0) airbrake (~> 8.0.1) autoprefixer-rails (~> 9.4.5) From c1b42194fd2d44f860b9ea053f61f559cae9d60c Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 4 Sep 2019 12:40:19 +0200 Subject: [PATCH 08/43] bump awesome_nested_set --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d32c50abec..4362fe287b 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ gem 'friendly_id', '~> 5.2.1' gem 'acts_as_list', '~> 0.9.9' gem 'acts_as_tree', '~> 2.9.0' -gem 'awesome_nested_set', '~> 3.1.3' +gem 'awesome_nested_set', '~> 3.2.0' gem 'rubytree', git: 'https://github.com/dr0verride/RubyTree.git', ref: '06f53ee' gem 'typed_dag', '~> 2.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index c12e5d6d04..6e123a8891 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -304,8 +304,8 @@ GEM attr_required (1.0.1) autoprefixer-rails (9.4.7) execjs - awesome_nested_set (3.1.4) - activerecord (>= 4.0.0, < 5.3) + awesome_nested_set (3.2.0) + activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.0.1) aws-partitions (1.136.0) aws-sdk-core (3.46.0) @@ -896,7 +896,7 @@ DEPENDENCIES addressable (~> 2.6.0) airbrake (~> 8.0.1) autoprefixer-rails (~> 9.4.5) - awesome_nested_set (~> 3.1.3) + awesome_nested_set (~> 3.2.0) aws-sdk-core (~> 3.46.0) aws-sdk-s3 (~> 1.30.1) bcrypt (~> 3.1.6) From 729c2b6a96d2ea4f2ef0e270cbfb45a013329e59 Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 4 Sep 2019 12:44:11 +0200 Subject: [PATCH 09/43] bump rubytree --- Gemfile | 2 +- Gemfile.lock | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 4362fe287b..6605ccb5c9 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,7 @@ gem 'friendly_id', '~> 5.2.1' gem 'acts_as_list', '~> 0.9.9' gem 'acts_as_tree', '~> 2.9.0' gem 'awesome_nested_set', '~> 3.2.0' -gem 'rubytree', git: 'https://github.com/dr0verride/RubyTree.git', ref: '06f53ee' +gem 'rubytree', '~> 1.0.0' gem 'typed_dag', '~> 2.0.2' gem 'addressable', '~> 2.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index 6e123a8891..c56e1a77ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,14 +6,6 @@ GIT doorkeeper (5.0.2) railties (>= 4.2) -GIT - remote: https://github.com/dr0verride/RubyTree.git - revision: 06f53ee78cc2a48377c1bd177d3bc83c1504701c - ref: 06f53ee - specs: - rubytree (0.9.7) - json (~> 1.8) - GIT remote: https://github.com/finnlabs/omniauth-openid-connect.git revision: 9e7fd0e7bd36d40451c6b3c2ea641e8d237c295d @@ -518,7 +510,7 @@ GEM jmespath (1.4.0) jquery-tablesorter (1.25.5) railties (>= 3.2, < 6) - json (1.8.6) + json (2.2.0) json-jwt (1.10.0) activesupport (>= 4.2) aes_key_wrap @@ -772,6 +764,9 @@ GEM ruby-rc4 (0.1.5) ruby-saml (1.9.0) nokogiri (>= 1.5.10) + rubytree (1.0.0) + json (~> 2.1) + structured_warnings (~> 0.3) rubyzip (1.2.2) safe_yaml (1.0.4) sanitize (5.0.0) @@ -815,6 +810,7 @@ GEM sprockets (>= 3.0.0) stackprof (0.2.12) stringex (2.8.5) + structured_warnings (0.4.0) svg-graph (2.1.3) swd (1.1.2) activesupport (>= 3) @@ -1016,7 +1012,7 @@ DEPENDENCIES ruby-duration (~> 3.2.0) ruby-prof ruby-progressbar (~> 1.10.0) - rubytree! + rubytree (~> 1.0.0) sanitize (~> 5.0.0) sassc-rails (~> 2.1.0) secure_headers (~> 6.0.0) From b7e7f6b9471fb3d3b6922d92b753e8ba765cc20e Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 4 Sep 2019 15:15:01 +0200 Subject: [PATCH 10/43] bump addressable --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 6605ccb5c9..95800c3b83 100644 --- a/Gemfile +++ b/Gemfile @@ -58,7 +58,7 @@ gem 'awesome_nested_set', '~> 3.2.0' gem 'rubytree', '~> 1.0.0' gem 'typed_dag', '~> 2.0.2' -gem 'addressable', '~> 2.6.0' +gem 'addressable', '~> 2.7.0' # Provide timezone info for TZInfo used by AR gem 'tzinfo-data', '~> 1.2018.9' diff --git a/Gemfile.lock b/Gemfile.lock index c56e1a77ee..b5c05e0804 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -281,8 +281,8 @@ GEM activerecord (>= 3.0) acts_as_tree (2.9.0) activerecord (>= 3.0.0) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) aes_key_wrap (1.0.1) afm (0.2.2) airbrake (8.0.1) @@ -634,7 +634,7 @@ GEM pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (3.0.3) + public_suffix (4.0.1) puma (4.0.0) nio4r (~> 2.0) rack (2.0.6) @@ -889,7 +889,7 @@ DEPENDENCIES activerecord-session_store (~> 1.1.0) acts_as_list (~> 0.9.9) acts_as_tree (~> 2.9.0) - addressable (~> 2.6.0) + addressable (~> 2.7.0) airbrake (~> 8.0.1) autoprefixer-rails (~> 9.4.5) awesome_nested_set (~> 3.2.0) From 4f7dd55ae755f93a45454db6a304f18c072d8d32 Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 4 Sep 2019 15:16:24 +0200 Subject: [PATCH 11/43] bump airbrake --- Gemfile | 2 +- Gemfile.lock | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 95800c3b83..cea45dce56 100644 --- a/Gemfile +++ b/Gemfile @@ -133,7 +133,7 @@ gem 'lograge', '~> 0.10.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', '~> 8.0.1', require: false +gem 'airbrake', '~> 9.4.3', require: false gem 'prawn', '~> 2.2' gem 'prawn-table', '~> 0.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index b5c05e0804..4576863f4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,10 +285,10 @@ GEM public_suffix (>= 2.0.2, < 5.0) aes_key_wrap (1.0.1) afm (0.2.2) - airbrake (8.0.1) - airbrake-ruby (~> 3.0) - airbrake-ruby (3.1.0) - tdigest (= 0.1.1) + airbrake (9.4.3) + airbrake-ruby (~> 4.6) + airbrake-ruby (4.6.0) + rbtree3 (~> 0.5) archive-zip (0.11.0) io-like (~> 0.3.0) arel (9.0.0) @@ -693,7 +693,7 @@ GEM rainbow (3.0.0) raindrops (0.19.0) rake (12.3.2) - rbtree (0.4.2) + rbtree3 (0.5.0) rdoc (6.1.1) redcarpet (3.4.0) reform (2.2.4) @@ -818,8 +818,6 @@ GEM httpclient (>= 2.4) sys-filesystem (1.2.0) ffi - tdigest (0.1.1) - rbtree (~> 0.4.2) temple (0.8.0) test-prof (0.7.3) thin (1.7.2) @@ -890,7 +888,7 @@ DEPENDENCIES acts_as_list (~> 0.9.9) acts_as_tree (~> 2.9.0) addressable (~> 2.7.0) - airbrake (~> 8.0.1) + airbrake (~> 9.4.3) autoprefixer-rails (~> 9.4.5) awesome_nested_set (~> 3.2.0) aws-sdk-core (~> 3.46.0) From 20ac95e33178b9069dbf765c296c20c377f32d40 Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 4 Sep 2019 15:20:01 +0200 Subject: [PATCH 12/43] bump puma --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index cea45dce56..db1bc94fe6 100644 --- a/Gemfile +++ b/Gemfile @@ -162,7 +162,7 @@ gem 'sprockets', '~> 3.7.0' # also, better than thin since we can control worker concurrency. gem 'unicorn' -gem 'puma', '~> 4.0.0' # used for development and optionally for production +gem 'puma', '~> 4.1.0' # used for development and optionally for production gem 'nokogiri', '~> 1.10.4' diff --git a/Gemfile.lock b/Gemfile.lock index 4576863f4a..7dd4befcf7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -569,7 +569,7 @@ GEM net-ldap (0.16.1) netrc (0.11.0) newrelic_rpm (6.0.0.351) - nio4r (2.3.1) + nio4r (2.5.1) nokogiri (1.10.4) mini_portile2 (~> 2.4.0) nokogumbo (2.0.1) @@ -635,7 +635,7 @@ GEM binding_of_caller (>= 0.7) pry (>= 0.9.11) public_suffix (4.0.1) - puma (4.0.0) + puma (4.1.0) nio4r (~> 2.0) rack (2.0.6) rack-accept (0.4.5) @@ -981,7 +981,7 @@ DEPENDENCIES pry-rails (~> 0.3.6) pry-rescue (~> 1.5.0) pry-stack_explorer (~> 0.4.9.2) - puma (~> 4.0.0) + puma (~> 4.1.0) rack-attack (~> 5.4.2) rack-mini-profiler rack-protection (~> 2.0.0) From e5157b3c0d6a9f7836e251dbeae40ee7dfda8609 Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 4 Sep 2019 15:22:00 +0200 Subject: [PATCH 13/43] bump rack-attack --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index db1bc94fe6..aae92cb952 100644 --- a/Gemfile +++ b/Gemfile @@ -115,7 +115,7 @@ gem 'rack-protection', '~> 2.0.0' # It allows whitelisting, blacklisting, throttling, and tracking based # on arbitrary properties of the request. # https://github.com/kickstarter/rack-attack -gem 'rack-attack', '~> 5.4.2' +gem 'rack-attack', '~> 6.1.0' # CSP headers gem 'secure_headers', '~> 6.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 7dd4befcf7..95197d2ed5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -637,10 +637,10 @@ GEM public_suffix (4.0.1) puma (4.1.0) nio4r (~> 2.0) - rack (2.0.6) + rack (2.0.7) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (5.4.2) + rack-attack (6.1.0) rack (>= 1.0, < 3) rack-mini-profiler (1.0.1) rack (>= 1.2.0) @@ -982,7 +982,7 @@ DEPENDENCIES pry-rescue (~> 1.5.0) pry-stack_explorer (~> 0.4.9.2) puma (~> 4.1.0) - rack-attack (~> 5.4.2) + rack-attack (~> 6.1.0) rack-mini-profiler rack-protection (~> 2.0.0) rack-test (~> 1.1.0) From 20a9a1c70d27a19b6ddb5010f1b98e914aa3ccd0 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 09:09:47 +0200 Subject: [PATCH 14/43] bump bootsnap --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index aae92cb952..719b6b6b57 100644 --- a/Gemfile +++ b/Gemfile @@ -263,7 +263,7 @@ group :development, :test do gem 'pry-stack_explorer', '~> 0.4.9.2' end -gem 'bootsnap', '~> 1.3.2', require: false +gem 'bootsnap', '~> 1.4.5', require: false # API gems gem 'grape', '~> 1.2.3' diff --git a/Gemfile.lock b/Gemfile.lock index 95197d2ed5..8f310831bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -325,7 +325,7 @@ GEM bindata (2.4.4) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.2) + bootsnap (1.4.5) msgpack (~> 1.0) bourbon (6.0.0) thor (~> 0.19) @@ -560,7 +560,7 @@ GEM minisyntax (0.2.5) minitest (5.11.3) mixlib-shellout (2.1.0) - msgpack (1.2.6) + msgpack (1.3.1) multi_json (1.13.1) multi_test (0.1.2) mustermann (1.0.3) @@ -894,7 +894,7 @@ DEPENDENCIES aws-sdk-core (~> 3.46.0) aws-sdk-s3 (~> 1.30.1) bcrypt (~> 3.1.6) - bootsnap (~> 1.3.2) + bootsnap (~> 1.4.5) bourbon (~> 6.0.0) browser (~> 2.5.3) capybara (~> 3.13.0) From 9390a12a8038c05488adfbeaf50bee8a848c0045 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 09:10:10 +0200 Subject: [PATCH 15/43] bump bcrypt --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8f310831bf..a8d7849517 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -321,7 +321,7 @@ GEM ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) backports (3.11.4) - bcrypt (3.1.12) + bcrypt (3.1.13) bindata (2.4.4) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) From fe0e062aeb45b5469470d77ca3115e3646678847 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 09:15:52 +0200 Subject: [PATCH 16/43] bump activerecord-nulldb-adapter --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 719b6b6b57..a050a66a9e 100644 --- a/Gemfile +++ b/Gemfile @@ -278,7 +278,7 @@ platforms :mri, :mingw, :x64_mingw do end # Support application loading when no database exists yet. - gem 'activerecord-nulldb-adapter', '~> 0.3.9' + gem 'activerecord-nulldb-adapter', '~> 0.4.0' end group :opf_plugins do diff --git a/Gemfile.lock b/Gemfile.lock index a8d7849517..0c3d7f5a24 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -260,7 +260,7 @@ GEM arel (>= 9.0) activerecord-import (0.28.1) activerecord (>= 3.2) - activerecord-nulldb-adapter (0.3.9) + activerecord-nulldb-adapter (0.4.0) activerecord (>= 2.0.0) activerecord-session_store (1.1.1) actionpack (>= 4.0) @@ -883,7 +883,7 @@ DEPENDENCIES actionpack-xml_parser (~> 2.0.0) activemodel-serializers-xml (~> 1.0.1) activerecord-import (~> 0.28.1) - activerecord-nulldb-adapter (~> 0.3.9) + activerecord-nulldb-adapter (~> 0.4.0) activerecord-session_store (~> 1.1.0) acts_as_list (~> 0.9.9) acts_as_tree (~> 2.9.0) From f46d5a296b07d6018a15cfba4b581e999a910b93 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 09:17:35 +0200 Subject: [PATCH 17/43] bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a050a66a9e..c62fbf3dde 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ ruby '~> 2.6.1' gem 'actionpack-xml_parser', '~> 2.0.0' gem 'activemodel-serializers-xml', '~> 1.0.1' -gem 'activerecord-import', '~> 0.28.1' +gem 'activerecord-import', '~> 1.0.2' gem 'activerecord-session_store', '~> 1.1.0' gem 'rails', '~> 5.2.2.1' gem 'responders', '~> 2.4' diff --git a/Gemfile.lock b/Gemfile.lock index 0c3d7f5a24..8a890e25ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -258,7 +258,7 @@ GEM activemodel (= 5.2.2.1) activesupport (= 5.2.2.1) arel (>= 9.0) - activerecord-import (0.28.1) + activerecord-import (1.0.2) activerecord (>= 3.2) activerecord-nulldb-adapter (0.4.0) activerecord (>= 2.0.0) @@ -882,7 +882,7 @@ PLATFORMS DEPENDENCIES actionpack-xml_parser (~> 2.0.0) activemodel-serializers-xml (~> 1.0.1) - activerecord-import (~> 0.28.1) + activerecord-import (~> 1.0.2) activerecord-nulldb-adapter (~> 0.4.0) activerecord-session_store (~> 1.1.0) acts_as_list (~> 0.9.9) From 21410be0f515da624311e800fff6244ba3d874d3 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 09:19:47 +0200 Subject: [PATCH 18/43] bump will_paginate --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8a890e25ef..707ec256bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -872,7 +872,7 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - will_paginate (3.1.7) + will_paginate (3.1.8) xpath (3.2.0) nokogiri (~> 1.8) From 51b50c6196d6e1920ba4c67925dd1c524994965d Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 09:20:44 +0200 Subject: [PATCH 19/43] bump webmock --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index c62fbf3dde..4841f2f35d 100644 --- a/Gemfile +++ b/Gemfile @@ -223,7 +223,7 @@ group :test do gem 'fuubar', '~> 2.3.2' gem 'timecop', '~> 0.9.0' - gem 'webmock', '~> 3.5.0', require: false + gem 'webmock', '~> 3.7.2', require: false gem 'equivalent-xml', '~> 0.6' gem 'json_spec', '~> 1.1.4' diff --git a/Gemfile.lock b/Gemfile.lock index 707ec256bd..db7ec1221b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -484,7 +484,7 @@ GEM rack-accept virtus (>= 1.0.0) gravatar_image_tag (1.2.0) - hashdiff (0.3.8) + hashdiff (1.0.0) hashery (2.1.2) hashie (3.6.0) html-pipeline (2.8.3) @@ -768,7 +768,7 @@ GEM json (~> 2.1) structured_warnings (~> 0.3) rubyzip (1.2.2) - safe_yaml (1.0.4) + safe_yaml (1.0.5) sanitize (5.0.0) crass (~> 1.0.2) nokogiri (>= 1.8.0) @@ -865,10 +865,10 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.5.1) + webmock (3.7.2) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) @@ -1035,7 +1035,7 @@ DEPENDENCIES unicorn-worker-killer warden (~> 1.2) warden-basic_auth (~> 0.2.1) - webmock (~> 3.5.0) + webmock (~> 3.7.2) will_paginate (~> 3.1.7) RUBY VERSION From 5e857d3c7c1386eb987d045b329c37abf1178565 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:28:50 +0200 Subject: [PATCH 20/43] bump websocket-extensions --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index db7ec1221b..3852c5906b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -871,7 +871,7 @@ GEM hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) will_paginate (3.1.8) xpath (3.2.0) nokogiri (~> 1.8) From 87d85cf26ed3b52a41e768a5645fb3d888c27a07 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:29:34 +0200 Subject: [PATCH 21/43] bump websocket-driver --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3852c5906b..53d086f106 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -869,7 +869,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) will_paginate (3.1.8) From d063f7284d03a034181f7e3addfc201922a4722a Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:30:30 +0200 Subject: [PATCH 22/43] bump rack-protection --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 53d086f106..8691a93580 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -650,7 +650,7 @@ GEM httpclient json-jwt (>= 1.9.0) rack - rack-protection (2.0.5) + rack-protection (2.0.7) rack rack-test (1.1.0) rack (>= 1.0, < 3) From 1da453a3d802358e8c487d0f9d4c12ef46100e75 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:32:41 +0200 Subject: [PATCH 23/43] bump unicorn --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8691a93580..265c2ca003 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -840,7 +840,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.6.0) - unicorn (5.4.1) + unicorn (5.5.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) From d925581f127d54bafdbd36d0a0bcf3ec530bce50 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:33:34 +0200 Subject: [PATCH 24/43] bump grape --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 265c2ca003..1afb9b130e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -476,7 +476,7 @@ GEM actionpack (>= 3.0) multi_json request_store (>= 1.0) - grape (1.2.3) + grape (1.2.4) activesupport builder mustermann-grape (~> 1.0.0) From 105e14caddc99df6e78b34f3ecdf3ee5314d17cb Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:34:04 +0200 Subject: [PATCH 25/43] bump newrelic_rpm --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1afb9b130e..c4405dcb7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -568,7 +568,7 @@ GEM mustermann (~> 1.0.0) net-ldap (0.16.1) netrc (0.11.0) - newrelic_rpm (6.0.0.351) + newrelic_rpm (6.5.0.357) nio4r (2.5.1) nokogiri (1.10.4) mini_portile2 (~> 2.4.0) From 4f9938aef69731d8036b6cfcacd71eec5a1ee654 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:35:55 +0200 Subject: [PATCH 26/43] bump parallel_tests --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4841f2f35d..080bd174d7 100644 --- a/Gemfile +++ b/Gemfile @@ -230,7 +230,7 @@ group :test do gem 'shoulda-matchers', '~> 3.1', require: nil gem 'simplecov', '~> 0.16.0', require: false - gem 'parallel_tests', '~> 2.27.1' + gem 'parallel_tests', '~> 2.29.2' end group :ldap do diff --git a/Gemfile.lock b/Gemfile.lock index c4405dcb7a..378cca5c30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -593,7 +593,7 @@ GEM openproject-token (1.0.1) activemodel (~> 5.0) parallel (1.17.0) - parallel_tests (2.27.1) + parallel_tests (2.29.2) parallel parser (2.6.4.0) ast (~> 2.4.0) @@ -970,7 +970,7 @@ DEPENDENCIES openproject-webhooks! openproject-xls_export! overviews! - parallel_tests (~> 2.27.1) + parallel_tests (~> 2.29.2) passenger (~> 6.0.1) pg (~> 1.1.0) plaintext (~> 0.3.2) From ff0ce75ea0272e43a1d82f2b32484fda2aaeea43 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:36:45 +0200 Subject: [PATCH 27/43] bump html-pipeline --- Gemfile.lock | 2 +- .../text_formatting/filters/sanitization_filter.rb | 10 +++++++--- .../text_formatting/formats/base_formatter.rb | 9 +++++---- .../text_formatting/formats/markdown/formatter.rb | 8 -------- .../text_formatting/formats/plain/formatter.rb | 8 -------- 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 378cca5c30..26b3fa393d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -487,7 +487,7 @@ GEM hashdiff (1.0.0) hashery (2.1.2) hashie (3.6.0) - html-pipeline (2.8.3) + html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) htmldiff (0.0.1) diff --git a/lib/open_project/text_formatting/filters/sanitization_filter.rb b/lib/open_project/text_formatting/filters/sanitization_filter.rb index d01fe8ce74..bea52dfd0a 100644 --- a/lib/open_project/text_formatting/filters/sanitization_filter.rb +++ b/lib/open_project/text_formatting/filters/sanitization_filter.rb @@ -31,9 +31,13 @@ module OpenProject::TextFormatting module Filters class SanitizationFilter < HTML::Pipeline::SanitizationFilter - WHITELIST[:elements] << 'macro' - # Whitelist class and data-* attributes on all macros - WHITELIST[:attributes].merge!('macro' => ['class', :data]) + def context + super.merge(whitelist: WHITELIST.merge( + elements: WHITELIST[:elements] + ['macro'], + # Whitelist class and data-* attributes on all macros + attributes: WHITELIST[:attributes].merge('macro' => ['class', :data]) + )) + end end end end diff --git a/lib/open_project/text_formatting/formats/base_formatter.rb b/lib/open_project/text_formatting/formats/base_formatter.rb index 1b1ad9dccb..80fe64261a 100644 --- a/lib/open_project/text_formatting/formats/base_formatter.rb +++ b/lib/open_project/text_formatting/formats/base_formatter.rb @@ -29,11 +29,12 @@ module OpenProject::TextFormatting::Formats class BaseFormatter - attr_reader :options, :project + attr_reader :context, + :pipeline - def initialize(options) - @options = options - @project = options[:project] + def initialize(context) + @context = context + @pipeline = HTML::Pipeline.new(located_filters, context) end def to_html(text) diff --git a/lib/open_project/text_formatting/formats/markdown/formatter.rb b/lib/open_project/text_formatting/formats/markdown/formatter.rb index 1fcda6ca62..a782f78d85 100644 --- a/lib/open_project/text_formatting/formats/markdown/formatter.rb +++ b/lib/open_project/text_formatting/formats/markdown/formatter.rb @@ -31,14 +31,6 @@ require 'task_list/filter' module OpenProject::TextFormatting::Formats::Markdown class Formatter < OpenProject::TextFormatting::Formats::BaseFormatter - attr_reader :context, - :pipeline - - def initialize(context) - @context = context - @pipeline = ::HTML::Pipeline.new(located_filters, context) - end - def to_html(text) result = pipeline.call(text, context) output = result[:output].to_s diff --git a/lib/open_project/text_formatting/formats/plain/formatter.rb b/lib/open_project/text_formatting/formats/plain/formatter.rb index cbab6486f4..99191c240e 100644 --- a/lib/open_project/text_formatting/formats/plain/formatter.rb +++ b/lib/open_project/text_formatting/formats/plain/formatter.rb @@ -31,14 +31,6 @@ module OpenProject::TextFormatting::Formats module Plain class Formatter < OpenProject::TextFormatting::Formats::BaseFormatter - attr_reader :context, - :pipeline - - def initialize(context) - @context = context - @pipeline = HTML::Pipeline.new(located_filters, context) - end - def to_html(text) pipeline.to_html(text, context).html_safe end From 99af3511bdf33d10fee2751c8aaec57edfad45b4 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:38:06 +0200 Subject: [PATCH 28/43] bump aws-sdk-core --- Gemfile | 2 +- Gemfile.lock | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 080bd174d7..0a7231ab8a 100644 --- a/Gemfile +++ b/Gemfile @@ -169,7 +169,7 @@ gem 'nokogiri', '~> 1.10.4' gem 'carrierwave', '~> 1.3.1' gem 'fog-aws' -gem 'aws-sdk-core', '~> 3.46.0' +gem 'aws-sdk-core', '~> 3.66.0' # File upload via fog + screenshots on travis gem 'aws-sdk-s3', '~> 1.30.1' diff --git a/Gemfile.lock b/Gemfile.lock index 26b3fa393d..1169ee9392 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -298,12 +298,12 @@ GEM execjs awesome_nested_set (3.2.0) activerecord (>= 4.0.0, < 7.0) - aws-eventstream (1.0.1) - aws-partitions (1.136.0) - aws-sdk-core (3.46.0) - aws-eventstream (~> 1.0) + aws-eventstream (1.0.3) + aws-partitions (1.208.0) + aws-sdk-core (3.66.0) + aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) - aws-sigv4 (~> 1.0) + aws-sigv4 (~> 1.1) jmespath (~> 1.0) aws-sdk-kms (1.13.0) aws-sdk-core (~> 3, >= 3.39.0) @@ -315,7 +315,8 @@ GEM aws-sdk-sns (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sigv4 (1.0.3) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) @@ -891,7 +892,7 @@ DEPENDENCIES airbrake (~> 9.4.3) autoprefixer-rails (~> 9.4.5) awesome_nested_set (~> 3.2.0) - aws-sdk-core (~> 3.46.0) + aws-sdk-core (~> 3.66.0) aws-sdk-s3 (~> 1.30.1) bcrypt (~> 3.1.6) bootsnap (~> 1.4.5) From 53a24ab38a975d9e21cbc5914ab205966e962787 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:39:12 +0200 Subject: [PATCH 29/43] bump aws-sdk-s3 --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 0a7231ab8a..e1007be270 100644 --- a/Gemfile +++ b/Gemfile @@ -171,7 +171,7 @@ gem 'fog-aws' gem 'aws-sdk-core', '~> 3.66.0' # File upload via fog + screenshots on travis -gem 'aws-sdk-s3', '~> 1.30.1' +gem 'aws-sdk-s3', '~> 1.48.0' gem 'openproject-token', '~> 1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 1169ee9392..dc40c8310f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -305,13 +305,13 @@ GEM aws-partitions (~> 1.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.13.0) - aws-sdk-core (~> 3, >= 3.39.0) - aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.30.1) - aws-sdk-core (~> 3, >= 3.39.0) + aws-sdk-kms (1.24.0) + aws-sdk-core (~> 3, >= 3.61.1) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.48.0) + aws-sdk-core (~> 3, >= 3.61.1) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.0) + aws-sigv4 (~> 1.1) aws-sdk-sns (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) @@ -893,7 +893,7 @@ DEPENDENCIES autoprefixer-rails (~> 9.4.5) awesome_nested_set (~> 3.2.0) aws-sdk-core (~> 3.66.0) - aws-sdk-s3 (~> 1.30.1) + aws-sdk-s3 (~> 1.48.0) bcrypt (~> 3.1.6) bootsnap (~> 1.4.5) bourbon (~> 6.0.0) From 1424396626eb039c7317ed29303810bc7f9684a7 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 5 Sep 2019 16:40:18 +0200 Subject: [PATCH 30/43] bump okcomputer --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index dc40c8310f..3f6b9312c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -576,7 +576,7 @@ GEM nokogumbo (2.0.1) nokogiri (~> 1.8, >= 1.8.4) oj (3.9.1) - okcomputer (1.17.3) + okcomputer (1.17.4) omniauth-saml (1.10.1) omniauth (~> 1.3, >= 1.3.2) ruby-saml (~> 1.7) From 0889a24e2db71d85b51da37023beadd15cf459a5 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Sep 2019 09:36:45 +0200 Subject: [PATCH 31/43] bump ruby-prof --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f6b9312c5..0df03fb39d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -760,7 +760,7 @@ GEM ruby-enum (0.7.2) i18n ruby-ole (1.2.12.2) - ruby-prof (0.17.0) + ruby-prof (1.0.0) ruby-progressbar (1.10.1) ruby-rc4 (0.1.5) ruby-saml (1.9.0) From 19e04691d03a163a18cd9c6d547238a04d4778e8 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Sep 2019 09:38:07 +0200 Subject: [PATCH 32/43] bump secure_headers --- Gemfile | 2 +- Gemfile.lock | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index e1007be270..c98d233d45 100644 --- a/Gemfile +++ b/Gemfile @@ -118,7 +118,7 @@ gem 'rack-protection', '~> 2.0.0' gem 'rack-attack', '~> 6.1.0' # CSP headers -gem 'secure_headers', '~> 6.0.0' +gem 'secure_headers', '~> 6.1.1' # Browser detection for incompatibility checks gem 'browser', '~> 2.5.3' diff --git a/Gemfile.lock b/Gemfile.lock index 0df03fb39d..cbba32bef3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -783,8 +783,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - secure_headers (6.0.0) - useragent (>= 0.15.0) + secure_headers (6.1.1) selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) @@ -847,7 +846,6 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - useragent (0.16.10) validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) @@ -1014,7 +1012,7 @@ DEPENDENCIES rubytree (~> 1.0.0) sanitize (~> 5.0.0) sassc-rails (~> 2.1.0) - secure_headers (~> 6.0.0) + secure_headers (~> 6.1.1) selenium-webdriver (~> 3.14) semantic (~> 1.6.1) shoulda-context (~> 1.2) From 9c6c7d76b30740851244cb9ff527ecd5fd5b8ae8 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Sep 2019 09:39:11 +0200 Subject: [PATCH 33/43] bump html-pipeline --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c98d233d45..3c4f2d40bd 100644 --- a/Gemfile +++ b/Gemfile @@ -74,7 +74,7 @@ gem 'commonmarker', '~> 0.20.1' # HTML pipeline for transformations on text formatter output # such as sanitization or additional features -gem 'html-pipeline', '~> 2.8.0' +gem 'html-pipeline', '~> 2.12.0' # Tasklist parsing and renderer gem 'deckar01-task_list', '2.2.0' # Requires escape-utils for faster escaping diff --git a/Gemfile.lock b/Gemfile.lock index cbba32bef3..7302ee5632 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -488,7 +488,7 @@ GEM hashdiff (1.0.0) hashery (2.1.2) hashie (3.6.0) - html-pipeline (2.8.4) + html-pipeline (2.12.0) activesupport (>= 2) nokogiri (>= 1.4) htmldiff (0.0.1) @@ -926,7 +926,7 @@ DEPENDENCIES gon (~> 6.2.1) grape (~> 1.2.3) grids! - html-pipeline (~> 2.8.0) + html-pipeline (~> 2.12.0) htmldiff i18n-js (~> 3.2.0) json_spec (~> 1.1.4) From 159a1e56b3bc91d882e1752e785257050e74b55a Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Sep 2019 09:42:04 +0200 Subject: [PATCH 34/43] remove unused codecov --- Gemfile | 1 - Gemfile.lock | 7 ------- codecov.yml | 9 --------- features/support/env.rb | 5 ----- spec/rails_helper.rb | 7 ------- 5 files changed, 29 deletions(-) delete mode 100644 codecov.yml diff --git a/Gemfile b/Gemfile index 3c4f2d40bd..b7a835b84f 100644 --- a/Gemfile +++ b/Gemfile @@ -228,7 +228,6 @@ group :test do gem 'equivalent-xml', '~> 0.6' gem 'json_spec', '~> 1.1.4' gem 'shoulda-matchers', '~> 3.1', require: nil - gem 'simplecov', '~> 0.16.0', require: false gem 'parallel_tests', '~> 2.29.2' end diff --git a/Gemfile.lock b/Gemfile.lock index 7302ee5632..5dcb6afc35 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -424,7 +424,6 @@ GEM declarative-option (< 0.2.0) representable (>= 2.4.0, <= 3.1.0) uber (< 0.2.0) - docile (1.3.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) equalizer (0.0.11) @@ -791,11 +790,6 @@ GEM shoulda-context (1.2.2) shoulda-matchers (3.1.3) activesupport (>= 4.0.0) - simplecov (0.16.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) spreadsheet (0.8.9) ruby-ole (>= 1.0) spring (2.1.0) @@ -1017,7 +1011,6 @@ DEPENDENCIES semantic (~> 1.6.1) shoulda-context (~> 1.2) shoulda-matchers (~> 3.1) - simplecov (~> 0.16.0) spring spring-commands-rspec sprockets (~> 3.7.0) diff --git a/codecov.yml b/codecov.yml deleted file mode 100644 index d89e9bca1d..0000000000 --- a/codecov.yml +++ /dev/null @@ -1,9 +0,0 @@ -coverage: - ignore: - - spec/factories/.* - - vendor/bundle/.* - status: - patch: false - project: - default: {} -comment: off diff --git a/features/support/env.rb b/features/support/env.rb index ee322419ed..925932612a 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -34,11 +34,6 @@ # instead of editing this one. Cucumber will automatically load all features/**/*.rb # files. -if ENV['COVERAGE'] - require 'simplecov' - SimpleCov.start 'rails' -end - require 'cucumber/rails' require 'cucumber/rspec/doubles' require 'capybara-screenshot/cucumber' diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index de7e92b86f..09e126b480 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -34,13 +34,6 @@ require 'shoulda/matchers' require 'rspec/example_disabler' require 'test_prof/recipes/rspec/before_all' -## -# Start collecting coverage when desired -if ENV['COVERAGE'] - require 'simplecov' - SimpleCov.start 'rails' -end - # Requires supporting ruby files with custom matchers and macros, etc, in # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are # run as spec files by default. This means that files in spec/support that end From ddc9e1060293266eaa9c20388c89c5bf6eb03592 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Sep 2019 09:43:15 +0200 Subject: [PATCH 35/43] bump sanitize --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b7a835b84f..fdd6b05ef3 100644 --- a/Gemfile +++ b/Gemfile @@ -82,7 +82,7 @@ gem 'escape_utils', '~> 1.0' # Syntax highlighting used in html-pipeline with rouge gem 'rouge', '~> 3.1.1' # HTML sanitization used for html-pipeline -gem 'sanitize', '~> 5.0.0' +gem 'sanitize', '~> 5.1.0' # HTML autolinking for mails and urls (replaces autolink) gem 'rinku', '~> 2.0.4' # Version parsing with semver diff --git a/Gemfile.lock b/Gemfile.lock index 5dcb6afc35..efaff11fc0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -769,7 +769,7 @@ GEM structured_warnings (~> 0.3) rubyzip (1.2.2) safe_yaml (1.0.5) - sanitize (5.0.0) + sanitize (5.1.0) crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) @@ -1004,7 +1004,7 @@ DEPENDENCIES ruby-prof ruby-progressbar (~> 1.10.0) rubytree (~> 1.0.0) - sanitize (~> 5.0.0) + sanitize (~> 5.1.0) sassc-rails (~> 2.1.0) secure_headers (~> 6.1.1) selenium-webdriver (~> 3.14) From 7d11165e6321eee51333ef4b9fc964daac6ffe97 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Sep 2019 09:44:16 +0200 Subject: [PATCH 36/43] bump passenger --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index efaff11fc0..2cd6a07844 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -597,7 +597,7 @@ GEM parallel parser (2.6.4.0) ast (~> 2.4.0) - passenger (6.0.1) + passenger (6.0.2) rack rake (>= 0.8.1) pdf-core (0.7.0) @@ -692,7 +692,7 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.0.0) raindrops (0.19.0) - rake (12.3.2) + rake (12.3.3) rbtree3 (0.5.0) rdoc (6.1.1) redcarpet (3.4.0) From d48342660b663cc9dde641a240df4d66370f9f6c Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Sep 2019 09:45:22 +0200 Subject: [PATCH 37/43] bump browser --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index fdd6b05ef3..b5e21f3d56 100644 --- a/Gemfile +++ b/Gemfile @@ -121,7 +121,7 @@ gem 'rack-attack', '~> 6.1.0' gem 'secure_headers', '~> 6.1.1' # Browser detection for incompatibility checks -gem 'browser', '~> 2.5.3' +gem 'browser', '~> 2.6.1' # Providing health checks gem 'okcomputer', '~> 1.17.3' From a4078133385cf14f7d0753e4b82571c0aa72b16f Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Sep 2019 09:45:47 +0200 Subject: [PATCH 38/43] bump browser --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2cd6a07844..9466e792e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -330,7 +330,7 @@ GEM msgpack (~> 1.0) bourbon (6.0.0) thor (~> 0.19) - browser (2.5.3) + browser (2.6.1) builder (3.2.3) byebug (11.0.1) capybara (3.13.2) @@ -889,7 +889,7 @@ DEPENDENCIES bcrypt (~> 3.1.6) bootsnap (~> 1.4.5) bourbon (~> 6.0.0) - browser (~> 2.5.3) + browser (~> 2.6.1) capybara (~> 3.13.0) capybara-screenshot (~> 1.0.17) capybara-select2! From a4899b415ce22d1546971968d59801f7880a6209 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Sep 2019 09:46:40 +0200 Subject: [PATCH 39/43] bump test-prof --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9466e792e2..c835b2a809 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -813,7 +813,7 @@ GEM sys-filesystem (1.2.0) ffi temple (0.8.0) - test-prof (0.7.3) + test-prof (0.7.5) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) From 12e40cb88e4d3d708fa9d10756b1b0443e01bd8e Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Sep 2019 16:40:28 +0200 Subject: [PATCH 40/43] bump newrelic_rpm --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c835b2a809..b38270f21d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -568,7 +568,7 @@ GEM mustermann (~> 1.0.0) net-ldap (0.16.1) netrc (0.11.0) - newrelic_rpm (6.5.0.357) + newrelic_rpm (6.6.0.358) nio4r (2.5.1) nokogiri (1.10.4) mini_portile2 (~> 2.4.0) From a3317eb74852e5b04f79e8ad3352ce01bb001ba1 Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 12 Sep 2019 16:20:49 +0200 Subject: [PATCH 41/43] bump capybara --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- spec/features/projects/destroy_spec.rb | 2 +- .../repositories/create_repository_spec.rb | 6 +++--- spec/features/support/components/danger_zone.rb | 2 +- spec/features/users/my_spec.rb | 16 ++++++++-------- .../work_packages/details/milestones_spec.rb | 7 +++---- .../components/password_confirmation_dialog.rb | 4 ++-- 8 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Gemfile b/Gemfile index d1b64e50c3..afa23f1b6d 100644 --- a/Gemfile +++ b/Gemfile @@ -215,7 +215,7 @@ group :test do # brings back testing for 'assigns' and 'assert_template' extracted in rails 5 gem 'rails-controller-testing', '~> 1.0.2' - gem 'capybara', '~> 3.13.0' + gem 'capybara', '~> 3.29.0' gem 'capybara-screenshot', '~> 1.0.17' gem 'capybara-select2', git: 'https://github.com/goodwill/capybara-select2', ref: '585192e' gem 'webdrivers', '~> 4.1.2', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 51252c4791..649f8dbb00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -338,13 +338,13 @@ GEM browser (2.6.1) builder (3.2.3) byebug (11.0.1) - capybara (3.13.2) + capybara (3.29.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.2) + regexp_parser (~> 1.5) xpath (~> 3.2) capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) @@ -590,7 +590,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) mimemagic (0.3.3) - mini_mime (1.0.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) minisyntax (0.2.5) minitest (5.11.3) @@ -744,7 +744,7 @@ GEM reform-rails (0.1.7) activemodel (>= 3.2) reform (>= 2.2.0) - regexp_parser (1.3.0) + regexp_parser (1.6.0) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -942,7 +942,7 @@ DEPENDENCIES bourbon (~> 6.0.0) brakeman (~> 4.6.1) browser (~> 2.6.1) - capybara (~> 3.13.0) + capybara (~> 3.29.0) capybara-screenshot (~> 1.0.17) capybara-select2! carrierwave (~> 1.3.1) diff --git a/spec/features/projects/destroy_spec.rb b/spec/features/projects/destroy_spec.rb index ffc8584dfd..7fedb91aa9 100644 --- a/spec/features/projects/destroy_spec.rb +++ b/spec/features/projects/destroy_spec.rb @@ -52,7 +52,7 @@ describe 'Projects#destroy', it 'can destroy the project' do # Confirm the deletion danger_zone.confirm_with(project.identifier) - expect(danger_zone.disabled?).to be false + expect(danger_zone).not_to be_disabled danger_zone.danger_button.click expect(page).to have_selector '.flash.notice', text: I18n.t('projects.delete.scheduled') diff --git a/spec/features/repositories/create_repository_spec.rb b/spec/features/repositories/create_repository_spec.rb index 42e6a71b68..a86830abec 100644 --- a/spec/features/repositories/create_repository_spec.rb +++ b/spec/features/repositories/create_repository_spec.rb @@ -108,7 +108,7 @@ describe 'Create repository', type: :feature, js: true, selenium: true do it 'should display a collapsed type' do expect(selector).not_to be_nil expect(selector[:selected]).to be_falsey - expect(selector[:disabled]).to be_falsey + expect(selector).not_to be_disabled content = find("##{vendor}-#{type}", visible: false) expect(content).not_to be_nil @@ -124,7 +124,7 @@ describe 'Create repository', type: :feature, js: true, selenium: true do find("input[name='scm_type'][value='#{type}']").set(true) content = find("#attributes-group--content-#{type}") expect(content).not_to be_nil - expect(content[:hidden]).to be_falsey + expect(content[:hidden]).to eql 'false' content = find("##{vendor}-#{type}", visible: false) expect(content).not_to be_nil expect(content[:style]).not_to match("display: none") @@ -132,7 +132,7 @@ describe 'Create repository', type: :feature, js: true, selenium: true do find('input[type="radio"][value="managed"]').set(true) content = find('#attributes-group--content-managed') expect(content).not_to be_nil - expect(content[:hidden]).to be_falsey + expect(content[:hidden]).to eql 'false' content = find("##{vendor}-managed", visible: false) expect(content).not_to be_nil expect(content[:style]).not_to match("display: none") diff --git a/spec/features/support/components/danger_zone.rb b/spec/features/support/components/danger_zone.rb index 1b2d2bfea1..57068ab5f9 100644 --- a/spec/features/support/components/danger_zone.rb +++ b/spec/features/support/components/danger_zone.rb @@ -65,6 +65,6 @@ class DangerZone ## def disabled? - !!danger_button[:disabled] + danger_button.disabled? end end diff --git a/spec/features/users/my_spec.rb b/spec/features/users/my_spec.rb index ebb9ab75a4..9fd7a5b03b 100644 --- a/spec/features/users/my_spec.rb +++ b/spec/features/users/my_spec.rb @@ -35,10 +35,10 @@ describe 'my', let(:user_password) { 'bob' * 4 } let(:user) do FactoryBot.create(:user, - mail: 'old@mail.com', - login: 'bob', - password: user_password, - password_confirmation: user_password) + mail: 'old@mail.com', + login: 'bob', + password: user_password, + password_confirmation: user_password) end ## @@ -98,11 +98,11 @@ describe 'my', end context 'as admin' do - let(:user) { + let(:user) do FactoryBot.create :admin, - password: user_password, - password_confirmation: user_password - } + password: user_password, + password_confirmation: user_password + end it 'requires the password' do dialog.confirm_flow_with(user_password) diff --git a/spec/features/work_packages/details/milestones_spec.rb b/spec/features/work_packages/details/milestones_spec.rb index 3830ed587a..5addbd1ccd 100644 --- a/spec/features/work_packages/details/milestones_spec.rb +++ b/spec/features/work_packages/details/milestones_spec.rb @@ -1,15 +1,14 @@ require 'spec_helper' describe 'Milestones full screen v iew', js: true do - let(:type) { FactoryBot.create :type, is_milestone: true } let(:project) { FactoryBot.create(:project, types: [type]) } - let!(:work_package) { + let!(:work_package) do FactoryBot.create(:work_package, project: project, type: type, subject: 'Foobar') - } + end let(:wp_page) { ::Pages::FullWorkPackage.new(work_package, project) } let(:button) { find('.add-work-package', wait: 5) } @@ -29,7 +28,7 @@ describe 'Milestones full screen v iew', js: true do end it 'shows the button as enabled' do - expect(button['disabled']).to be_falsey + expect(button).not_to be_disabled button.click expect(page).to have_selector('.menu-item', text: type.name.upcase) diff --git a/spec/support/components/password_confirmation_dialog.rb b/spec/support/components/password_confirmation_dialog.rb index 650c34c121..f53c04d577 100644 --- a/spec/support/components/password_confirmation_dialog.rb +++ b/spec/support/components/password_confirmation_dialog.rb @@ -36,10 +36,10 @@ module Components def confirm_flow_with(password, should_fail: false) expect_open - expect(submit_button[:disabled]).to be_truthy + expect(submit_button).to be_disabled fill_in 'request_for_confirmation_password', with: password - expect(submit_button[:disabled]).to be_falsey + expect(submit_button).not_to be_disabled submit(should_fail) end From ccaf1989d62ebe906396d85d5ba0675a528e37ad Mon Sep 17 00:00:00 2001 From: ulferts Date: Thu, 12 Sep 2019 16:25:03 +0200 Subject: [PATCH 42/43] bump test-prof --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index afa23f1b6d..7a5084e5c7 100644 --- a/Gemfile +++ b/Gemfile @@ -195,7 +195,7 @@ group :test do # Test prof provides factories from code # and other niceties - gem 'test-prof', '~> 0.7.3' + gem 'test-prof', '~> 0.10.0' gem 'cucumber', '~> 3.1.0' gem 'cucumber-rails', '~> 1.6.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 649f8dbb00..ef74e5c230 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -860,7 +860,7 @@ GEM temple (0.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - test-prof (0.7.5) + test-prof (0.10.0) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) @@ -1072,7 +1072,7 @@ DEPENDENCIES stringex (~> 2.8.5) svg-graph (~> 2.1.0) sys-filesystem (~> 1.2.0) - test-prof (~> 0.7.3) + test-prof (~> 0.10.0) thin (~> 1.7.2) timecop (~> 0.9.0) typed_dag (~> 2.0.2) From daf9a702625dc308576e90f0778d5d88a041dd4b Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 13 Sep 2019 09:21:53 +0200 Subject: [PATCH 43/43] adapt spec to bumped capybara --- spec/features/projects/projects_index_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/features/projects/projects_index_spec.rb b/spec/features/projects/projects_index_spec.rb index 9534a1295b..c42ddf1ec8 100644 --- a/spec/features/projects/projects_index_spec.rb +++ b/spec/features/projects/projects_index_spec.rb @@ -539,10 +539,10 @@ describe 'Projects index page', cf_filter = page.find("li[filter-name='cf_#{list_custom_field.id}']") within(cf_filter) do # Initial filter is a 'single select' - expect(cf_filter.find(:select, 'value')[:multiple]).to be_falsey + expect(cf_filter.find(:select, 'value')).not_to be_multiple click_on 'Toggle multiselect' # switching to multiselect keeps the current selection - expect(cf_filter.find(:select, 'value')[:multiple]).to be_truthy + expect(cf_filter.find(:select, 'value')).to be_multiple expect(cf_filter).to have_select('value', selected: list_custom_field.possible_values[2].value) select list_custom_field.possible_values[3].value, from: 'value' @@ -553,7 +553,7 @@ describe 'Projects index page', cf_filter = page.find("li[filter-name='cf_#{list_custom_field.id}']") within(cf_filter) do # Query has two values for that filter, so it shoud show a 'multi select'. - expect(cf_filter.find(:select, 'value')[:multiple]).to be_truthy + expect(cf_filter.find(:select, 'value')).to be_multiple expect(cf_filter) .to have_select('value', selected: [list_custom_field.possible_values[2].value, @@ -564,7 +564,7 @@ describe 'Projects index page', unselect list_custom_field.possible_values[2].value, from: 'value' click_on 'Toggle multiselect' - expect(cf_filter.find(:select, 'value')[:multiple]).to be_falsey + expect(cf_filter.find(:select, 'value')).not_to be_multiple expect(cf_filter).to have_select('value', selected: list_custom_field.possible_values[1].value) expect(cf_filter).to_not have_select('value', selected: list_custom_field.possible_values[3].value) end @@ -574,7 +574,7 @@ describe 'Projects index page', cf_filter = page.find("li[filter-name='cf_#{list_custom_field.id}']") within(cf_filter) do # Query has one value for that filter, so it should show a 'single select'. - expect(cf_filter.find(:select, 'value')[:multiple]).to be_falsey + expect(cf_filter.find(:select, 'value')).not_to be_multiple end # CF date filter work (at least for one operator)