From 015ab85fce4442b62296141899621b3438c725d9 Mon Sep 17 00:00:00 2001 From: Julien Portalier Date: Thu, 9 Nov 2023 19:48:35 +0100 Subject: [PATCH] Upgrade gems to their latest minor version (except rails) --- Gemfile | 2 +- Gemfile.lock | 190 ++++++++++++++++++-------------- spec/serializers/spec_helper.rb | 7 +- 3 files changed, 109 insertions(+), 90 deletions(-) diff --git a/Gemfile b/Gemfile index ea09390b2..225979609 100644 --- a/Gemfile +++ b/Gemfile @@ -57,7 +57,7 @@ gem 'haml-magic-translations' gem 'coffee-rails', '~> 4.0.1' gem 'jquery-rails', "~> 2.0.2" gem 'lodash-rails' -gem 'knockoutjs-rails' +gem 'knockoutjs-rails', '~> 3.2.0' gem 'rails-assets-knockout-sortable', :source => 'https://rails-assets.org' gem 'sass-rails', '~> 4.0.1' gem 'uglifier', '>= 2.5.0' diff --git a/Gemfile.lock b/Gemfile.lock index 1c7752f9e..f54ba7c1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,17 +53,19 @@ GEM activesupport (= 4.1.16) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionpack-action_caching (1.1.1) - actionpack (>= 4.0.0, < 5.0) - actionpack-page_caching (1.0.2) - actionpack (>= 4.0.0, < 5) + actionpack-action_caching (1.2.2) + actionpack (>= 4.0.0) + actionpack-page_caching (1.2.4) + actionpack (>= 4.0.0) actionview (4.1.16) activesupport (= 4.1.16) builder (~> 3.1) erubis (~> 2.7.0) - active_model_serializers (0.9.9) - activemodel (>= 3.2) - concurrent-ruby (~> 1.0) + active_model_serializers (0.10.14) + actionpack (>= 4.1) + activemodel (>= 4.1) + case_transform (>= 0.2) + jsonapi-renderer (>= 0.1.1.beta1, < 0.3) activemodel (4.1.16) activesupport (= 4.1.16) builder (~> 3.1) @@ -71,8 +73,8 @@ GEM activemodel (= 4.1.16) activesupport (= 4.1.16) arel (~> 5.0.0) - activerecord-import (0.5.0) - activerecord (>= 3.0) + activerecord-import (0.28.2) + activerecord (>= 3.2) activesupport (4.1.16) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) @@ -81,12 +83,14 @@ GEM tzinfo (~> 1.1) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) + aes_key_wrap (1.1.0) arel (5.0.1.20140414130214) attr_required (1.0.1) bcrypt (3.1.19) + bindata (2.4.14) breadcrumbs_on_rails (2.3.1) builder (3.2.4) - cancancan (1.9.2) + cancancan (1.17.0) capybara (2.18.0) addressable mini_mime (>= 0.1.3) @@ -94,34 +98,38 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (>= 2.0, < 4.0) - carrierwave (0.10.0) + carrierwave (0.11.2) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) + mimemagic (>= 0.3.0) + case_transform (0.2) + activesupport childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.8.0) - concurrent-ruby (1.1.10) + coffee-script-source (1.12.2) + concurrent-ruby (1.2.2) dalli (2.7.11) - database_cleaner (1.3.0) + database_cleaner (1.99.0) decent_exposure (2.3.3) declarative (0.0.20) declarative-option (0.1.0) - devise (3.3.0) + devise (3.5.10) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) + responders thread_safe (~> 0.1) warden (~> 1.2.3) - diff-lcs (1.2.5) - docile (1.1.5) + diff-lcs (1.5.0) + docile (1.3.5) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) elasticsearch (1.0.18) @@ -133,56 +141,60 @@ GEM faraday multi_json erubis (2.7.0) - execjs (2.2.2) - faker (1.4.3) - i18n (~> 0.5) - faraday (0.12.2) + execjs (2.9.0) + faker (1.9.6) + i18n (>= 0.7) + faraday (0.17.6) multipart-post (>= 1.2, < 3) fast_gettext (0.9.2) ffi (1.15.5) gettext (3.1.9) locale (>= 2.0.5) text (>= 1.3.0) - gettext_i18n_rails (1.1.0) + gettext_i18n_rails (1.12.0) fast_gettext (>= 0.9.0) global_phone (1.0.1) global_phone_dbgen (1.0.0) nokogiri (~> 1.5) - google-api-client (0.10.3) - addressable (~> 2.3) - googleauth (~> 0.5) - httpclient (~> 2.7) - hurley (~> 0.1) - memoist (~> 0.11) - mime-types (>= 1.6) + google-api-client (0.32.1) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.5, < 0.10.0) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - googleauth (0.5.3) + signet (~> 0.10) + googleauth (0.9.0) faraday (~> 0.12) - jwt (~> 1.4) - logging (~> 2.0) - memoist (~> 0.12) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) multi_json (~> 1.11) - os (~> 0.9) + os (>= 0.9, < 2.0) signet (~> 0.7) haml (4.0.7) tilt - haml-magic-translations (4.1.1) + haml-magic-translations (4.2.0) haml (~> 4.0) - haml-rails (0.5.3) + haml-rails (0.9.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) - haml (>= 3.1, < 5.0) + haml (>= 4.0.6, < 5.0) + html2haml (>= 1.0.1) railties (>= 4.0.1) - hashie (3.3.2) + hashie (3.6.0) hike (1.2.3) + html2haml (2.3.0) + erubis (~> 2.7.0) + haml (>= 4.0) + nokogiri (>= 1.6.0) + ruby_parser (~> 3.5) + http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - hurley (0.2) i18n (0.9.5) concurrent-ruby (~> 1.0) - ice_cube (0.12.1) + ice_cube (0.16.4) includes-count (0.2) activerecord instedd-rails (0.0.27) @@ -201,32 +213,36 @@ GEM railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.8.6) + json-jwt (1.9.4) + activesupport + aes_key_wrap + bindata + jsonapi-renderer (0.2.2) jwt (1.5.6) knockoutjs-rails (3.2.0) railties (>= 3.1, < 5) - little-plugger (1.1.4) locale (2.1.3) lodash-rails (2.4.1) railties (>= 3.1) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) machinist (1.0.6) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.1) + mini_mime (>= 0.1.1) memoist (0.16.2) mime-types (3.5.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.1003) + mimemagic (0.4.3) + nokogiri (~> 1) + rake mini_magick (3.8.1) subexec (~> 0.2.1) mini_mime (1.1.2) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.15.0) mono_logger (1.1.2) msgpack (0.7.6) - multi_json (1.13.1) - multipart-post (2.0.0) + multi_json (1.15.0) + multipart-post (2.3.0) mysql2 (0.3.21) netrc (0.11.0) nokogiri (1.10.10) @@ -235,29 +251,29 @@ GEM json rest-client oj (2.15.1) - omniauth (1.2.2) + omniauth (1.4.2) hashie (>= 1.2, < 4) - rack (~> 1.0) + rack (>= 1.0, < 3) omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) orm_adapter (0.5.0) os (0.9.6) - paranoia (2.1.5) - activerecord (~> 4.0) + paranoia (2.4.3) + activerecord (>= 4.0, < 6.2) phantomjs (2.1.1.0) - po_to_json (0.0.7) - json + po_to_json (0.1.0) + json (>= 1.6.0) polyglot (0.3.5) public_suffix (4.0.7) puma (3.11.4) rack (1.5.5) - rack-oauth2 (1.0.10) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) + rack-oauth2 (1.10.0) + activesupport + attr_required + httpclient + json-jwt (>= 1.9.0) + rack rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -281,15 +297,17 @@ GEM activesupport (= 4.1.16) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.3) - redis (3.1.0) - redis-namespace (1.5.3) - redis (~> 3.0, >= 3.0.4) + rake (13.1.0) + redis (3.3.5) + redis-namespace (1.6.0) + redis (>= 3.0.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - resque (1.25.2) + responders (1.1.2) + railties (>= 3.2, < 4.2) + resque (1.27.4) mono_logger (~> 1.0) multi_json (~> 1.0) redis-namespace (~> 1.3) @@ -300,12 +318,13 @@ GEM redis (~> 3.0) resque (~> 1.25) rufus-scheduler (~> 2.0) - resque_spec (0.16.0) - resque (>= 1.19.0) + resque_spec (0.18.1) + resque (>= 1.26.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) rspec-mocks (>= 3.0.0) - rest-client (2.0.2) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) @@ -329,7 +348,9 @@ GEM rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.4.1) - ruby-openid (2.5.0) + ruby-openid (2.9.2) + ruby_parser (3.19.2) + sexp_processor (~> 4.16) rubyzip (1.3.0) rufus-scheduler (2.0.24) tzinfo (>= 0.3.22) @@ -342,25 +363,26 @@ GEM selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) - shoulda-matchers (2.7.0) + sexp_processor (4.16.1) + shoulda-matchers (2.8.0) activesupport (>= 3.0.0) signet (0.11.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simplecov (0.9.2) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) - simplecov-rcov (0.2.3) + simplecov (0.17.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + simplecov-rcov (0.3.3) simplecov (>= 0.4.1) sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - spring (1.1.3) + spring (1.7.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprockets (2.12.5) @@ -377,25 +399,25 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (1.4.1) - timecop (0.7.4) + timecop (0.9.8) treetop (1.4.15) polyglot polyglot (>= 0.3.1) tzinfo (1.2.11) thread_safe (~> 0.1) uber (0.1.0) - uglifier (2.5.3) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - uuidtools (2.1.5) + uuidtools (2.2.0) vegas (0.1.11) rack (>= 1.0.0) warden (1.2.7) rack (>= 1.0) - will_paginate (3.0.12) + will_paginate (3.3.1) xpath (3.2.0) nokogiri (~> 1.8) @@ -432,7 +454,7 @@ DEPENDENCIES intercom-rails jasmine (~> 2.7.0) jquery-rails (~> 2.0.2) - knockoutjs-rails + knockoutjs-rails (~> 3.2.0) lodash-rails machinist (= 1.0.6) mini_magick diff --git a/spec/serializers/spec_helper.rb b/spec/serializers/spec_helper.rb index af78d41e6..9da079bcb 100644 --- a/spec/serializers/spec_helper.rb +++ b/spec/serializers/spec_helper.rb @@ -1,5 +1,3 @@ -ActiveModel::Serializer.root = false - def expect_rendered_value(json, field, serializer, expected_value) expect(json).to have_key(field), "expected serializer to render attribute #{field}" expect(json[field]).to eq(expected_value), "expected serializer to render #{expected_value} for field #{field}, got #{json[field]}" @@ -7,7 +5,6 @@ def expect_rendered_value(json, field, serializer, expected_value) def expect_fields_rendered_by(serializer) json = JSON.parse(serializer.to_json).with_indifferent_access - spec = yield if spec.is_a? Array @@ -20,5 +17,5 @@ def expect_fields_rendered_by(serializer) end else raise "Blocks passed into expect_fields_render_by may only return Arrays or Hashes. Any other return type is unsupported." - end -end \ No newline at end of file + end +end