diff --git a/CHANGELOG.md b/CHANGELOG.md index daff0878c9..fac46396c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * [#2233](https://github.com/ruby-grape/grape/pull/2233): A setting for disabling documentation to internal APIs - [@dnesteryuk](https://github.com/dnesteryuk). * [#2235](https://github.com/ruby-grape/grape/pull/2235): Add Ruby 3.1 to CI - [@petergoldstein](https://github.com/petergoldstein). +* [#2248](https://github.com/ruby-grape/grape/pull/2248): Upgraded to rspec 3.11.0 - [@dblock](https://github.com/dblock). * Your contribution here. #### Fixes diff --git a/Gemfile b/Gemfile index 817c480f05..fd454c5c10 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/multi_json.gemfile b/gemfiles/multi_json.gemfile index dd4b9d665a..41d0bb5779 100644 --- a/gemfiles/multi_json.gemfile +++ b/gemfiles/multi_json.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/multi_xml.gemfile b/gemfiles/multi_xml.gemfile index b9cc8d1fcd..0326db003a 100644 --- a/gemfiles/multi_xml.gemfile +++ b/gemfiles/multi_xml.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/rack1.gemfile b/gemfiles/rack1.gemfile index b131bcb9c5..18e9ef895e 100644 --- a/gemfiles/rack1.gemfile +++ b/gemfiles/rack1.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/rack2.gemfile b/gemfiles/rack2.gemfile index 9f76c853d3..5605f69795 100644 --- a/gemfiles/rack2.gemfile +++ b/gemfiles/rack2.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/rack2_2.gemfile b/gemfiles/rack2_2.gemfile index a6770c2a5b..f28d30eb2c 100644 --- a/gemfiles/rack2_2.gemfile +++ b/gemfiles/rack2_2.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/rack_edge.gemfile b/gemfiles/rack_edge.gemfile index c2c1a11e0b..06294aba77 100644 --- a/gemfiles/rack_edge.gemfile +++ b/gemfiles/rack_edge.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index 3dfffb2003..b28b0b140d 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index f3569fa447..c910592fee 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index fe695232dc..11b8eb07e7 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index eb4f037ac5..411424527b 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index f2d8584af3..69ab1ee2fd 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -33,7 +33,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '~> 1.1.0' - gem 'rspec', '~> 3.9.0' + gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'test-prof', require: false end diff --git a/spec/grape/dsl/request_response_spec.rb b/spec/grape/dsl/request_response_spec.rb index e2fb5f798b..8546ace00b 100644 --- a/spec/grape/dsl/request_response_spec.rb +++ b/spec/grape/dsl/request_response_spec.rb @@ -160,34 +160,34 @@ def self.imbue(key, value) describe 'list of exceptions is passed' do it 'sets hash of exceptions as rescue handlers' do - expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, StandardError => nil) + expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, { StandardError => nil }) expect(subject).to receive(:namespace_stackable).with(:rescue_options, {}) subject.rescue_from StandardError end it 'rescues only base handlers if rescue_subclasses: false option is passed' do - expect(subject).to receive(:namespace_reverse_stackable).with(:base_only_rescue_handlers, StandardError => nil) - expect(subject).to receive(:namespace_stackable).with(:rescue_options, rescue_subclasses: false) + expect(subject).to receive(:namespace_reverse_stackable).with(:base_only_rescue_handlers, { StandardError => nil }) + expect(subject).to receive(:namespace_stackable).with(:rescue_options, { rescue_subclasses: false }) subject.rescue_from StandardError, rescue_subclasses: false end it 'sets given proc as rescue handler for each key in hash' do rescue_handler_proc = proc {} - expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, StandardError => rescue_handler_proc) + expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, { StandardError => rescue_handler_proc }) expect(subject).to receive(:namespace_stackable).with(:rescue_options, {}) subject.rescue_from StandardError, rescue_handler_proc end it 'sets given block as rescue handler for each key in hash' do rescue_handler_proc = proc {} - expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, StandardError => rescue_handler_proc) + expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, { StandardError => rescue_handler_proc }) expect(subject).to receive(:namespace_stackable).with(:rescue_options, {}) subject.rescue_from StandardError, &rescue_handler_proc end it 'sets a rescue handler declared through :with option for each key in hash' do with_block = -> { 'hello' } - expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, StandardError => an_instance_of(Proc)) + expect(subject).to receive(:namespace_reverse_stackable).with(:rescue_handlers, { StandardError => an_instance_of(Proc) }) expect(subject).to receive(:namespace_stackable).with(:rescue_options, {}) subject.rescue_from StandardError, with: with_block end diff --git a/spec/grape/dsl/routing_spec.rb b/spec/grape/dsl/routing_spec.rb index 0695e4c455..8812b05bd4 100644 --- a/spec/grape/dsl/routing_spec.rb +++ b/spec/grape/dsl/routing_spec.rb @@ -19,7 +19,7 @@ class Dummy it 'sets a version for route' do version = 'v1' expect(subject).to receive(:namespace_inheritable).with(:version, [version]) - expect(subject).to receive(:namespace_inheritable).with(:version_options, using: :path) + expect(subject).to receive(:namespace_inheritable).with(:version_options, { using: :path }) expect(subject.version(version)).to eq(version) end end