diff --git a/CHANGELOG.md b/CHANGELOG.md index d3eadea17b..27316bf333 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ * [#2299](https://github.com/ruby-grape/grape/pull/2299): Fix, do not use kwargs for empty args - [@dm1try](https://github.com/dm1try). * [#2307](https://github.com/ruby-grape/grape/pull/2307): Fixed autoloading of InvalidValue - [@fixlr](https://github.com/fixlr). +* [#23015](https://github.com/ruby-grape/grape/pull/2315): Update rspec - [@ericproulx](https://github.com/ericproulx). * Your contribution here. ### 1.7.0 (2022/12/20) diff --git a/Gemfile b/Gemfile index def07ccb82..04fbe2dce2 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/multi_json.gemfile b/gemfiles/multi_json.gemfile index 21297849b1..571e0f7ea6 100644 --- a/gemfiles/multi_json.gemfile +++ b/gemfiles/multi_json.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/multi_xml.gemfile b/gemfiles/multi_xml.gemfile index 6462798189..a91918f2c0 100644 --- a/gemfiles/multi_xml.gemfile +++ b/gemfiles/multi_xml.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/rack_1_0.gemfile b/gemfiles/rack_1_0.gemfile index e084f894fb..85f666bcbb 100644 --- a/gemfiles/rack_1_0.gemfile +++ b/gemfiles/rack_1_0.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/rack_2_0.gemfile b/gemfiles/rack_2_0.gemfile index 228c407ed7..fc6a14a9cb 100644 --- a/gemfiles/rack_2_0.gemfile +++ b/gemfiles/rack_2_0.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/rack_3_0.gemfile b/gemfiles/rack_3_0.gemfile index 61498f7b3e..d3f24250ae 100644 --- a/gemfiles/rack_3_0.gemfile +++ b/gemfiles/rack_3_0.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/rack_edge.gemfile b/gemfiles/rack_edge.gemfile index aaa3b46717..0720896450 100644 --- a/gemfiles/rack_edge.gemfile +++ b/gemfiles/rack_edge.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index 61ef8e192e..5fa2e2955a 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile index b4e3d1d56c..27d0b5d595 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_6_0.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index 673ec317d3..55bc916cd3 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile index c9260e4674..b7cfc5cbff 100644 --- a/gemfiles/rails_7_0.gemfile +++ b/gemfiles/rails_7_0.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0' diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index 3614288d11..5bc6138fc2 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -32,7 +32,7 @@ group :test do gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' gem 'rack-test', '< 2.1' - gem 'rspec', '~> 3.11.0' + gem 'rspec', '< 4' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' gem 'simplecov-lcov', '~> 0.8.0'