From 8e0c0bc8bbacde57b5843bc18779766fe308957b Mon Sep 17 00:00:00 2001 From: vitalie Date: Thu, 29 Dec 2022 21:08:56 +0200 Subject: [PATCH 1/2] Fix specs --- Gemfile.lock | 2 +- spec/v3/services/installation/find_spec.rb | 1 + spec/v3/services/organization/find_spec.rb | 6 ++++-- .../organizations/for_current_user_spec.rb | 3 ++- spec/v3/services/owner/find_spec.rb | 15 ++++++++++++--- spec/v3/services/user/find_spec.rb | 1 + .../services/v2_subscription/executions_spec.rb | 1 + 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2589b5bf32..2d07ff3358 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -325,7 +325,7 @@ GEM rb-fsevent (0.9.8) rb-inotify (0.10.1) ffi (~> 1.0) - rbtrace (0.4.12) + rbtrace (0.4.14) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) diff --git a/spec/v3/services/installation/find_spec.rb b/spec/v3/services/installation/find_spec.rb index 9462d0ba16..7db97f122f 100644 --- a/spec/v3/services/installation/find_spec.rb +++ b/spec/v3/services/installation/find_spec.rb @@ -62,6 +62,7 @@ "@type" => "allowance", "id" => 1 }, + "custom_keys" => [], "allow_migration" => false, "recently_signed_up" => false, "secure_user_hash" => nil, diff --git a/spec/v3/services/organization/find_spec.rb b/spec/v3/services/organization/find_spec.rb index f93bb1a5b3..fd62a9c60a 100644 --- a/spec/v3/services/organization/find_spec.rb +++ b/spec/v3/services/organization/find_spec.rb @@ -28,7 +28,8 @@ "@type" => "allowance", "@representation" => "minimal", "id" => org.id - } + }, + "custom_keys" => [] }} end @@ -63,7 +64,8 @@ "@type" => "allowance", "@representation" => "minimal", "id" => org.id - } + }, + "custom_keys" => [] }} end diff --git a/spec/v3/services/organizations/for_current_user_spec.rb b/spec/v3/services/organizations/for_current_user_spec.rb index b60480f37d..a554f7453d 100644 --- a/spec/v3/services/organizations/for_current_user_spec.rb +++ b/spec/v3/services/organizations/for_current_user_spec.rb @@ -64,7 +64,8 @@ "@type" => "allowance", "@representation" => "minimal", "id" => org.id - } + }, + "custom_keys" => [] }] }} end diff --git a/spec/v3/services/owner/find_spec.rb b/spec/v3/services/owner/find_spec.rb index ffc531639d..fed9efe7ce 100644 --- a/spec/v3/services/owner/find_spec.rb +++ b/spec/v3/services/owner/find_spec.rb @@ -28,7 +28,8 @@ "@type" => "allowance", "@representation" => "minimal", "id" => org.id - } + }, + "custom_keys" => [] }} end @@ -54,7 +55,8 @@ "@type" => "allowance", "@representation" => "minimal", "id" => org.id - } + }, + "custom_keys" => [] }} end @@ -86,6 +88,7 @@ "@representation" => "minimal", "id" => org.id }, + "custom_keys" => [], "repositories" => [{ "@type" => "repository", "@href" => "/v3/repo/#{repo.id}", @@ -232,7 +235,8 @@ "@type" => "allowance", "@representation" => "minimal", "id" => org.id - } + }, + "custom_keys" => [] }} end @@ -263,6 +267,7 @@ "@representation" => "minimal", "id" => org.id }, + "custom_keys" => [], "@warnings" => [{ "@type" => "warning", "message" => "query parameter organization.id not safelisted, ignored", @@ -302,6 +307,7 @@ "@representation" => "minimal", "id" => user.id }, + "custom_keys" => [], "recently_signed_up"=>false, "secure_user_hash" => nil, "ro_mode" => false, @@ -334,6 +340,7 @@ "@representation" => "minimal", "id" => user.id }, + "custom_keys" => [], "recently_signed_up"=>false, "secure_user_hash" => nil, "ro_mode" => false, @@ -366,6 +373,7 @@ "@representation" => "minimal", "id" => user.id }, + "custom_keys" => [], "recently_signed_up"=>false, "secure_user_hash" => nil, "ro_mode" => false, @@ -402,6 +410,7 @@ "@representation" => "minimal", "id" => user.id }, + "custom_keys" => [], "recently_signed_up"=>false, "secure_user_hash" => nil, "ro_mode" => false, diff --git a/spec/v3/services/user/find_spec.rb b/spec/v3/services/user/find_spec.rb index 5639d24680..b544918ccf 100644 --- a/spec/v3/services/user/find_spec.rb +++ b/spec/v3/services/user/find_spec.rb @@ -42,6 +42,7 @@ "@representation" => "minimal", "id" => user.id }, + "custom_keys" => [], "recently_signed_up"=>false, "secure_user_hash" => nil, "ro_mode" => false, diff --git a/spec/v3/services/v2_subscription/executions_spec.rb b/spec/v3/services/v2_subscription/executions_spec.rb index df5c5647ca..2a0d433435 100644 --- a/spec/v3/services/v2_subscription/executions_spec.rb +++ b/spec/v3/services/v2_subscription/executions_spec.rb @@ -175,6 +175,7 @@ "@representation"=>"minimal", "id"=>1 }, + "custom_keys" => [], "email"=>"sven@fuchs.com", "is_syncing"=>nil, "synced_at"=>nil, From ed3639f3ba06fc778c6a2ba1549f70d45f999475 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Dec 2022 19:14:07 +0000 Subject: [PATCH 2/2] Bump sinatra from 2.0.8.1 to 2.2.3 Bumps [sinatra](https://github.com/sinatra/sinatra) from 2.0.8.1 to 2.2.3. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v2.0.8.1...v2.2.3) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2d07ff3358..6200d8b8cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,7 +280,7 @@ GEM msgpack (1.3.3) multi_json (1.14.1) multipart-post (2.1.1) - mustermann (1.1.1) + mustermann (2.0.2) ruby2_keywords (~> 0.0.1) nakayoshi_fork (0.0.4) net-http-persistent (2.9.4) @@ -314,7 +314,7 @@ GEM rack (>= 1.0, < 3) rack-contrib (2.2.0) rack (~> 2.0) - rack-protection (2.0.8.1) + rack-protection (2.2.3) rack rack-ssl (1.4.1) rack @@ -358,7 +358,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.2) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.5) ruby_dep (1.5.0) safe_yaml (1.0.5) sentry-raven (2.11.3) @@ -379,23 +379,22 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) - sinatra (2.0.8.1) - mustermann (~> 1.0) - rack (~> 2.0) - rack-protection (= 2.0.8.1) + sinatra (2.2.3) + mustermann (~> 2.0) + rack (~> 2.2) + rack-protection (= 2.2.3) tilt (~> 2.0) - sinatra-contrib (2.0.8.1) - backports (>= 2.8.2) + sinatra-contrib (2.2.3) multi_json - mustermann (~> 1.0) - rack-protection (= 2.0.8.1) - sinatra (= 2.0.8.1) + mustermann (~> 2.0) + rack-protection (= 2.2.3) + sinatra (= 2.2.3) tilt (~> 2.0) stackdriver-core (1.4.0) google-cloud-core (~> 1.2) stackprof (0.2.15) thread_safe (0.3.6) - tilt (2.0.10) + tilt (2.0.11) timecop (0.9.1) tool (0.2.3) travis-rollout (0.0.2)