From 8369031477a34e9019335ba12e5105a1770f03a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:02:37 +0000 Subject: [PATCH 1/2] build(deps-dev): bump rspec-rails from 6.1.4 to 7.0.1 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.4 to 7.0.1. - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.4...v7.0.1) --- updated-dependencies: - dependency-name: rspec-rails dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index da497e14a31..740f98b4710 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,7 @@ group :test do gem 'rspec-collection_matchers' gem 'rspec-instafail' gem 'rspec-its' - gem 'rspec-rails', '~> 6.1.4' + gem 'rspec-rails', '~> 7.0.1' gem 'rspec-wait' gem 'rubocop', '~> 1.66.1' gem 'rubocop-capybara' diff --git a/Gemfile.lock b/Gemfile.lock index 7f23e452345..8b05270aacd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -441,9 +441,9 @@ GEM rspec-mocks (~> 3.13.0) rspec-collection_matchers (1.2.1) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.13.0) + rspec-core (3.13.1) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-instafail (1.0.0) @@ -454,10 +454,10 @@ GEM rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.4) - actionpack (>= 6.1) - activesupport (>= 6.1) - railties (>= 6.1) + rspec-rails (7.0.1) + actionpack (>= 7.0) + activesupport (>= 7.0) + railties (>= 7.0) rspec-core (~> 3.13) rspec-expectations (~> 3.13) rspec-mocks (~> 3.13) @@ -563,7 +563,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.3.1) + thor (1.3.2) tilt (2.3.0) timecop (0.9.10) timeliness (0.4.5) @@ -584,7 +584,7 @@ GEM rexml yajl-ruby (1.4.3) yard (0.9.36) - zeitwerk (2.6.17) + zeitwerk (2.6.18) PLATFORMS ruby @@ -653,7 +653,7 @@ DEPENDENCIES rspec-collection_matchers rspec-instafail rspec-its - rspec-rails (~> 6.1.4) + rspec-rails (~> 7.0.1) rspec-wait rspec_api_documentation (>= 6.1.0) rubocop (~> 1.66.1) From 4e6030e410cc9fd83f520a8b4496d0633d3546b5 Mon Sep 17 00:00:00 2001 From: "M. Oleske" Date: Fri, 1 Nov 2024 20:32:17 -0700 Subject: [PATCH 2/2] Resolve `include() is not supported, please supply an argument` by moving the expected value to the same line as the word include --- .../controllers/runtime/routes_controller_spec.rb | 3 +-- .../services/service_instances_controller_spec.rb | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/spec/unit/controllers/runtime/routes_controller_spec.rb b/spec/unit/controllers/runtime/routes_controller_spec.rb index 86e7b8a6c02..d47d8e654d8 100644 --- a/spec/unit/controllers/runtime/routes_controller_spec.rb +++ b/spec/unit/controllers/runtime/routes_controller_spec.rb @@ -244,8 +244,7 @@ module VCAP::CloudController expect(last_response).to have_status_code 400 expect(last_response.body).to include 'AssociationNotEmpty' - expect(last_response.body).to include - 'Please delete the service_instance associations for your routes' + expect(last_response.body).to include 'Please delete the service_instance associations for your routes' end end end diff --git a/spec/unit/controllers/services/service_instances_controller_spec.rb b/spec/unit/controllers/services/service_instances_controller_spec.rb index 6de3d78a1ae..7b9481e5a18 100644 --- a/spec/unit/controllers/services/service_instances_controller_spec.rb +++ b/spec/unit/controllers/services/service_instances_controller_spec.rb @@ -2926,8 +2926,7 @@ def stub_delete_and_return(status, body) expect(last_response).to have_status_code 400 expect(last_response.body).to include 'AssociationNotEmpty' - expect(last_response.body).to include - 'Please delete the service_bindings, service_keys, and routes associations for your service_instances' + expect(last_response.body).to include 'Please delete the service_bindings, service_keys, and routes associations for your service_instances' end context 'and recursive=true' do @@ -3019,8 +3018,7 @@ def stub_delete_and_return(status, body) expect(last_response).to have_status_code 400 expect(last_response.body).to include 'AssociationNotEmpty' - expect(last_response.body).to include - 'Please delete the service_bindings, service_keys, and routes associations for your service_instances' + expect(last_response.body).to include 'Please delete the service_bindings, service_keys, and routes associations for your service_instances' end end @@ -3053,8 +3051,7 @@ def stub_delete_and_return(status, body) expect(last_response).to have_status_code 400 expect(last_response.body).to include 'AssociationNotEmpty' - expect(last_response.body).to include - 'Please delete the service_bindings, service_keys, and routes associations for your service_instances' + expect(last_response.body).to include 'Please delete the service_bindings, service_keys, and routes associations for your service_instances' end end @@ -3698,8 +3695,7 @@ def stub_delete_and_return(status, body) expect(last_response).to have_status_code 400 expect(last_response.body).to include 'AssociationNotEmpty' - expect(last_response.body).to include - 'Please delete the service_bindings, service_keys, and routes associations for your service_instances' + expect(last_response.body).to include 'Please delete the service_bindings, service_keys, and routes associations for your service_instances' end context 'when recursive=true' do