From b6b84385beaa0a319f53322ba3fbbb6f186039b7 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 20 Jan 2023 02:49:00 +0000 Subject: [PATCH 01/20] fix: Gemfile to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-3237231 - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-3237232 - https://snyk.io/vuln/SNYK-RUBY-ACTIVERECORD-3237236 - https://snyk.io/vuln/SNYK-RUBY-ACTIVERECORD-3237239 - https://snyk.io/vuln/SNYK-RUBY-ACTIVESUPPORT-3237242 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f8fc0fc6..31f58b8f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.7.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.0.6' +gem 'rails', '~> 6.1.7', '>= 6.1.7.1' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.4' # Use Puma as the app server From fb0e648c28fb300f5fcdc62e528acb31c42aea36 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 9 Mar 2023 00:30:38 +0000 Subject: [PATCH 02/20] fix: Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RACK-3356639 --- Gemfile.lock | 202 ++++++++++++++++++++++++++------------------------- 1 file changed, 103 insertions(+), 99 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a185844e..0f0dfcdd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,59 +1,59 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.0.6) - actionpack (= 6.0.6) + actioncable (6.0.6.1) + actionpack (= 6.0.6.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actionmailbox (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) mail (>= 2.7.1) - actionmailer (6.0.6) - actionpack (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) + actionmailer (6.0.6.1) + actionpack (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.6) - actionview (= 6.0.6) - activesupport (= 6.0.6) + actionpack (6.0.6.1) + actionview (= 6.0.6.1) + activesupport (= 6.0.6.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.6) - actionpack (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actiontext (6.0.6.1) + actionpack (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) nokogiri (>= 1.8.5) - actionview (6.0.6) - activesupport (= 6.0.6) + actionview (6.0.6.1) + activesupport (= 6.0.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.6) - activesupport (= 6.0.6) + activejob (6.0.6.1) + activesupport (= 6.0.6.1) globalid (>= 0.3.6) - activemodel (6.0.6) - activesupport (= 6.0.6) - activerecord (6.0.6) - activemodel (= 6.0.6) - activesupport (= 6.0.6) + activemodel (6.0.6.1) + activesupport (= 6.0.6.1) + activerecord (6.0.6.1) + activemodel (= 6.0.6.1) + activesupport (= 6.0.6.1) activerecord-postgis-adapter (6.0.1) activerecord (~> 6.0) rgeo-activerecord (~> 6.0) - activestorage (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) + activestorage (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) marcel (~> 1.0) - activesupport (6.0.6) + activesupport (6.0.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -74,12 +74,11 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.2.3) aws-eventstream (~> 1, >= 1.0.2) - better_html (1.0.16) - actionview (>= 4.0) - activesupport (>= 4.0) + better_html (2.0.1) + actionview (>= 6.0) + activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) - html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties bootsnap (1.7.3) @@ -88,18 +87,19 @@ GEM builder (3.2.4) byebug (11.1.3) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) + connection_pool (2.3.0) crack (0.4.5) rexml crass (1.0.6) date (3.3.3) diff-lcs (1.5.0) docile (1.3.5) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) railties (>= 3.2) - erubi (1.11.0) + erubi (1.12.0) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -119,7 +119,7 @@ GEM path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.8) - globalid (1.0.1) + globalid (1.1.0) activesupport (>= 5.0) graphlient (0.5.0) faraday (>= 1.0) @@ -130,14 +130,13 @@ GEM activesupport (>= 3.0) graphql (~> 1.8) hashdiff (1.0.1) - highline (2.0.3) - html_tokenizer (0.0.7) + highline (2.1.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - i18n-tasks (1.0.11) + i18n-tasks (1.0.12) activesupport (>= 4.0.2) ast (>= 2.1.0) - better_html (~> 1.0) + better_html (>= 1.0, < 3.0) erubi highline (>= 2.0.0) i18n @@ -146,6 +145,7 @@ GEM rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) jmespath (1.6.1) + json (2.6.3) jwt (2.2.2) listen (3.5.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -153,7 +153,7 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.8.0) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop @@ -161,12 +161,12 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.17.0) + mini_portile2 (2.8.1) + minitest (5.18.0) msgpack (1.4.2) multi_json (1.15.0) multipart-post (2.1.1) - net-imap (0.3.2) + net-imap (0.3.4) date net-protocol net-pop (0.1.2) @@ -176,14 +176,14 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.13.10) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) olive_branch (4.0.1) multi_json rails (>= 4.0) parallel (1.22.1) - parser (3.1.2.0) + parser (3.2.1.1) ast (~> 2.4.1) path_expander (1.1.0) pg (0.18.4) @@ -195,38 +195,38 @@ GEM public_suffix (4.0.6) puma (4.3.12) nio4r (~> 2.0) - racc (1.6.1) - rack (2.2.6.2) - rack-cors (1.1.1) + racc (1.6.2) + rack (2.2.6.3) + rack-cors (2.0.0) rack (>= 2.0.0) rack-test (2.0.2) rack (>= 1.3) - rails (6.0.6) - actioncable (= 6.0.6) - actionmailbox (= 6.0.6) - actionmailer (= 6.0.6) - actionpack (= 6.0.6) - actiontext (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) - activemodel (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + rails (6.0.6.1) + actioncable (= 6.0.6.1) + actionmailbox (= 6.0.6.1) + actionmailer (= 6.0.6.1) + actionpack (= 6.0.6.1) + actiontext (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) + activemodel (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) bundler (>= 1.3.0) - railties (= 6.0.6) + railties (= 6.0.6.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - rails-i18n (7.0.3) + rails-i18n (7.0.6) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.0.6) - actionpack (= 6.0.6) - activesupport (= 6.0.6) + railties (6.0.6.1) + actionpack (= 6.0.6.1) + activesupport (= 6.0.6.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -235,7 +235,8 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.7.0) + redis (5.0.6) + redis-client (>= 0.9.0) redis-actionpack (5.3.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 3) @@ -243,6 +244,8 @@ GEM redis-activesupport (5.3.0) activesupport (>= 3, < 8) redis-store (>= 1.3, < 2) + redis-client (0.13.0) + connection_pool redis-namespace (1.8.1) redis (>= 3.0.4) redis-rack (2.1.4) @@ -252,23 +255,23 @@ GEM redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.9.1) - redis (>= 4, < 5) - regexp_parser (2.5.0) + redis-store (1.9.2) + redis (>= 4, < 6) + regexp_parser (2.7.0) rexml (3.2.5) rgeo (2.2.0) rgeo-activerecord (6.2.2) activerecord (>= 5.0) rgeo (>= 1.0.0) rollbar (3.1.2) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.12.0) rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -277,29 +280,30 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.11.0) - rubocop (1.30.0) + rspec-support (3.12.0) + rubocop (1.48.0) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.18.0, < 2.0) + rubocop-ast (>= 1.26.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) - parser (>= 3.1.1.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.27.0) + parser (>= 3.2.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) + rubocop-rails (2.18.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) + rubocop (>= 1.33.0, < 2.0) rubocop-rspec (2.2.0) rubocop (~> 1.0) rubocop-ast (>= 1.1.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.4) ruby_parser (3.15.1) sexp_processor (~> 4.9) @@ -323,10 +327,10 @@ GEM unicode-display_width (>= 1.1.1, < 3) thor (1.2.1) thread_safe (0.3.6) - timeout (0.3.1) - tzinfo (1.2.10) + timeout (0.3.2) + tzinfo (1.2.11) thread_safe (~> 0.1) - unicode-display_width (2.2.0) + unicode-display_width (2.4.2) webmock (3.13.0) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -334,7 +338,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby From 1f2a6cabf208c6fb24e6348bd94d4a38c440cc60 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 15 Mar 2023 16:38:22 +0000 Subject: [PATCH 03/20] fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIVESUPPORT-3360028 - https://snyk.io/vuln/SNYK-RUBY-RACK-3360233 --- Gemfile | 2 +- Gemfile.lock | 293 ++++++++++++++++++++++++++++----------------------- 2 files changed, 160 insertions(+), 135 deletions(-) diff --git a/Gemfile b/Gemfile index f8fc0fc6..fac63456 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.7.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.0.6' +gem 'rails', '~> 6.1.7', '>= 6.1.7.3' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.4' # Use Puma as the app server diff --git a/Gemfile.lock b/Gemfile.lock index a185844e..39e9145f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,64 +1,68 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.0.6) - actionpack (= 6.0.6) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (>= 2.7.1) - actionmailer (6.0.6) - actionpack (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.6) - actionview (= 6.0.6) - activesupport (= 6.0.6) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.6) - actionpack (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) nokogiri (>= 1.8.5) - actionview (6.0.6) - activesupport (= 6.0.6) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.6) - activesupport (= 6.0.6) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (6.0.6) - activesupport (= 6.0.6) - activerecord (6.0.6) - activemodel (= 6.0.6) - activesupport (= 6.0.6) - activerecord-postgis-adapter (6.0.1) - activerecord (~> 6.0) - rgeo-activerecord (~> 6.0) - activestorage (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activerecord-postgis-adapter (7.1.1) + activerecord (~> 6.1) + rgeo-activerecord (~> 7.0.0) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) marcel (~> 1.0) - activesupport (6.0.6) + mini_mime (>= 1.1.0) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) @@ -74,12 +78,11 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.2.3) aws-eventstream (~> 1, >= 1.0.2) - better_html (1.0.16) - actionview (>= 4.0) - activesupport (>= 4.0) + better_html (2.0.1) + actionview (>= 6.0) + activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) - html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties bootsnap (1.7.3) @@ -88,56 +91,74 @@ GEM builder (3.2.4) byebug (11.1.3) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) + connection_pool (2.3.0) crack (0.4.5) rexml crass (1.0.6) date (3.3.3) diff-lcs (1.5.0) docile (1.3.5) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) railties (>= 3.2) - erubi (1.11.0) + erubi (1.12.0) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.3.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) faraday-http-cache (2.2.0) faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) - faraday_middleware (1.0.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) ffi (1.15.0) flog (4.6.4) path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.8) - globalid (1.0.1) + globalid (1.1.0) activesupport (>= 5.0) - graphlient (0.5.0) + graphlient (0.6.0) faraday (>= 1.0) faraday_middleware graphql-client - graphql (1.12.6) - graphql-client (0.16.0) + graphql (2.0.19) + graphql-client (0.18.0) activesupport (>= 3.0) - graphql (~> 1.8) + graphql hashdiff (1.0.1) - highline (2.0.3) - html_tokenizer (0.0.7) + highline (2.1.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - i18n-tasks (1.0.11) + i18n-tasks (1.0.12) activesupport (>= 4.0.2) ast (>= 2.1.0) - better_html (~> 1.0) + better_html (>= 1.0, < 3.0) erubi highline (>= 2.0.0) i18n @@ -146,6 +167,7 @@ GEM rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) jmespath (1.6.1) + json (2.6.3) jwt (2.2.2) listen (3.5.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -153,7 +175,7 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.8.0) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop @@ -161,12 +183,12 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.17.0) + mini_portile2 (2.8.1) + minitest (5.18.0) msgpack (1.4.2) multi_json (1.15.0) - multipart-post (2.1.1) - net-imap (0.3.2) + multipart-post (2.3.0) + net-imap (0.3.4) date net-protocol net-pop (0.1.2) @@ -176,14 +198,14 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.13.10) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) olive_branch (4.0.1) multi_json rails (>= 4.0) parallel (1.22.1) - parser (3.1.2.0) + parser (3.2.1.1) ast (~> 2.4.1) path_expander (1.1.0) pg (0.18.4) @@ -195,47 +217,48 @@ GEM public_suffix (4.0.6) puma (4.3.12) nio4r (~> 2.0) - racc (1.6.1) - rack (2.2.6.2) - rack-cors (1.1.1) + racc (1.6.2) + rack (2.2.6.4) + rack-cors (2.0.0) rack (>= 2.0.0) - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) - rails (6.0.6) - actioncable (= 6.0.6) - actionmailbox (= 6.0.6) - actionmailer (= 6.0.6) - actionpack (= 6.0.6) - actiontext (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) - activemodel (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) - bundler (>= 1.3.0) - railties (= 6.0.6) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + bundler (>= 1.15.0) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - rails-i18n (7.0.3) + rails-i18n (7.0.6) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.0.6) - actionpack (= 6.0.6) - activesupport (= 6.0.6) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.7.0) + redis (5.0.6) + redis-client (>= 0.9.0) redis-actionpack (5.3.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 3) @@ -243,6 +266,8 @@ GEM redis-activesupport (5.3.0) activesupport (>= 3, < 8) redis-store (>= 1.3, < 2) + redis-client (0.14.0) + connection_pool redis-namespace (1.8.1) redis (>= 3.0.4) redis-rack (2.1.4) @@ -252,55 +277,56 @@ GEM redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.9.1) - redis (>= 4, < 5) - regexp_parser (2.5.0) + redis-store (1.9.2) + redis (>= 4, < 6) + regexp_parser (2.7.0) rexml (3.2.5) - rgeo (2.2.0) - rgeo-activerecord (6.2.2) + rgeo (3.0.0) + rgeo-activerecord (7.0.1) activerecord (>= 5.0) rgeo (>= 1.0.0) rollbar (3.1.2) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.4) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.11.0) - rubocop (1.30.0) + rspec-support (~> 3.12.0) + rspec-rails (6.0.1) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.11) + rspec-expectations (~> 3.11) + rspec-mocks (~> 3.11) + rspec-support (~> 3.11) + rspec-support (3.12.0) + rubocop (1.48.1) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.18.0, < 2.0) + rubocop-ast (>= 1.26.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) - parser (>= 3.1.1.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.27.0) + parser (>= 3.2.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) + rubocop-rails (2.18.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) + rubocop (>= 1.33.0, < 2.0) rubocop-rspec (2.2.0) rubocop (~> 1.0) rubocop-ast (>= 1.1.0) - ruby-progressbar (1.11.0) - ruby2_keywords (0.0.4) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) ruby_parser (3.15.1) sexp_processor (~> 4.9) sexp_processor (4.15.2) @@ -322,11 +348,10 @@ GEM terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.1) - thread_safe (0.3.6) - timeout (0.3.1) - tzinfo (1.2.10) - thread_safe (~> 0.1) - unicode-display_width (2.2.0) + timeout (0.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.4.2) webmock (3.13.0) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -334,7 +359,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby @@ -360,7 +385,7 @@ DEPENDENCIES pry-rails puma (~> 4.3, >= 4.3.12) rack-cors - rails (~> 6.0.6) + rails (~> 6.1.7, >= 6.1.7.3) redis redis-namespace redis-rails (>= 5.0.2) From 353296e77f75527670a19957daf2efa80dd11fd4 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 29 Mar 2023 06:22:49 +0000 Subject: [PATCH 04/20] fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RAILS-5291540 --- Gemfile | 2 +- Gemfile.lock | 155 ++++++++++++++++++++++++++------------------------- 2 files changed, 80 insertions(+), 77 deletions(-) diff --git a/Gemfile b/Gemfile index f8fc0fc6..fac63456 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.7.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.0.6' +gem 'rails', '~> 6.1.7', '>= 6.1.7.3' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.4' # Use Puma as the app server diff --git a/Gemfile.lock b/Gemfile.lock index a185844e..fd96334a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,64 +1,68 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.0.6) - actionpack (= 6.0.6) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (>= 2.7.1) - actionmailer (6.0.6) - actionpack (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.6) - actionview (= 6.0.6) - activesupport (= 6.0.6) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.6) - actionpack (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) nokogiri (>= 1.8.5) - actionview (6.0.6) - activesupport (= 6.0.6) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.6) - activesupport (= 6.0.6) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (6.0.6) - activesupport (= 6.0.6) - activerecord (6.0.6) - activemodel (= 6.0.6) - activesupport (= 6.0.6) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) activerecord-postgis-adapter (6.0.1) activerecord (~> 6.0) rgeo-activerecord (~> 6.0) - activestorage (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) marcel (~> 1.0) - activesupport (6.0.6) + mini_mime (>= 1.1.0) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) @@ -88,7 +92,7 @@ GEM builder (3.2.4) byebug (11.1.3) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crack (0.4.5) rexml crass (1.0.6) @@ -99,7 +103,7 @@ GEM dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) - erubi (1.11.0) + erubi (1.12.0) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -119,7 +123,7 @@ GEM path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.8) - globalid (1.0.1) + globalid (1.1.0) activesupport (>= 5.0) graphlient (0.5.0) faraday (>= 1.0) @@ -153,7 +157,7 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.8.0) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop @@ -161,12 +165,12 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.17.0) + mini_portile2 (2.8.1) + minitest (5.18.0) msgpack (1.4.2) multi_json (1.15.0) multipart-post (2.1.1) - net-imap (0.3.2) + net-imap (0.3.4) date net-protocol net-pop (0.1.2) @@ -176,7 +180,7 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.13.10) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) olive_branch (4.0.1) @@ -195,41 +199,41 @@ GEM public_suffix (4.0.6) puma (4.3.12) nio4r (~> 2.0) - racc (1.6.1) - rack (2.2.6.2) + racc (1.6.2) + rack (2.2.6.4) rack-cors (1.1.1) rack (>= 2.0.0) - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) - rails (6.0.6) - actioncable (= 6.0.6) - actionmailbox (= 6.0.6) - actionmailer (= 6.0.6) - actionpack (= 6.0.6) - actiontext (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) - activemodel (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) - bundler (>= 1.3.0) - railties (= 6.0.6) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + bundler (>= 1.15.0) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.0.6) - actionpack (= 6.0.6) - activesupport (= 6.0.6) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.10.4) @@ -322,10 +326,9 @@ GEM terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.1) - thread_safe (0.3.6) - timeout (0.3.1) - tzinfo (1.2.10) - thread_safe (~> 0.1) + timeout (0.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) unicode-display_width (2.2.0) webmock (3.13.0) addressable (>= 2.3.6) @@ -334,7 +337,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby @@ -360,7 +363,7 @@ DEPENDENCIES pry-rails puma (~> 4.3, >= 4.3.12) rack-cors - rails (~> 6.0.6) + rails (~> 6.1.7, >= 6.1.7.3) redis redis-namespace redis-rails (>= 5.0.2) From 14946667ad039ebfebdfedb585b4e9863376b9c1 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 4 Apr 2023 16:54:56 +0000 Subject: [PATCH 05/20] fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-3237231 - https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-3237232 - https://snyk.io/vuln/SNYK-RUBY-ACTIVERECORD-3237236 - https://snyk.io/vuln/SNYK-RUBY-ACTIVERECORD-3237239 - https://snyk.io/vuln/SNYK-RUBY-ACTIVESUPPORT-3237242 - https://snyk.io/vuln/SNYK-RUBY-ACTIVESUPPORT-3360028 - https://snyk.io/vuln/SNYK-RUBY-RACK-1061917 - https://snyk.io/vuln/SNYK-RUBY-RACK-3356639 - https://snyk.io/vuln/SNYK-RUBY-RACK-3360233 - https://snyk.io/vuln/SNYK-RUBY-RAILS-5291540 --- Gemfile | 2 +- Gemfile.lock | 297 ++++++++++++++++++++++++++++----------------------- 2 files changed, 162 insertions(+), 137 deletions(-) diff --git a/Gemfile b/Gemfile index f8fc0fc6..fac63456 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.7.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.0.6' +gem 'rails', '~> 6.1.7', '>= 6.1.7.3' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.4' # Use Puma as the app server diff --git a/Gemfile.lock b/Gemfile.lock index a185844e..414172e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,64 +1,68 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.0.6) - actionpack (= 6.0.6) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (>= 2.7.1) - actionmailer (6.0.6) - actionpack (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.6) - actionview (= 6.0.6) - activesupport (= 6.0.6) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.6) - actionpack (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) nokogiri (>= 1.8.5) - actionview (6.0.6) - activesupport (= 6.0.6) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.6) - activesupport (= 6.0.6) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (6.0.6) - activesupport (= 6.0.6) - activerecord (6.0.6) - activemodel (= 6.0.6) - activesupport (= 6.0.6) - activerecord-postgis-adapter (6.0.1) - activerecord (~> 6.0) - rgeo-activerecord (~> 6.0) - activestorage (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activerecord-postgis-adapter (7.1.1) + activerecord (~> 6.1) + rgeo-activerecord (~> 7.0.0) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) marcel (~> 1.0) - activesupport (6.0.6) + mini_mime (>= 1.1.0) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) @@ -74,12 +78,11 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.2.3) aws-eventstream (~> 1, >= 1.0.2) - better_html (1.0.16) - actionview (>= 4.0) - activesupport (>= 4.0) + better_html (2.0.1) + actionview (>= 6.0) + activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) - html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties bootsnap (1.7.3) @@ -88,56 +91,74 @@ GEM builder (3.2.4) byebug (11.1.3) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) + connection_pool (2.4.0) crack (0.4.5) rexml crass (1.0.6) date (3.3.3) diff-lcs (1.5.0) docile (1.3.5) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) railties (>= 3.2) - erubi (1.11.0) + erubi (1.12.0) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.3.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) faraday-http-cache (2.2.0) faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) - faraday_middleware (1.0.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) ffi (1.15.0) flog (4.6.4) path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.8) - globalid (1.0.1) + globalid (1.1.0) activesupport (>= 5.0) - graphlient (0.5.0) + graphlient (0.6.0) faraday (>= 1.0) faraday_middleware graphql-client - graphql (1.12.6) - graphql-client (0.16.0) + graphql (2.0.20) + graphql-client (0.18.0) activesupport (>= 3.0) - graphql (~> 1.8) + graphql hashdiff (1.0.1) - highline (2.0.3) - html_tokenizer (0.0.7) + highline (2.1.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - i18n-tasks (1.0.11) + i18n-tasks (1.0.12) activesupport (>= 4.0.2) ast (>= 2.1.0) - better_html (~> 1.0) + better_html (>= 1.0, < 3.0) erubi highline (>= 2.0.0) i18n @@ -146,14 +167,15 @@ GEM rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) jmespath (1.6.1) + json (2.6.3) jwt (2.2.2) listen (3.5.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.1) + loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.8.0) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop @@ -161,12 +183,12 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.17.0) + mini_portile2 (2.8.1) + minitest (5.18.0) msgpack (1.4.2) multi_json (1.15.0) - multipart-post (2.1.1) - net-imap (0.3.2) + multipart-post (2.3.0) + net-imap (0.3.4) date net-protocol net-pop (0.1.2) @@ -175,15 +197,15 @@ GEM timeout net-smtp (0.3.3) net-protocol - nio4r (2.5.8) - nokogiri (1.13.10) + nio4r (2.5.9) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) olive_branch (4.0.1) multi_json rails (>= 4.0) parallel (1.22.1) - parser (3.1.2.0) + parser (3.2.2.0) ast (~> 2.4.1) path_expander (1.1.0) pg (0.18.4) @@ -195,47 +217,48 @@ GEM public_suffix (4.0.6) puma (4.3.12) nio4r (~> 2.0) - racc (1.6.1) - rack (2.2.6.2) - rack-cors (1.1.1) + racc (1.6.2) + rack (2.2.6.4) + rack-cors (2.0.1) rack (>= 2.0.0) - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) - rails (6.0.6) - actioncable (= 6.0.6) - actionmailbox (= 6.0.6) - actionmailer (= 6.0.6) - actionpack (= 6.0.6) - actiontext (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) - activemodel (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) - bundler (>= 1.3.0) - railties (= 6.0.6) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + bundler (>= 1.15.0) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - rails-i18n (7.0.3) + rails-i18n (7.0.6) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.0.6) - actionpack (= 6.0.6) - activesupport (= 6.0.6) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.7.0) + redis (5.0.6) + redis-client (>= 0.9.0) redis-actionpack (5.3.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 3) @@ -243,6 +266,8 @@ GEM redis-activesupport (5.3.0) activesupport (>= 3, < 8) redis-store (>= 1.3, < 2) + redis-client (0.14.1) + connection_pool redis-namespace (1.8.1) redis (>= 3.0.4) redis-rack (2.1.4) @@ -252,55 +277,56 @@ GEM redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.9.1) - redis (>= 4, < 5) - regexp_parser (2.5.0) + redis-store (1.9.2) + redis (>= 4, < 6) + regexp_parser (2.7.0) rexml (3.2.5) - rgeo (2.2.0) - rgeo-activerecord (6.2.2) + rgeo (3.0.0) + rgeo-activerecord (7.0.1) activerecord (>= 5.0) rgeo (>= 1.0.0) rollbar (3.1.2) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.11.0) - rubocop (1.30.0) + rspec-support (~> 3.12.0) + rspec-rails (6.0.1) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.11) + rspec-expectations (~> 3.11) + rspec-mocks (~> 3.11) + rspec-support (~> 3.11) + rspec-support (3.12.0) + rubocop (1.49.0) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.18.0, < 2.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) - parser (>= 3.1.1.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.28.0) + parser (>= 3.2.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) + rubocop-rails (2.18.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) + rubocop (>= 1.33.0, < 2.0) rubocop-rspec (2.2.0) rubocop (~> 1.0) rubocop-ast (>= 1.1.0) - ruby-progressbar (1.11.0) - ruby2_keywords (0.0.4) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) ruby_parser (3.15.1) sexp_processor (~> 4.9) sexp_processor (4.15.2) @@ -322,11 +348,10 @@ GEM terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.1) - thread_safe (0.3.6) - timeout (0.3.1) - tzinfo (1.2.10) - thread_safe (~> 0.1) - unicode-display_width (2.2.0) + timeout (0.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.4.2) webmock (3.13.0) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -334,7 +359,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby @@ -360,7 +385,7 @@ DEPENDENCIES pry-rails puma (~> 4.3, >= 4.3.12) rack-cors - rails (~> 6.0.6) + rails (~> 6.1.7, >= 6.1.7.3) redis redis-namespace redis-rails (>= 5.0.2) From bb09fa67db6f69320a434cf729101fef5a40ca07 Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Wed, 7 Jun 2023 19:42:35 +0100 Subject: [PATCH 06/20] Updated rails version Ad this build now should support ruby 3.2.2 --- Gemfile | 6 +- Gemfile.lock | 420 +++++++++++++++++++++++++++------------------------ 2 files changed, 227 insertions(+), 199 deletions(-) diff --git a/Gemfile b/Gemfile index f8fc0fc6..55604f67 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.7.2' +ruby '3.2.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.0.6' +gem 'rails', '~> 7.0.5' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.4' # Use Puma as the app server @@ -21,7 +21,7 @@ gem 'puma', '~> 4.3', '>= 4.3.12' gem 'bootsnap', '>= 1.4.2', require: false # for postgresql gem 'activerecord-postgis-adapter', '>= 6.0.1' -gem 'pg', '~> 0.18.4' +gem 'pg' gem 'jwt' gem 'faraday' gem 'faraday_middleware' diff --git a/Gemfile.lock b/Gemfile.lock index 452523a9..fb5c91cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,143 +1,170 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.0.6) - actionpack (= 6.0.6) + actioncable (7.0.5) + actionpack (= 7.0.5) + activesupport (= 7.0.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actionmailbox (7.0.5) + actionpack (= 7.0.5) + activejob (= 7.0.5) + activerecord (= 7.0.5) + activestorage (= 7.0.5) + activesupport (= 7.0.5) mail (>= 2.7.1) - actionmailer (6.0.6) - actionpack (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) + net-imap + net-pop + net-smtp + actionmailer (7.0.5) + actionpack (= 7.0.5) + actionview (= 7.0.5) + activejob (= 7.0.5) + activesupport (= 7.0.5) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.0.6) - actionview (= 6.0.6) - activesupport (= 6.0.6) - rack (~> 2.0, >= 2.0.8) + actionpack (7.0.5) + actionview (= 7.0.5) + activesupport (= 7.0.5) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.6) - actionpack (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actiontext (7.0.5) + actionpack (= 7.0.5) + activerecord (= 7.0.5) + activestorage (= 7.0.5) + activesupport (= 7.0.5) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.0.6) - activesupport (= 6.0.6) + actionview (7.0.5) + activesupport (= 7.0.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.6) - activesupport (= 6.0.6) + activejob (7.0.5) + activesupport (= 7.0.5) globalid (>= 0.3.6) - activemodel (6.0.6) - activesupport (= 6.0.6) - activerecord (6.0.6) - activemodel (= 6.0.6) - activesupport (= 6.0.6) - activerecord-postgis-adapter (6.0.1) - activerecord (~> 6.0) - rgeo-activerecord (~> 6.0) - activestorage (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) + activemodel (7.0.5) + activesupport (= 7.0.5) + activerecord (7.0.5) + activemodel (= 7.0.5) + activesupport (= 7.0.5) + activerecord-postgis-adapter (8.0.2) + activerecord (~> 7.0.0) + rgeo-activerecord (~> 7.0.0) + activestorage (7.0.5) + actionpack (= 7.0.5) + activejob (= 7.0.5) + activerecord (= 7.0.5) + activesupport (= 7.0.5) marcel (~> 1.0) - activesupport (6.0.6) + mini_mime (>= 1.1.0) + activesupport (7.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - aws-eventstream (1.1.1) - aws-partitions (1.567.0) - aws-sdk-core (3.130.0) + aws-eventstream (1.2.0) + aws-partitions (1.776.0) + aws-sdk-core (3.174.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-ssm (1.132.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-ssm (1.151.0) + aws-sdk-core (~> 3, >= 3.174.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) - better_html (1.0.16) - actionview (>= 4.0) - activesupport (>= 4.0) + better_html (2.0.1) + actionview (>= 6.0) + activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) - html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties - bootsnap (1.7.3) - msgpack (~> 1.0) - brakeman (5.0.0) + bootsnap (1.16.0) + msgpack (~> 1.2) + brakeman (6.0.0) builder (3.2.4) byebug (11.1.3) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) date (3.3.3) diff-lcs (1.5.0) - docile (1.3.5) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) + docile (1.4.0) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) railties (>= 3.2) - erubi (1.11.0) + erubi (1.12.0) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.3.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - faraday-http-cache (2.2.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-http-cache (2.5.0) faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) - faraday_middleware (1.0.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) - ffi (1.15.0) - flog (4.6.4) + ffi (1.15.5) + flog (4.6.6) path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.8) - globalid (1.0.1) + globalid (1.1.0) activesupport (>= 5.0) - graphlient (0.5.0) + graphlient (0.6.0) faraday (>= 1.0) faraday_middleware graphql-client - graphql (1.12.6) - graphql-client (0.16.0) + graphql (2.0.22) + graphql-client (0.18.0) activesupport (>= 3.0) - graphql (~> 1.8) + graphql hashdiff (1.0.1) - highline (2.0.3) - html_tokenizer (0.0.7) - i18n (1.12.0) + highline (2.1.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - i18n-tasks (1.0.11) + i18n-tasks (1.0.12) activesupport (>= 4.0.2) ast (>= 2.1.0) - better_html (~> 1.0) + better_html (>= 1.0, < 3.0) erubi highline (>= 2.0.0) i18n @@ -145,15 +172,16 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - jmespath (1.6.1) - jwt (2.2.2) - listen (3.5.0) + jmespath (1.6.2) + json (2.6.3) + jwt (2.7.0) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.1) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.8.0) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop @@ -161,12 +189,11 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.1) - minitest (5.17.0) - msgpack (1.4.2) + minitest (5.18.0) + msgpack (1.7.1) multi_json (1.15.0) - multipart-post (2.1.1) - net-imap (0.3.2) + multipart-post (2.3.0) + net-imap (0.3.4) date net-protocol net-pop (0.1.2) @@ -175,67 +202,68 @@ GEM timeout net-smtp (0.3.3) net-protocol - nio4r (2.5.8) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) + nio4r (2.5.9) + nokogiri (1.15.2-x86_64-darwin) racc (~> 1.4) olive_branch (4.0.1) multi_json rails (>= 4.0) - parallel (1.22.1) - parser (3.1.2.0) + parallel (1.23.0) + parser (3.2.2.1) ast (~> 2.4.1) - path_expander (1.1.0) - pg (0.18.4) - pry (0.14.0) + path_expander (1.1.1) + pg (1.5.3) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.6) + public_suffix (5.0.1) puma (4.3.12) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.4) - rack-cors (1.1.1) + rack (2.2.7) + rack-cors (2.0.1) rack (>= 2.0.0) - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) - rails (6.0.6) - actioncable (= 6.0.6) - actionmailbox (= 6.0.6) - actionmailer (= 6.0.6) - actionpack (= 6.0.6) - actiontext (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) - activemodel (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) - bundler (>= 1.3.0) - railties (= 6.0.6) - sprockets-rails (>= 2.0.0) + rails (7.0.5) + actioncable (= 7.0.5) + actionmailbox (= 7.0.5) + actionmailer (= 7.0.5) + actionpack (= 7.0.5) + actiontext (= 7.0.5) + actionview (= 7.0.5) + activejob (= 7.0.5) + activemodel (= 7.0.5) + activerecord (= 7.0.5) + activestorage (= 7.0.5) + activesupport (= 7.0.5) + bundler (>= 1.15.0) + railties (= 7.0.5) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) - rails-i18n (7.0.3) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rails-i18n (7.0.7) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.0.6) - actionpack (= 6.0.6) - activesupport (= 6.0.6) + railties (7.0.5) + actionpack (= 7.0.5) + activesupport (= 7.0.5) method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) - rb-fsevent (0.10.4) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.7.0) + redis (5.0.6) + redis-client (>= 0.9.0) redis-actionpack (5.3.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 3) @@ -243,8 +271,10 @@ GEM redis-activesupport (5.3.0) activesupport (>= 3, < 8) redis-store (>= 1.3, < 2) - redis-namespace (1.8.1) - redis (>= 3.0.4) + redis-client (0.14.1) + connection_pool + redis-namespace (1.10.0) + redis (>= 4) redis-rack (2.1.4) rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) @@ -252,92 +282,90 @@ GEM redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.9.1) - redis (>= 4, < 5) - regexp_parser (2.5.0) + redis-store (1.9.2) + redis (>= 4, < 6) + regexp_parser (2.8.0) rexml (3.2.5) - rgeo (2.2.0) - rgeo-activerecord (6.2.2) + rgeo (3.0.0) + rgeo-activerecord (7.0.1) activerecord (>= 5.0) rgeo (>= 1.0.0) - rollbar (3.1.2) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rollbar (3.4.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.11.0) - rubocop (1.30.0) + rspec-support (~> 3.12.0) + rspec-rails (6.0.3) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.0) + rubocop (1.52.0) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.18.0, < 2.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) - parser (>= 3.1.1.0) - rubocop-performance (1.10.2) - rubocop (>= 0.90.0, < 2.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) + rubocop-performance (1.18.0) + rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) + rubocop-rails (2.19.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.2.0) - rubocop (~> 1.0) - rubocop-ast (>= 1.1.0) - ruby-progressbar (1.11.0) - ruby2_keywords (0.0.4) - ruby_parser (3.15.1) - sexp_processor (~> 4.9) - sexp_processor (4.15.2) - simplecov (0.21.2) + rubocop (>= 1.33.0, < 2.0) + rubocop-rspec (2.22.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + ruby_parser (3.20.2) + sexp_processor (~> 4.16) + sexp_processor (4.17.0) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.4) smart_properties (1.17.0) - sprockets (4.2.0) - concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - sqlite3 (1.4.2) + sqlite3 (1.6.3-x86_64-darwin) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.1) - thread_safe (0.3.6) - timeout (0.3.1) - tzinfo (1.2.10) - thread_safe (~> 0.1) - unicode-display_width (2.2.0) - webmock (3.13.0) - addressable (>= 2.3.6) + thor (1.2.2) + timeout (0.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.4.2) + webmock (3.18.1) + addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.6) + zeitwerk (2.6.8) PLATFORMS - ruby + x86_64-darwin-21 DEPENDENCIES activerecord-postgis-adapter (>= 6.0.1) @@ -356,11 +384,11 @@ DEPENDENCIES jwt listen (~> 3.2) olive_branch (>= 4.0.1) - pg (~> 0.18.4) + pg pry-rails puma (~> 4.3, >= 4.3.12) rack-cors - rails (~> 6.0.6) + rails (~> 7.0.5) redis redis-namespace redis-rails (>= 5.0.2) @@ -375,7 +403,7 @@ DEPENDENCIES webmock (>= 3.12.1) RUBY VERSION - ruby 2.7.2p137 + ruby 3.2.2p53 BUNDLED WITH - 2.1.4 + 2.4.10 From b4a2f20bc0ff707584feeb804670b7fa0f91de9c Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Tue, 13 Jun 2023 13:01:53 +0100 Subject: [PATCH 07/20] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c912d5ab..632d9fc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: bionic language: ruby rvm: - — 2.7.2 + — 3.2.2 env: matrix: - API_ROOT=$deploy_api_uri From c2f6ed658f13b3e56e064aa0bea06bd9bfb8fcd9 Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Wed, 14 Jun 2023 00:46:03 +0100 Subject: [PATCH 08/20] Fixed webmock headers Due to upgrade in version some headers have changed --- app/services/mocking_service/api_duns_coh_stub.rb | 6 +++--- .../mocking_service/api_salesforce_stub.rb | 4 ++-- app/services/mocking_service/api_stub.rb | 5 +++-- .../mocking_service/migration_salesforce_api.rb | 4 ++-- config/application.rb | 2 +- ...stered_organisations_schemes_controller_spec.rb | 2 +- .../api/v1/data_migration_controller_spec.rb | 14 +++++++------- .../api/v1/manage_organisations_controller_spec.rb | 4 ++-- ...stered_organisations_schemes_controller_spec.rb | 2 +- ...ations_additional_identifier_controller_spec.rb | 2 +- .../api/v1/update_organisations_controller_spec.rb | 6 +++--- .../additional_identifier_spec.rb | 2 +- spec/services/find_that_charity/search_spec.rb | 2 +- 13 files changed, 28 insertions(+), 27 deletions(-) diff --git a/app/services/mocking_service/api_duns_coh_stub.rb b/app/services/mocking_service/api_duns_coh_stub.rb index 689509aa..c2887e24 100644 --- a/app/services/mocking_service/api_duns_coh_stub.rb +++ b/app/services/mocking_service/api_duns_coh_stub.rb @@ -24,7 +24,7 @@ def stub_headers { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } end @@ -32,8 +32,8 @@ def stub_token_headers { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'Content-Type'=>'application/json', + 'User-Agent'=>'Faraday v1.10.3' } end diff --git a/app/services/mocking_service/api_salesforce_stub.rb b/app/services/mocking_service/api_salesforce_stub.rb index af5e8018..0aafc577 100644 --- a/app/services/mocking_service/api_salesforce_stub.rb +++ b/app/services/mocking_service/api_salesforce_stub.rb @@ -24,7 +24,7 @@ def stub_headers { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } end @@ -33,7 +33,7 @@ def stub_token_headers 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } end diff --git a/app/services/mocking_service/api_stub.rb b/app/services/mocking_service/api_stub.rb index 5eb2e398..cabcd757 100644 --- a/app/services/mocking_service/api_stub.rb +++ b/app/services/mocking_service/api_stub.rb @@ -25,7 +25,7 @@ def stub_headers { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } end @@ -33,8 +33,9 @@ def stub_token_headers { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', + 'Authorization'=>'Basic bndmaWViZmlid2VpYmZ1ZXdiZmJ1ZXdiZnVld3U6d2RvaWVvaWVmZW93aWZvZXdvZmppb2Vyd2Y=', 'Content-Type' => 'application/json', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } end diff --git a/app/services/mocking_service/migration_salesforce_api.rb b/app/services/mocking_service/migration_salesforce_api.rb index 5b37b97e..fb8ea805 100644 --- a/app/services/mocking_service/migration_salesforce_api.rb +++ b/app/services/mocking_service/migration_salesforce_api.rb @@ -24,7 +24,7 @@ def stub_headers { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } end @@ -33,7 +33,7 @@ def stub_token_headers 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } end diff --git a/config/application.rb b/config/application.rb index 8f1af391..abda9042 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,7 +22,7 @@ module CII class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.0 + config.load_defaults 7.0 config.autoload_paths << Rails.root.join('lib') diff --git a/spec/controllers/api/v1/all_registered_organisations_schemes_controller_spec.rb b/spec/controllers/api/v1/all_registered_organisations_schemes_controller_spec.rb index c456cb70..4851c4c9 100644 --- a/spec/controllers/api/v1/all_registered_organisations_schemes_controller_spec.rb +++ b/spec/controllers/api/v1/all_registered_organisations_schemes_controller_spec.rb @@ -14,7 +14,7 @@ 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => "Bearer #{jwt_token}", 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: 'true', headers: {}) diff --git a/spec/controllers/api/v1/data_migration_controller_spec.rb b/spec/controllers/api/v1/data_migration_controller_spec.rb index 5362ba05..3b4ed7db 100644 --- a/spec/controllers/api/v1/data_migration_controller_spec.rb +++ b/spec/controllers/api/v1/data_migration_controller_spec.rb @@ -29,7 +29,7 @@ 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer eyJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6IiIsImNpaU9yZ0lkIjpudWxsLCJhdWQiOiJ3bmRpb3dkaW8ydWVoMzI5OGhyMyJ9.--zykzxTOhJD4WX2LijXdlgyOlEdCjfv3HprzWyzrhY', 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: '', headers: {}) @@ -39,7 +39,7 @@ 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer t07891Fbasibd60NM9rW9basidj49w7ig7R2S9', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) stub_request(:get, "https://biwbdqwbdiwebiu.com/services/data/v45.0/query?q=SELECT%20ID,name,Status__c,Supplier_DUNS_Number__c,Company_Registration_Number__c,Account_URN__c%20FROM%20account%20WHERE%20Id='NSO7IUSHF98HFP9WEH9FFG'") @@ -48,7 +48,7 @@ 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer t07891Fbasibd60NM9rW9basidj49w7ig7R2S9', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) stub_request(:post, 'https://biwbdqwbdiwebiu.com/services/oauth2/token') @@ -59,7 +59,7 @@ 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer t07891Fbasibd60NM9rW9basidj49w7ig7R2S9', 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) stub_request(:post, "#{ENV.fetch('SALESFORCE_AUTH_URL', nil)}/services/oauth2/token") @@ -70,7 +70,7 @@ 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer t07891Fbasibd60NM9rW9basidj49w7ig7R2S9', 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: token_response, headers: {}) @@ -80,7 +80,7 @@ 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer t07891Fbasibd60NM9rW9basidj49w7ig7R2S9', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: sf_response, headers: {}) @@ -90,7 +90,7 @@ 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer t07891Fbasibd60NM9rW9basidj49w7ig7R2S9', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 404, body: '', headers: {}) diff --git a/spec/controllers/api/v1/manage_organisations_controller_spec.rb b/spec/controllers/api/v1/manage_organisations_controller_spec.rb index b2a1fad6..f2bc86ce 100644 --- a/spec/controllers/api/v1/manage_organisations_controller_spec.rb +++ b/spec/controllers/api/v1/manage_organisations_controller_spec.rb @@ -78,7 +78,7 @@ 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => "Bearer #{jwt_token}", 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: 'true', headers: {}) @@ -87,7 +87,7 @@ headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: response_body.to_json, headers: {}) diff --git a/spec/controllers/api/v1/registered_organisations_schemes_controller_spec.rb b/spec/controllers/api/v1/registered_organisations_schemes_controller_spec.rb index 85cf2a4c..be7382fe 100644 --- a/spec/controllers/api/v1/registered_organisations_schemes_controller_spec.rb +++ b/spec/controllers/api/v1/registered_organisations_schemes_controller_spec.rb @@ -18,7 +18,7 @@ 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => "Bearer #{jwt_token}", 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: 'true', headers: {}) diff --git a/spec/controllers/api/v1/remove_organisations_additional_identifier_controller_spec.rb b/spec/controllers/api/v1/remove_organisations_additional_identifier_controller_spec.rb index 4ae88692..4486cc04 100644 --- a/spec/controllers/api/v1/remove_organisations_additional_identifier_controller_spec.rb +++ b/spec/controllers/api/v1/remove_organisations_additional_identifier_controller_spec.rb @@ -20,7 +20,7 @@ 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => "Bearer #{jwt_token}", 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: 'true', headers: {}) diff --git a/spec/controllers/api/v1/update_organisations_controller_spec.rb b/spec/controllers/api/v1/update_organisations_controller_spec.rb index 7af0ac3b..b02af622 100644 --- a/spec/controllers/api/v1/update_organisations_controller_spec.rb +++ b/spec/controllers/api/v1/update_organisations_controller_spec.rb @@ -76,7 +76,7 @@ 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => "Bearer #{jwt_token}", 'Content-Type' => 'application/x-www-form-urlencoded', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: 'true', headers: {}) @@ -85,7 +85,7 @@ headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: response_body.to_json, headers: {}) @@ -189,7 +189,7 @@ headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: response_body_second.to_json, headers: {}) diff --git a/spec/services/find_that_charity/additional_identifier_spec.rb b/spec/services/find_that_charity/additional_identifier_spec.rb index 32eaeb48..acb6c11e 100644 --- a/spec/services/find_that_charity/additional_identifier_spec.rb +++ b/spec/services/find_that_charity/additional_identifier_spec.rb @@ -68,7 +68,7 @@ headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: response_body.to_json, headers: {}) diff --git a/spec/services/find_that_charity/search_spec.rb b/spec/services/find_that_charity/search_spec.rb index 23aee8ef..b9526c70 100644 --- a/spec/services/find_that_charity/search_spec.rb +++ b/spec/services/find_that_charity/search_spec.rb @@ -74,7 +74,7 @@ headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'User-Agent' => 'Faraday v1.3.0' + 'User-Agent' => 'Faraday v1.10.3' } ) .to_return(status: 200, body: response_body.to_json, headers: {}) From 4b982eb9a2a73dcbd0258b56159f8c4d98b5b7a3 Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Thu, 15 Jun 2023 17:02:03 +0100 Subject: [PATCH 09/20] Rubocop changes --- app/controllers/application_mock_controller.rb | 2 +- spec/controllers/home_controller_spec.rb | 4 ++-- spec/models/scheme_register_spec.rb | 4 ++-- spec/rails_helper.rb | 1 + spec/services/api_validations/scheme_spec.rb | 8 ++++---- spec/stubs/create_organisations_mock_controller_spec.rb | 3 ++- spec/support/factory_bot.rb | 1 + 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/controllers/application_mock_controller.rb b/app/controllers/application_mock_controller.rb index 843e2f5c..284bf8a3 100644 --- a/app/controllers/application_mock_controller.rb +++ b/app/controllers/application_mock_controller.rb @@ -10,7 +10,7 @@ class ApplicationMockController < ActionController::API def run_mock @mock_controller.request = request @mock_controller.response = response - @mock_controller.validate_params if @mock_controller.respond_to?('validate_params') + @mock_controller.validate_params if @mock_controller.respond_to?(:validate_params) end def return_error_code_http diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb index eb1f809c..2a72d5c3 100644 --- a/spec/controllers/home_controller_spec.rb +++ b/spec/controllers/home_controller_spec.rb @@ -1,10 +1,10 @@ require 'rails_helper' -RSpec.describe HomeController, type: :controller do +RSpec.describe HomeController do describe 'GET index' do it 'has a 200 status code' do get :index - expect(response.status).to eq(200) + expect(response).to have_http_status(:ok) end end end diff --git a/spec/models/scheme_register_spec.rb b/spec/models/scheme_register_spec.rb index d1653dfa..80db1ba7 100644 --- a/spec/models/scheme_register_spec.rb +++ b/spec/models/scheme_register_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' -RSpec.describe SchemeRegister, type: :model do - let(:scheme_register) { FactoryBot.create :scheme_register } +RSpec.describe SchemeRegister do + let(:scheme_register) { create(:scheme_register) } describe 'Scheme Register' do it 'Has scheme_register_code' do diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index d9c7e58b..4925ced3 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,5 +1,6 @@ # This file is copied to spec/ when you run 'rails generate rspec:install' require 'spec_helper' +require './spec/support/factory_bot' ENV['RAILS_ENV'] ||= 'test' require File.expand_path('../config/environment', __dir__) # Prevent database truncation if the environment is production diff --git a/spec/services/api_validations/scheme_spec.rb b/spec/services/api_validations/scheme_spec.rb index 392d712c..26c68601 100644 --- a/spec/services/api_validations/scheme_spec.rb +++ b/spec/services/api_validations/scheme_spec.rb @@ -2,13 +2,13 @@ RSpec.describe ApiValidations::Scheme, type: :model do describe 'validations' do - let(:scheme_register) { FactoryBot.create(:scheme_register) } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, scheme_code: scheme_register.scheme_register_code) } - let(:organisation_scheme_identifier1) { FactoryBot.create(:organisation_scheme_identifier) } + let(:scheme_register) { create(:scheme_register) } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, scheme_code: scheme_register.scheme_register_code) } + let(:organisation_scheme_identifier1) { create(:organisation_scheme_identifier) } context 'when all params are present' do it 'is valid' do - expect(described_class.new({ id: organisation_scheme_identifier.scheme_org_reg_number, scheme: scheme_register.scheme_register_code, ccs_org_id: organisation_scheme_identifier.ccs_org_id }).valid?).to eq true + expect(described_class.new({ id: organisation_scheme_identifier.scheme_org_reg_number, scheme: scheme_register.scheme_register_code, ccs_org_id: organisation_scheme_identifier.ccs_org_id }).valid?).to be true end end diff --git a/spec/stubs/create_organisations_mock_controller_spec.rb b/spec/stubs/create_organisations_mock_controller_spec.rb index eccc4837..de2739a4 100644 --- a/spec/stubs/create_organisations_mock_controller_spec.rb +++ b/spec/stubs/create_organisations_mock_controller_spec.rb @@ -49,7 +49,7 @@ def request_post_headers 'x-api-key' => client_registered.api_key, } end - + # rubocop:disable RSpec/NoExpectationExample Dir.each_child('spec/stub_response/api_stubs') do |filename| describe 'Test mock services includes salesforce mock' do it filename do @@ -64,4 +64,5 @@ def request_post_headers end end end + # rubocop:enable RSpec/NoExpectationExample end diff --git a/spec/support/factory_bot.rb b/spec/support/factory_bot.rb index c7890e49..a0893301 100644 --- a/spec/support/factory_bot.rb +++ b/spec/support/factory_bot.rb @@ -1,3 +1,4 @@ +require 'factory_bot' RSpec.configure do |config| config.include FactoryBot::Syntax::Methods end From c015149b396aca35e2026bf1365d294b0451dd74 Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Thu, 15 Jun 2023 17:49:08 +0100 Subject: [PATCH 10/20] fixed rubocop --- .rubocop.yml | 3 ++- CF/manifest-template.yml | 2 +- app/services/authorize/user.rb | 2 -- app/services/common/api_helper.rb | 8 +++---- app/services/find_that_charity/search.rb | 4 ++-- .../mocking_service/api_duns_coh_stub.rb | 4 ++-- app/services/mocking_service/api_stub.rb | 2 +- ...d_organisations_schemes_controller_spec.rb | 6 ++--- .../create_organisations_controller_spec.rb | 20 ++++++++-------- .../api/v1/data_migration_controller_spec.rb | 2 +- .../manage_organisations_controller_spec.rb | 8 +++---- .../api/v1/organisations_controller_spec.rb | 24 +++++++++---------- ...d_organisations_schemes_controller_spec.rb | 6 ++--- ...s_additional_identifier_controller_spec.rb | 8 +++---- .../remove_organisations_controller_spec.rb | 6 ++--- .../api/v1/schemes_controller_spec.rb | 12 +++++----- .../update_organisations_controller_spec.rb | 16 ++++++------- spec/models/client_spec.rb | 4 ++-- spec/rails_helper.rb | 2 +- .../create_organisation_spec.rb | 6 ++--- .../manage_organisation_spec.rb | 6 ++--- .../manage_registered_organisation_spec.rb | 6 ++--- .../api_validations/organisation_spec.rb | 6 ++--- ...organisation_additional_identifier_spec.rb | 6 ++--- .../api_validations/remove_scheme_spec.rb | 8 +++---- .../update_organisation_spec.rb | 6 ++--- .../additional_identifier_spec.rb | 4 ++-- .../services/find_that_charity/search_spec.rb | 4 ++-- ...eate_organisations_mock_controller_spec.rb | 8 +++---- 29 files changed, 99 insertions(+), 100 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index c62e7c36..b908c16f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,6 +2,7 @@ require: - rubocop-performance - rubocop-rails - rubocop-rspec # or rubocop-minitest + - rubocop-factory_bot AllCops: NewCops: enable Exclude: @@ -76,7 +77,7 @@ Metrics/AbcSize: Layout/LineLength: Max: 120 Enabled: false - IgnoredPatterns: + AllowedPatterns: - 'it .* do$' - 'context .* do$' - 'scenario .* do$' diff --git a/CF/manifest-template.yml b/CF/manifest-template.yml index f5bf4a39..4bd797f6 100644 --- a/CF/manifest-template.yml +++ b/CF/manifest-template.yml @@ -3,7 +3,7 @@ applications: - name: conclave-cii-CF_SPACE memory: SET_MEMORY buildpacks: - - https://github.com/cloudfoundry/ruby-buildpack.git#v1.8.42 + - https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.2 instances: 1 random-route: true routes: diff --git a/app/services/authorize/user.rb b/app/services/authorize/user.rb index c05d6e28..49a913cd 100644 --- a/app/services/authorize/user.rb +++ b/app/services/authorize/user.rb @@ -41,7 +41,6 @@ def validate_service_eligibility_user ApiValidations::ApiErrorValidationResponse.new(:user_access_unauthorized) unless decoded_token[0]['roles'].include?(ENV['ACCESS_MANAGE_SUBSCRIPTIONS']) end - # rubocop:disable Style/GuardClause def validate_service_eligibility_or_ccs_admin_user decoded_token = validate_and_decode_token if decoded_token[0]['roles'].include?(ENV.fetch('ACCESS_ORGANISATION_ADMIN', nil)) && decoded_token[0]['roles'].exclude?(ENV.fetch('ACCESS_MANAGE_SUBSCRIPTIONS', nil)) @@ -54,7 +53,6 @@ def validate_service_eligibility_or_ccs_admin_user ApiValidations::ApiErrorValidationResponse.new(:user_access_unauthorized) end - # rubocop:enable Style/GuardClause def access_to_hidden_identifiers decoded_token = Common::ApiHelper.decode_token(request.headers) diff --git a/app/services/common/api_helper.rb b/app/services/common/api_helper.rb index fffeea0c..c41bea64 100644 --- a/app/services/common/api_helper.rb +++ b/app/services/common/api_helper.rb @@ -28,18 +28,18 @@ def self.add_nic(charity_number) end def self.filter_charity_number(charity_number, scheme_id) - charity_number = Common::ApiHelper.add_nic(charity_number) if Common::AdditionalIdentifier::SCHEME_NORTHEN_IRELAND_CHARITY == scheme_id - charity_number = Common::ApiHelper.add_sc(charity_number) if Common::AdditionalIdentifier::SCHEME_SCOTISH_CHARITY == scheme_id + charity_number = Common::ApiHelper.add_nic(charity_number) if scheme_id == Common::AdditionalIdentifier::SCHEME_NORTHEN_IRELAND_CHARITY + charity_number = Common::ApiHelper.add_sc(charity_number) if scheme_id == Common::AdditionalIdentifier::SCHEME_SCOTISH_CHARITY charity_number end def self.filter_sc(charity_number, scheme_id) - charity_number = Common::ApiHelper.add_sc(charity_number) if Common::AdditionalIdentifier::SCHEME_SCOTISH_CHARITY == scheme_id + charity_number = Common::ApiHelper.add_sc(charity_number) if scheme_id == Common::AdditionalIdentifier::SCHEME_SCOTISH_CHARITY charity_number end def self.clean_charity_number(charity_number, scheme_id) - charity_number = Common::ApiHelper.remove_nic(charity_number) if Common::AdditionalIdentifier::SCHEME_NORTHEN_IRELAND_CHARITY == scheme_id + charity_number = Common::ApiHelper.remove_nic(charity_number) if scheme_id == Common::AdditionalIdentifier::SCHEME_NORTHEN_IRELAND_CHARITY Common::ApiHelper.filter_sc(charity_number, scheme_id) end diff --git a/app/services/find_that_charity/search.rb b/app/services/find_that_charity/search.rb index afdca50a..935ec51e 100644 --- a/app/services/find_that_charity/search.rb +++ b/app/services/find_that_charity/search.rb @@ -64,8 +64,8 @@ def name end def filter_charity_number(charity_number, scheme_id) - charity_number = Common::ApiHelper.remove_nic(charity_number) if Common::AdditionalIdentifier::SCHEME_NORTHEN_IRELAND_CHARITY == scheme_id - charity_number = Common::ApiHelper.add_sc(charity_number) if Common::AdditionalIdentifier::SCHEME_SCOTISH_CHARITY == scheme_id + charity_number = Common::ApiHelper.remove_nic(charity_number) if scheme_id == Common::AdditionalIdentifier::SCHEME_NORTHEN_IRELAND_CHARITY + charity_number = Common::ApiHelper.add_sc(charity_number) if scheme_id == Common::AdditionalIdentifier::SCHEME_SCOTISH_CHARITY charity_number end diff --git a/app/services/mocking_service/api_duns_coh_stub.rb b/app/services/mocking_service/api_duns_coh_stub.rb index c2887e24..5559dd40 100644 --- a/app/services/mocking_service/api_duns_coh_stub.rb +++ b/app/services/mocking_service/api_duns_coh_stub.rb @@ -32,8 +32,8 @@ def stub_token_headers { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'Content-Type'=>'application/json', - 'User-Agent'=>'Faraday v1.10.3' + 'Content-Type' => 'application/json', + 'User-Agent' => 'Faraday v1.10.3' } end diff --git a/app/services/mocking_service/api_stub.rb b/app/services/mocking_service/api_stub.rb index cabcd757..0010e345 100644 --- a/app/services/mocking_service/api_stub.rb +++ b/app/services/mocking_service/api_stub.rb @@ -33,7 +33,7 @@ def stub_token_headers { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', - 'Authorization'=>'Basic bndmaWViZmlid2VpYmZ1ZXdiZmJ1ZXdiZnVld3U6d2RvaWVvaWVmZW93aWZvZXdvZmppb2Vyd2Y=', + 'Authorization' => 'Basic bndmaWViZmlid2VpYmZ1ZXdiZmJ1ZXdiZnVld3U6d2RvaWVvaWVmZW93aWZvZXdvZmppb2Vyd2Y=', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v1.10.3' } diff --git a/spec/controllers/api/v1/all_registered_organisations_schemes_controller_spec.rb b/spec/controllers/api/v1/all_registered_organisations_schemes_controller_spec.rb index 4851c4c9..1c09af79 100644 --- a/spec/controllers/api/v1/all_registered_organisations_schemes_controller_spec.rb +++ b/spec/controllers/api/v1/all_registered_organisations_schemes_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe Api::V1::AllRegisteredOrganisationsSchemesController, type: :controller do +RSpec.describe Api::V1::AllRegisteredOrganisationsSchemesController do describe 'search_organisation' do let(:clientid) { ENV.fetch('CLIENT_ID', nil) } let(:ccs_org_id) { nil } @@ -22,13 +22,13 @@ context 'when authorized' do before do - client_registered = FactoryBot.create :client + client_registered = create(:client) request.headers['x-api-key'] = client_registered.api_key request.headers['Authorization'] = "Bearer #{jwt_token}" end context 'when success' do - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier) } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier) } let(:ccs_org_id) { organisation_scheme_identifier.ccs_org_id.to_s } it 'returns 200' do diff --git a/spec/controllers/api/v1/create_organisations_controller_spec.rb b/spec/controllers/api/v1/create_organisations_controller_spec.rb index 247ecc66..239aa1cd 100644 --- a/spec/controllers/api/v1/create_organisations_controller_spec.rb +++ b/spec/controllers/api/v1/create_organisations_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe Api::V1::CreateOrganisationsController, type: :controller do +RSpec.describe Api::V1::CreateOrganisationsController do describe 'index' do let(:clientid) { ENV.fetch('CLIENT_ID', nil) } let(:organisation_id) { nil } @@ -9,7 +9,7 @@ context 'when success' do before do MockingService::MockApis.new - client_registered = FactoryBot.create :client + client_registered = create(:client) request.headers['x-api-key'] = client_registered.api_key request.headers['Authorization'] = "Bearer #{jwt_token}" end @@ -18,7 +18,7 @@ it 'create primary record' do param_post_dand_b = { identifier: { scheme: 'US-DUN', id: '404123456' } } post :index, params: param_post_dand_b - expect(response.status).to eq(201) + expect(response).to have_http_status(:created) expect(response.body).to include('organisationId') end @@ -26,7 +26,7 @@ param_post_dand_b = { identifier: { scheme: 'US-DUN', id: '505123456' } } param_post_dand_b[:additional_identifiers] = [{ scheme: 'GB-COH', id: '09012345' }] post :index, params: param_post_dand_b - expect(response.status).to eq(201) + expect(response).to have_http_status(:created) expect(response.body).to include('organisationId') end end @@ -35,7 +35,7 @@ it 'create primary record Companies house' do param_post_companies_house = { identifier: { scheme: 'GB-COH', id: '07612345' } } post :index, params: param_post_companies_house - expect(response.status).to eq(201) + expect(response).to have_http_status(:created) expect(response.body).to include('organisationId') end end @@ -44,7 +44,7 @@ it 'create primary record NHS' do param_post_companies_house = { identifier: { scheme: 'GB-NHS', id: '111111111' } } post :index, params: param_post_companies_house - expect(response.status).to eq(201) + expect(response).to have_http_status(:created) expect(response.body).to include('organisationId') end end @@ -53,7 +53,7 @@ it 'create primary record NHS' do param_post_companies_house = { identifier: { scheme: 'SF-ID', id: '111111111' } } post :index, params: param_post_companies_house - expect(response.status).to eq(201) + expect(response).to have_http_status(:created) expect(response.body).to include('organisationId') end end @@ -62,7 +62,7 @@ it 'create primary record NHS' do param_post_companies_house = { identifier: { scheme: 'US-DUN', id: '111111111' } } post :index, params: param_post_companies_house - expect(response.status).to eq(201) + expect(response).to have_http_status(:created) expect(response.body).to include('organisationId') end end @@ -71,7 +71,7 @@ it 'returns 404' do param_post_companies_house = { identifier: { scheme: 'US-DN', id: '111111111' } } post :index, params: param_post_companies_house - expect(response.status).to eq(404) + expect(response).to have_http_status(:not_found) end end @@ -79,7 +79,7 @@ it 'create primary record Charities' do param_find_that_charity = { identifier: { scheme: 'GB-CHC', id: '1012345' } } post :index, params: param_find_that_charity - expect(response.status).to eq(201) + expect(response).to have_http_status(:created) expect(response.body).to include('organisationId') end end diff --git a/spec/controllers/api/v1/data_migration_controller_spec.rb b/spec/controllers/api/v1/data_migration_controller_spec.rb index 3b4ed7db..a4cfb8f4 100644 --- a/spec/controllers/api/v1/data_migration_controller_spec.rb +++ b/spec/controllers/api/v1/data_migration_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe Api::V1::DataMigrationController, type: :controller do +RSpec.describe Api::V1::DataMigrationController do describe 'create_org_profile' do let(:ccs_org_id) { nil } let(:jwt_token) { JWT.encode({ roles: '', ciiOrgId: ccs_org_id, aud: ENV.fetch('CLIENT_ID', nil) }, 'test') } diff --git a/spec/controllers/api/v1/manage_organisations_controller_spec.rb b/spec/controllers/api/v1/manage_organisations_controller_spec.rb index f2bc86ce..755196c0 100644 --- a/spec/controllers/api/v1/manage_organisations_controller_spec.rb +++ b/spec/controllers/api/v1/manage_organisations_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe Api::V1::ManageOrganisationsController, type: :controller do +RSpec.describe Api::V1::ManageOrganisationsController do describe 'search_organisation' do let(:clientid) { ENV.fetch('CLIENT_ID', nil) } let(:ccs_org_id) { nil } @@ -8,8 +8,8 @@ context 'when authorized' do let(:ccs_org_id) { '101123' } - let(:scheme_register) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } + let(:scheme_register) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } let(:response_body) do { id: 'GB-CHC-101123', @@ -68,7 +68,7 @@ end before do - client_registered = FactoryBot.create :client + client_registered = create(:client) request.headers['x-api-key'] = client_registered.api_key request.headers['Authorization'] = "Bearer #{jwt_token}" stub_request(:post, "http://www.test.com/security/tokens/validation?client-id=#{clientid}") diff --git a/spec/controllers/api/v1/organisations_controller_spec.rb b/spec/controllers/api/v1/organisations_controller_spec.rb index 89992812..6898d677 100644 --- a/spec/controllers/api/v1/organisations_controller_spec.rb +++ b/spec/controllers/api/v1/organisations_controller_spec.rb @@ -1,63 +1,63 @@ require 'rails_helper' -RSpec.describe Api::V1::OrganisationsController, type: :controller do +RSpec.describe Api::V1::OrganisationsController do describe 'search_organisation' do context 'when authorized' do before do MockingService::MockApis.new - client_registered = FactoryBot.create :client + client_registered = create(:client) request.headers['x-api-key'] = client_registered.api_key end describe '#search' do it 'search companies house' do get :search_organisation, params: { scheme: 'GB-COH', id: '02012345' } - expect(response.status).to eq(200) + expect(response).to have_http_status(:ok) end it 'search D and B' do get :search_organisation, params: { scheme: 'US-DUN', id: '606123456' } - expect(response.status).to eq(200) + expect(response).to have_http_status(:ok) end it 'search Find that charity' do get :search_organisation, params: { scheme: 'GB-CHC', id: '222123' } - expect(response.status).to eq(200) + expect(response).to have_http_status(:ok) end it 'search Find the duns test identifier US-DUN-1111....' do get :search_organisation, params: { scheme: 'GB-COH', id: '111111111' } - expect(response.status).to eq(200) + expect(response).to have_http_status(:ok) end it 'search Find the duns test identifier SF-ID-1111....' do get :search_organisation, params: { scheme: 'SF-ID', id: '111111111' } - expect(response.status).to eq(200) + expect(response).to have_http_status(:ok) end it 'search Find the duns test identifier SF-URN-1111....' do get :search_organisation, params: { scheme: 'SF-URN', id: '111111111' } - expect(response.status).to eq(200) + expect(response).to have_http_status(:ok) end it 'search Find the companies house test identifier GB-COH-1111....' do get :search_organisation, params: { scheme: 'US-DUN', id: '111111111' } - expect(response.status).to eq(200) + expect(response).to have_http_status(:ok) end it 'search nhs' do get :search_organisation, params: { scheme: 'GB-NHS', id: 'A23' } - expect(response.status).to eq(200) + expect(response).to have_http_status(:ok) end it 'search invalid params' do get :search_organisation, params: { scheme: 'INVALID', id: '12345' } - expect(response.status).to eq(404) + expect(response).to have_http_status(:not_found) end it 'search no params' do get :search_organisation, params: { scheme: '', id: '' } - expect(response.status).to eq(400) + expect(response).to have_http_status(:bad_request) end end end diff --git a/spec/controllers/api/v1/registered_organisations_schemes_controller_spec.rb b/spec/controllers/api/v1/registered_organisations_schemes_controller_spec.rb index be7382fe..c2e490ac 100644 --- a/spec/controllers/api/v1/registered_organisations_schemes_controller_spec.rb +++ b/spec/controllers/api/v1/registered_organisations_schemes_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe Api::V1::RegisteredOrganisationsSchemesController, type: :controller do +RSpec.describe Api::V1::RegisteredOrganisationsSchemesController do describe 'search_organisation' do let(:clientid) { ENV.fetch('CLIENT_ID', nil) } let(:ccs_org_id) { nil } @@ -8,7 +8,7 @@ context 'when authorized' do before do - client_registered = FactoryBot.create :client + client_registered = create(:client) request.headers['x-api-key'] = client_registered.api_key request.headers['Authorization'] = "Bearer #{jwt_token}" stub_request(:post, "http://www.test.com/security/tokens/validation?client-id=#{clientid}") @@ -25,7 +25,7 @@ end context 'when success' do - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier) } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier) } let(:ccs_org_id) { organisation_scheme_identifier.ccs_org_id.to_s } it 'returns 200' do diff --git a/spec/controllers/api/v1/remove_organisations_additional_identifier_controller_spec.rb b/spec/controllers/api/v1/remove_organisations_additional_identifier_controller_spec.rb index 4486cc04..23be1614 100644 --- a/spec/controllers/api/v1/remove_organisations_additional_identifier_controller_spec.rb +++ b/spec/controllers/api/v1/remove_organisations_additional_identifier_controller_spec.rb @@ -1,16 +1,16 @@ require 'rails_helper' -RSpec.describe Api::V1::RemoveOrganisationsAdditionalIdentifierController, type: :controller do +RSpec.describe Api::V1::RemoveOrganisationsAdditionalIdentifierController do describe 'delete_additional_identifier' do context 'when authenticated' do let(:clientid) { ENV.fetch('CLIENT_ID', nil) } let(:ccs_org_id) { nil } let(:jwt_token) { JWT.encode({ roles: ENV.fetch('ACCESS_ORGANISATION_ADMIN', nil), ciiOrgId: ccs_org_id, aud: ENV.fetch('CLIENT_ID', nil) }, 'test') } - let(:scheme_register) { FactoryBot.create(:scheme_register) } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, scheme_org_reg_number: ccs_org_id, scheme_code: scheme_register.scheme_register_code, ccs_org_id: ccs_org_id, primary_scheme: false) } + let(:scheme_register) { create(:scheme_register) } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, scheme_org_reg_number: ccs_org_id, scheme_code: scheme_register.scheme_register_code, ccs_org_id: ccs_org_id, primary_scheme: false) } before do - client_registered = FactoryBot.create :client + client_registered = create(:client) request.headers['x-api-key'] = client_registered.api_key request.headers['Authorization'] = "Bearer #{jwt_token}" stub_request(:post, "http://www.test.com/security/tokens/validation?client-id=#{clientid}") diff --git a/spec/controllers/api/v1/remove_organisations_controller_spec.rb b/spec/controllers/api/v1/remove_organisations_controller_spec.rb index 857cc394..8aeb01e8 100644 --- a/spec/controllers/api/v1/remove_organisations_controller_spec.rb +++ b/spec/controllers/api/v1/remove_organisations_controller_spec.rb @@ -1,10 +1,10 @@ require 'rails_helper' -RSpec.describe Api::V1::RemoveOrganisationsController, type: :controller do +RSpec.describe Api::V1::RemoveOrganisationsController do describe 'delete_organisation' do context 'when authorized' do - let(:scheme_register) { FactoryBot.create(:scheme_register) } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, scheme_org_reg_number: ccs_org_id, scheme_code: scheme_register.scheme_register_code, ccs_org_id: ccs_org_id) } + let(:scheme_register) { create(:scheme_register) } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, scheme_org_reg_number: ccs_org_id, scheme_code: scheme_register.scheme_register_code, ccs_org_id: ccs_org_id) } before do request.headers['x-api-key'] = '6348G438RT834GR4827GRO834G8G348RO8238' diff --git a/spec/controllers/api/v1/schemes_controller_spec.rb b/spec/controllers/api/v1/schemes_controller_spec.rb index 33942ec6..cf2c666d 100644 --- a/spec/controllers/api/v1/schemes_controller_spec.rb +++ b/spec/controllers/api/v1/schemes_controller_spec.rb @@ -1,34 +1,34 @@ require 'rails_helper' -RSpec.describe Api::V1::SchemesController, type: :controller do +RSpec.describe Api::V1::SchemesController do describe 'get' do context 'when authorized' do before do - client_registered = FactoryBot.create :client + client_registered = create(:client) request.headers['x-api-key'] = client_registered.api_key end describe 'GET schemes' do it 'has a 200 status code' do get :schemes - expect(response.status).to eq(200) + expect(response).to have_http_status(:ok) end it 'Has scheme' do get :schemes - result = JSON.parse(response.body) + result = response.parsed_body expect(result[0]).to include('scheme') end it 'Has scheme_name' do get :schemes - result = JSON.parse(response.body) + result = response.parsed_body expect(result[0]).to include('scheme_name') end it 'Has scheme_country_code' do get :schemes - result = JSON.parse(response.body) + result = response.parsed_body expect(result[0]).to include('scheme_country_code') end end diff --git a/spec/controllers/api/v1/update_organisations_controller_spec.rb b/spec/controllers/api/v1/update_organisations_controller_spec.rb index b02af622..771bf6bd 100644 --- a/spec/controllers/api/v1/update_organisations_controller_spec.rb +++ b/spec/controllers/api/v1/update_organisations_controller_spec.rb @@ -1,13 +1,13 @@ require 'rails_helper' -RSpec.describe Api::V1::UpdateOrganisationsController, type: :controller do +RSpec.describe Api::V1::UpdateOrganisationsController do describe 'index' do context 'when authorized' do let(:clientid) { ENV.fetch('CLIENT_ID', nil) } let(:ccs_org_id) { nil } let(:jwt_token) { JWT.encode({ roles: ENV.fetch('ACCESS_ORGANISATION_ADMIN', nil), ciiOrgId: ccs_org_id, aud: ENV.fetch('CLIENT_ID', nil) }, 'test') } - let(:scheme_register) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } + let(:scheme_register) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } let(:response_body) do { id: 'GB-CHC-101123', @@ -66,7 +66,7 @@ end before do - client_registered = FactoryBot.create :client + client_registered = create(:client) request.headers['x-api-key'] = client_registered.api_key request.headers['Authorization'] = "Bearer #{jwt_token}" stub_request(:post, "http://www.test.com/security/tokens/validation?client-id=#{clientid}") @@ -111,8 +111,8 @@ context 'when the first identifier cannot be found' do let(:ccs_org_id) { '101123' } let(:ccs_org_id_second) { '101122' } - let(:scheme_register_second) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier_second) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id_second, scheme_code: scheme_register_second.scheme_register_code) } + let(:scheme_register_second) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier_second) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id_second, scheme_code: scheme_register_second.scheme_register_code) } it 'returns 404' do put :index, params: { ccs_org_id: ccs_org_id, id: organisation_scheme_identifier_second.ccs_org_id, scheme: organisation_scheme_identifier_second.scheme_code, clientid: clientid } @@ -123,8 +123,8 @@ context 'when duplicate' do let(:ccs_org_id) { '101123' } let(:ccs_org_id_second) { '101122' } - let(:scheme_register_second) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier_second) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id_second, scheme_code: scheme_register_second.scheme_register_code, scheme_org_reg_number: ccs_org_id_second) } + let(:scheme_register_second) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier_second) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id_second, scheme_code: scheme_register_second.scheme_register_code, scheme_org_reg_number: ccs_org_id_second) } let(:response_body_second) do { id: "GB-CHC-#{ccs_org_id_second}", diff --git a/spec/models/client_spec.rb b/spec/models/client_spec.rb index 006a51cc..808a43b6 100644 --- a/spec/models/client_spec.rb +++ b/spec/models/client_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' -RSpec.describe Client, type: :model do - let(:client_registered) { FactoryBot.create :client } +RSpec.describe Client do + let(:client_registered) { create(:client) } let(:client_result) { described_class.find(client_registered.id) } describe 'Registered Client' do diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 4925ced3..98170e8a 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -33,7 +33,7 @@ end RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - config.fixture_path = "#{::Rails.root}/spec/fixtures" + config.fixture_path = "#{Rails.root}/spec/fixtures" # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false diff --git a/spec/services/api_validations/create_organisation_spec.rb b/spec/services/api_validations/create_organisation_spec.rb index a7f24606..531e0f45 100644 --- a/spec/services/api_validations/create_organisation_spec.rb +++ b/spec/services/api_validations/create_organisation_spec.rb @@ -3,15 +3,15 @@ RSpec.describe ApiValidations::CreateOrganisation, type: :model do describe 'validations' do let(:ccs_org_id) { '101123' } - let(:scheme_register) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } + let(:scheme_register) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } let(:organisation_params) { { id: organisation_scheme_identifier.ccs_org_id, scheme: scheme_register.scheme_register_code } } describe 'identifier' do context 'when present' do it 'is valid' do validator = described_class.new({ identifier: organisation_params, 'identifier' => organisation_params }) - expect(validator.valid?).to eq true + expect(validator.valid?).to be true end end diff --git a/spec/services/api_validations/manage_organisation_spec.rb b/spec/services/api_validations/manage_organisation_spec.rb index 2fae969f..3bee172b 100644 --- a/spec/services/api_validations/manage_organisation_spec.rb +++ b/spec/services/api_validations/manage_organisation_spec.rb @@ -3,12 +3,12 @@ RSpec.describe ApiValidations::ManageOrganisation, type: :model do describe 'validations' do let(:ccs_org_id) { '101123' } - let(:scheme_register) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code, scheme_org_reg_number: ccs_org_id) } + let(:scheme_register) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code, scheme_org_reg_number: ccs_org_id) } context 'when all params are present' do it 'is valid' do - expect(described_class.new({ id: organisation_scheme_identifier.ccs_org_id, scheme: scheme_register.scheme_register_code, ccs_org_id: organisation_scheme_identifier.ccs_org_id }).valid?).to eq true + expect(described_class.new({ id: organisation_scheme_identifier.ccs_org_id, scheme: scheme_register.scheme_register_code, ccs_org_id: organisation_scheme_identifier.ccs_org_id }).valid?).to be true end end diff --git a/spec/services/api_validations/manage_registered_organisation_spec.rb b/spec/services/api_validations/manage_registered_organisation_spec.rb index d8c956c8..24586089 100644 --- a/spec/services/api_validations/manage_registered_organisation_spec.rb +++ b/spec/services/api_validations/manage_registered_organisation_spec.rb @@ -3,13 +3,13 @@ RSpec.describe ApiValidations::ManageRegisteredOrganisation, type: :model do describe 'validations' do let(:ccs_org_id) { '101123' } - let(:scheme_register) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } + let(:scheme_register) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } let(:organisation_params) { { id: organisation_scheme_identifier.ccs_org_id, scheme: scheme_register.scheme_register_code } } context 'when ccs_org_id is present' do it 'is valid' do - expect(described_class.new({ identifier: organisation_params, 'identifier' => organisation_params, ccs_org_id: organisation_scheme_identifier.ccs_org_id }).valid?).to eq true + expect(described_class.new({ identifier: organisation_params, 'identifier' => organisation_params, ccs_org_id: organisation_scheme_identifier.ccs_org_id }).valid?).to be true end end diff --git a/spec/services/api_validations/organisation_spec.rb b/spec/services/api_validations/organisation_spec.rb index de17a3bb..1c1f3e01 100644 --- a/spec/services/api_validations/organisation_spec.rb +++ b/spec/services/api_validations/organisation_spec.rb @@ -3,13 +3,13 @@ RSpec.describe ApiValidations::Organisation, type: :model do describe 'validations' do let(:ccs_org_id) { '101123' } - let(:scheme_register) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } + let(:scheme_register) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } let(:organisation_params) { { scheme: 'GB-COH', id: '125656234' } } context 'when organisation is present' do it 'is valid' do - expect(described_class.new({ organisation: [organisation_params], 'organisation' => [organisation_params] }).valid?).to eq true + expect(described_class.new({ organisation: [organisation_params], 'organisation' => [organisation_params] }).valid?).to be true end end diff --git a/spec/services/api_validations/remove_organisation_additional_identifier_spec.rb b/spec/services/api_validations/remove_organisation_additional_identifier_spec.rb index 6e1f52a5..d25f4c61 100644 --- a/spec/services/api_validations/remove_organisation_additional_identifier_spec.rb +++ b/spec/services/api_validations/remove_organisation_additional_identifier_spec.rb @@ -3,13 +3,13 @@ RSpec.describe ApiValidations::RemoveOrganisationAdditionalIdentifier, type: :model do describe 'validations' do let(:ccs_org_id) { '101123' } - let(:scheme_register) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code, scheme_org_reg_number: ccs_org_id) } + let(:scheme_register) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code, scheme_org_reg_number: ccs_org_id) } let(:organisation_params) { { id: organisation_scheme_identifier.ccs_org_id, scheme: scheme_register.scheme_register_code } } context 'when all params are present' do it 'is valid' do - expect(described_class.new({ id: 24325263, scheme: 'GB-COH', ccs_org_id: organisation_scheme_identifier.ccs_org_id }).valid?).to eq true + expect(described_class.new({ id: 24325263, scheme: 'GB-COH', ccs_org_id: organisation_scheme_identifier.ccs_org_id }).valid?).to be true end end diff --git a/spec/services/api_validations/remove_scheme_spec.rb b/spec/services/api_validations/remove_scheme_spec.rb index f05e035d..79ec8041 100644 --- a/spec/services/api_validations/remove_scheme_spec.rb +++ b/spec/services/api_validations/remove_scheme_spec.rb @@ -3,13 +3,13 @@ RSpec.describe ApiValidations::RemoveScheme, type: :model do describe 'validations' do let(:ccs_org_id) { '101123' } - let(:scheme_register) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code, scheme_org_reg_number: ccs_org_id) } + let(:scheme_register) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code, scheme_org_reg_number: ccs_org_id) } let(:organisation_params) { { id: organisation_scheme_identifier.ccs_org_id, scheme: scheme_register.scheme_register_code } } context 'when all params are present' do it 'is valid' do - expect(described_class.new({ id: organisation_scheme_identifier.scheme_org_reg_number, scheme: scheme_register.scheme_register_code }).valid?).to eq true + expect(described_class.new({ id: organisation_scheme_identifier.scheme_org_reg_number, scheme: scheme_register.scheme_register_code }).valid?).to be true end end @@ -27,7 +27,7 @@ context 'when id is missing' do it 'is valid' do - expect(described_class.new({ scheme: scheme_register.scheme_register_code }).valid?).to eq true + expect(described_class.new({ scheme: scheme_register.scheme_register_code }).valid?).to be true end end end diff --git a/spec/services/api_validations/update_organisation_spec.rb b/spec/services/api_validations/update_organisation_spec.rb index d819a44b..f2976c4e 100644 --- a/spec/services/api_validations/update_organisation_spec.rb +++ b/spec/services/api_validations/update_organisation_spec.rb @@ -3,13 +3,13 @@ RSpec.describe ApiValidations::UpdateOrganisation, type: :model do describe 'validations' do let(:ccs_org_id) { '101123' } - let(:scheme_register) { FactoryBot.create(:scheme_register, scheme_register_code: 'GB-CHC') } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code, scheme_org_reg_number: ccs_org_id) } + let(:scheme_register) { create(:scheme_register, scheme_register_code: 'GB-CHC') } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code, scheme_org_reg_number: ccs_org_id) } let(:organisation_params) { { id: organisation_scheme_identifier.ccs_org_id, scheme: scheme_register.scheme_register_code } } context 'when all params are present' do it 'is valid' do - expect(described_class.new({ id: organisation_scheme_identifier.ccs_org_id, scheme: scheme_register.scheme_register_code, ccs_org_id: organisation_scheme_identifier.ccs_org_id }).valid?).to eq true + expect(described_class.new({ id: organisation_scheme_identifier.ccs_org_id, scheme: scheme_register.scheme_register_code, ccs_org_id: organisation_scheme_identifier.ccs_org_id }).valid?).to be true end end diff --git a/spec/services/find_that_charity/additional_identifier_spec.rb b/spec/services/find_that_charity/additional_identifier_spec.rb index acb6c11e..6bb2a1b9 100644 --- a/spec/services/find_that_charity/additional_identifier_spec.rb +++ b/spec/services/find_that_charity/additional_identifier_spec.rb @@ -2,8 +2,8 @@ RSpec.describe FindThatCharity::AdditionalIdentifier, type: :model do let(:ccs_org_id) { '101123' } - let(:scheme_register) { FactoryBot.create(:scheme_register) } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } + let(:scheme_register) { create(:scheme_register) } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } let(:response_body) do { id: 'GB-CHC-101123', diff --git a/spec/services/find_that_charity/search_spec.rb b/spec/services/find_that_charity/search_spec.rb index b9526c70..c640fe81 100644 --- a/spec/services/find_that_charity/search_spec.rb +++ b/spec/services/find_that_charity/search_spec.rb @@ -2,8 +2,8 @@ RSpec.describe FindThatCharity::Search, type: :model do let(:ccs_org_id) { '101123' } - let(:scheme_register) { FactoryBot.create(:scheme_register) } - let(:organisation_scheme_identifier) { FactoryBot.create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } + let(:scheme_register) { create(:scheme_register) } + let(:organisation_scheme_identifier) { create(:organisation_scheme_identifier, ccs_org_id: ccs_org_id, scheme_code: scheme_register.scheme_register_code) } let(:response_body) do { id: 'GB-CHC-101123', diff --git a/spec/stubs/create_organisations_mock_controller_spec.rb b/spec/stubs/create_organisations_mock_controller_spec.rb index de2739a4..986247ef 100644 --- a/spec/stubs/create_organisations_mock_controller_spec.rb +++ b/spec/stubs/create_organisations_mock_controller_spec.rb @@ -35,7 +35,7 @@ def test_expectation(get_response, response) end def request_get_headers - client_registered = FactoryBot.create :client + client_registered = create(:client) { 'x-api-key' => client_registered.api_key, 'CONTENT_TYPE' => 'application/json', @@ -44,12 +44,12 @@ def request_get_headers end def request_post_headers - client_registered = FactoryBot.create :client + client_registered = create(:client) { 'x-api-key' => client_registered.api_key, } end - # rubocop:disable RSpec/NoExpectationExample + # rubocop:disable RSpec/NoExpectationExample Dir.each_child('spec/stub_response/api_stubs') do |filename| describe 'Test mock services includes salesforce mock' do it filename do @@ -64,5 +64,5 @@ def request_post_headers end end end - # rubocop:enable RSpec/NoExpectationExample + # rubocop:enable RSpec/NoExpectationExample end From 5d595d4ca7524b480846dfd0612c4b57a6083b18 Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Thu, 15 Jun 2023 17:57:38 +0100 Subject: [PATCH 11/20] Update rails_helper.rb --- spec/rails_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 98170e8a..e58993ac 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -33,7 +33,7 @@ end RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - config.fixture_path = "#{Rails.root}/spec/fixtures" + config.fixture_path = Rails.root.join('/spec/fixtures') # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false From cf695a7653b3939c53e800571acd703108a583ab Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Mon, 19 Jun 2023 07:36:32 +0100 Subject: [PATCH 12/20] Update manifest-template.yml --- CF/manifest-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CF/manifest-template.yml b/CF/manifest-template.yml index 4bd797f6..b372a1ef 100644 --- a/CF/manifest-template.yml +++ b/CF/manifest-template.yml @@ -3,7 +3,7 @@ applications: - name: conclave-cii-CF_SPACE memory: SET_MEMORY buildpacks: - - https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.2 + - https://github.com/cloudfoundry/ruby-buildpack.git#v1.8.60 instances: 1 random-route: true routes: From df1654e7648c18186caf22196f3205185dd96265 Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Mon, 19 Jun 2023 07:47:50 +0100 Subject: [PATCH 13/20] Update manifest-template.yml --- CF/manifest-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CF/manifest-template.yml b/CF/manifest-template.yml index b372a1ef..294501c3 100644 --- a/CF/manifest-template.yml +++ b/CF/manifest-template.yml @@ -3,7 +3,7 @@ applications: - name: conclave-cii-CF_SPACE memory: SET_MEMORY buildpacks: - - https://github.com/cloudfoundry/ruby-buildpack.git#v1.8.60 + - https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.0 instances: 1 random-route: true routes: From 3899b1bd9f8f17d94c7aa6972abccef6ed75388c Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Mon, 19 Jun 2023 07:58:01 +0100 Subject: [PATCH 14/20] Update Gemfile.lock --- Gemfile.lock | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb5c91cf..65004352 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,13 +73,13 @@ GEM public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.776.0) - aws-sdk-core (3.174.0) + aws-partitions (1.780.0) + aws-sdk-core (3.175.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ssm (1.151.0) + aws-sdk-ssm (1.152.0) aws-sdk-core (~> 3, >= 3.174.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.5.2) @@ -174,7 +174,7 @@ GEM terminal-table (>= 1.5.1) jmespath (1.6.2) json (2.6.3) - jwt (2.7.0) + jwt (2.7.1) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -189,11 +189,11 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.18.0) + minitest (5.18.1) msgpack (1.7.1) multi_json (1.15.0) multipart-post (2.3.0) - net-imap (0.3.4) + net-imap (0.3.6) date net-protocol net-pop (0.1.2) @@ -209,8 +209,9 @@ GEM multi_json rails (>= 4.0) parallel (1.23.0) - parser (3.2.2.1) + parser (3.2.2.3) ast (~> 2.4.1) + racc path_expander (1.1.1) pg (1.5.3) pry (0.14.2) @@ -221,7 +222,7 @@ GEM public_suffix (5.0.1) puma (4.3.12) nio4r (~> 2.0) - racc (1.6.2) + racc (1.7.1) rack (2.2.7) rack-cors (2.0.1) rack (>= 2.0.0) @@ -273,7 +274,7 @@ GEM redis-store (>= 1.3, < 2) redis-client (0.14.1) connection_pool - redis-namespace (1.10.0) + redis-namespace (1.11.0) redis (>= 4) redis-rack (2.1.4) rack (>= 2.0.8, < 3) @@ -284,7 +285,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.2) redis (>= 4, < 6) - regexp_parser (2.8.0) + regexp_parser (2.8.1) rexml (3.2.5) rgeo (3.0.0) rgeo-activerecord (7.0.1) @@ -308,10 +309,10 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.0) - rubocop (1.52.0) + rubocop (1.52.1) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) @@ -327,7 +328,7 @@ GEM rubocop-performance (1.18.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.19.1) + rubocop-rails (2.20.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) From 3d9162fa4c2bd48fb8115cffded0d28a632211ac Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Mon, 19 Jun 2023 20:44:41 +0100 Subject: [PATCH 15/20] Update Gemfile.lock --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 65004352..162eb4de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,7 +153,7 @@ GEM faraday (>= 1.0) faraday_middleware graphql-client - graphql (2.0.22) + graphql (2.0.23) graphql-client (0.18.0) activesupport (>= 3.0) graphql @@ -328,7 +328,7 @@ GEM rubocop-performance (1.18.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.20.0) + rubocop-rails (2.20.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) From c2c3e84fc5991f2438de87dc6cb1889fc2930aad Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Mon, 19 Jun 2023 21:21:28 +0100 Subject: [PATCH 16/20] Update Gemfile.lock --- Gemfile.lock | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 162eb4de..63d56aa6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -367,6 +367,8 @@ GEM PLATFORMS x86_64-darwin-21 + ruby + x86_64-linux DEPENDENCIES activerecord-postgis-adapter (>= 6.0.1) From aa2272610a386775b213e321889d8b786e2d4066 Mon Sep 17 00:00:00 2001 From: mohammed Aziz Date: Fri, 23 Jun 2023 02:02:12 +0100 Subject: [PATCH 17/20] Update search.rb --- app/services/dfe/search.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/services/dfe/search.rb b/app/services/dfe/search.rb index a74fd96e..80a37b96 100644 --- a/app/services/dfe/search.rb +++ b/app/services/dfe/search.rb @@ -14,7 +14,8 @@ def initialize(organisation_code) def fetch_results post_access_token unless access_token_check - resp = Faraday.get("#{ENV.fetch('DFE_URL', nil)}/establishment/#{@organisation_code}?subscription-key=true") do |req| + conn = Common::ApiHelper.faraday_new(url: ENV.fetch('DFE_URL', nil)) + resp = conn.get("#{ENV.fetch('DFE_URL', nil)}/establishment/#{@organisation_code}?subscription-key=true") do |req| req.headers['Authorization'] = "Bearer #{ENV.fetch('DFE_ACCESS_TOKEN', nil)}" req.headers['Ocp-Apim-Subscription-Key'] = ENV.fetch('DFE_SUBSCRIPTION_KEY', nil) end From 270b0cdde1f800474d06c386cb4337e7a18ebef0 Mon Sep 17 00:00:00 2001 From: "@tberey" Date: Thu, 29 Jun 2023 12:27:38 +0100 Subject: [PATCH 18/20] PPG-344-Remove-Address-And-Contact-From-Responses --- app/controllers/api/v1/manage_organisations_controller.rb | 2 +- app/controllers/api/v1/organisations_controller.rb | 2 +- .../api/v1/registered_organisations_schemes_controller.rb | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/controllers/api/v1/manage_organisations_controller.rb b/app/controllers/api/v1/manage_organisations_controller.rb index 36697711..b18e6b37 100644 --- a/app/controllers/api/v1/manage_organisations_controller.rb +++ b/app/controllers/api/v1/manage_organisations_controller.rb @@ -9,7 +9,7 @@ class ManageOrganisationsController < ActionController::API before_action :validate_params def search_organisation - scheme_result = api_result + scheme_result = api_result.except(:address, :contactPoint) # While PPON is being developed, we want any related CII functionality to be inaccessible temporarily. if scheme_result.blank? || params[:scheme].upcase == Common::AdditionalIdentifier::SCHEME_PPON render json: '', status: :not_found diff --git a/app/controllers/api/v1/organisations_controller.rb b/app/controllers/api/v1/organisations_controller.rb index 16f1c210..d84a46ca 100644 --- a/app/controllers/api/v1/organisations_controller.rb +++ b/app/controllers/api/v1/organisations_controller.rb @@ -7,7 +7,7 @@ class OrganisationsController < ActionController::API before_action :validate_params def search_organisation - scheme_result = api_result + scheme_result = api_result.except(:address, :contactPoint) # While PPON is being developed, we want any related CII functionality to be inaccessible temporarily. if scheme_result.blank? || params[:scheme].upcase == Common::AdditionalIdentifier::SCHEME_PPON render json: '', status: :not_found diff --git a/app/controllers/api/v1/registered_organisations_schemes_controller.rb b/app/controllers/api/v1/registered_organisations_schemes_controller.rb index 420f2921..80edd308 100644 --- a/app/controllers/api/v1/registered_organisations_schemes_controller.rb +++ b/app/controllers/api/v1/registered_organisations_schemes_controller.rb @@ -12,7 +12,7 @@ def search_organisation result = Common::RegisteredOrganisationResponse.new(params[:ccs_org_id], hidden: access_to_hidden_identifiers).response_payload if params[:ccs_org_id] if result.present? - render json: build_response(result), status: :ok + render json: result[0], status: :ok else render json: '', status: :not_found end @@ -26,12 +26,6 @@ def search_organisation_by_scheme return result[:ccs_org_id] if result.present? && result[:ccs_org_id].present? && !result['hidden'] end - def build_response(result) - api_result = SearchApi.new(result[0][:identifier][:id], result[0][:identifier][:scheme], address_lookup: true).call - result[0][:address] = Common::AddressHelper.new(api_result).build_response - result[0] - end - def validate_params return validate_scheme if params[:ccs_org_id].include? '-' From a4a03087faa893eadb38ed85c1b766a4e926121e Mon Sep 17 00:00:00 2001 From: "@tberey" Date: Thu, 29 Jun 2023 12:49:02 +0100 Subject: [PATCH 19/20] PPG-344-Remove-Address-And-Contact-From-Responses --- app/controllers/api/v1/organisations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/organisations_controller.rb b/app/controllers/api/v1/organisations_controller.rb index d84a46ca..16f1c210 100644 --- a/app/controllers/api/v1/organisations_controller.rb +++ b/app/controllers/api/v1/organisations_controller.rb @@ -7,7 +7,7 @@ class OrganisationsController < ActionController::API before_action :validate_params def search_organisation - scheme_result = api_result.except(:address, :contactPoint) + scheme_result = api_result # While PPON is being developed, we want any related CII functionality to be inaccessible temporarily. if scheme_result.blank? || params[:scheme].upcase == Common::AdditionalIdentifier::SCHEME_PPON render json: '', status: :not_found From d7eae3df880bd5be0a5db106274cc6df0feeae24 Mon Sep 17 00:00:00 2001 From: "@tberey" Date: Fri, 30 Jun 2023 13:47:48 +0100 Subject: [PATCH 20/20] PPG-344-Add-Address-Back-Into-Incorrect-Endpoint --- app/controllers/api/v1/manage_organisations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/manage_organisations_controller.rb b/app/controllers/api/v1/manage_organisations_controller.rb index b18e6b37..36697711 100644 --- a/app/controllers/api/v1/manage_organisations_controller.rb +++ b/app/controllers/api/v1/manage_organisations_controller.rb @@ -9,7 +9,7 @@ class ManageOrganisationsController < ActionController::API before_action :validate_params def search_organisation - scheme_result = api_result.except(:address, :contactPoint) + scheme_result = api_result # While PPON is being developed, we want any related CII functionality to be inaccessible temporarily. if scheme_result.blank? || params[:scheme].upcase == Common::AdditionalIdentifier::SCHEME_PPON render json: '', status: :not_found