Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears that there are some breaking changes introduced with this major version release. I will create a ticket to perform a proper code upgrade.

gem 'rspec-wait'
gem 'rubocop', '~> 1.66.1'
gem 'rubocop-capybara'
Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions spec/unit/controllers/runtime/routes_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down