From cdb8316584d1bbb6e839ae726acb593b7264e61c Mon Sep 17 00:00:00 2001 From: duffn <3457341+duffn@users.noreply.github.com> Date: Mon, 20 Mar 2023 09:44:08 -0600 Subject: [PATCH] Fix tests by pinning rack-test to < 2.1 (#2311) * Pin rack-test to < 2.1 * Fix Rubocop violation * Update CHANGELOG --- CHANGELOG.md | 1 + Gemfile | 2 +- gemfiles/multi_json.gemfile | 2 +- gemfiles/multi_xml.gemfile | 2 +- gemfiles/rack_1_0.gemfile | 2 +- gemfiles/rack_2_0.gemfile | 2 +- gemfiles/rack_3_0.gemfile | 2 +- gemfiles/rack_edge.gemfile | 2 +- gemfiles/rails_5_2.gemfile | 2 +- gemfiles/rails_6_0.gemfile | 2 +- gemfiles/rails_6_1.gemfile | 2 +- gemfiles/rails_7_0.gemfile | 2 +- gemfiles/rails_edge.gemfile | 2 +- spec/grape/validations_spec.rb | 12 ++++++------ 14 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 946d59e12d..64fc42ac05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * [#2302](https://github.com/ruby-grape/grape/pull/2302): Rack < 3 and update rack-test - [@ericproulx](https://github.com/ericproulx). * [#2303](https://github.com/ruby-grape/grape/pull/2302): Rack >= 1.3.0 - [@ericproulx](https://github.com/ericproulx). * [#2301](https://github.com/ruby-grape/grape/pull/2301): Revisit GH workflows - [@ericproulx](https://github.com/ericproulx). +* [#2311](https://github.com/ruby-grape/grape/pull/2311): Fix tests by pinning rack-test to < 2.1 - [@duffn](https://github.com/duffn). * Your contribution here. #### Fixes diff --git a/Gemfile b/Gemfile index 7e7aef6a36..def07ccb82 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/multi_json.gemfile b/gemfiles/multi_json.gemfile index f306bc020a..21297849b1 100644 --- a/gemfiles/multi_json.gemfile +++ b/gemfiles/multi_json.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/multi_xml.gemfile b/gemfiles/multi_xml.gemfile index f43c7b8c27..6462798189 100644 --- a/gemfiles/multi_xml.gemfile +++ b/gemfiles/multi_xml.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/rack_1_0.gemfile b/gemfiles/rack_1_0.gemfile index 647416e596..e084f894fb 100644 --- a/gemfiles/rack_1_0.gemfile +++ b/gemfiles/rack_1_0.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/rack_2_0.gemfile b/gemfiles/rack_2_0.gemfile index c12cd1fcec..228c407ed7 100644 --- a/gemfiles/rack_2_0.gemfile +++ b/gemfiles/rack_2_0.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/rack_3_0.gemfile b/gemfiles/rack_3_0.gemfile index b4d53aee8e..61498f7b3e 100644 --- a/gemfiles/rack_3_0.gemfile +++ b/gemfiles/rack_3_0.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/rack_edge.gemfile b/gemfiles/rack_edge.gemfile index 137848ded0..aaa3b46717 100644 --- a/gemfiles/rack_edge.gemfile +++ b/gemfiles/rack_edge.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index 75cc1ebe90..61ef8e192e 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile index a07b203b50..b4e3d1d56c 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_6_0.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index 2f62e71306..673ec317d3 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile index ce8b6256dd..c9260e4674 100644 --- a/gemfiles/rails_7_0.gemfile +++ b/gemfiles/rails_7_0.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index 50d8260d0b..3614288d11 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -31,7 +31,7 @@ group :test do gem 'maruku' gem 'mime-types' gem 'rack-jsonp', require: 'rack/jsonp' - gem 'rack-test' + gem 'rack-test', '< 2.1' gem 'rspec', '~> 3.11.0' gem 'ruby-grape-danger', '~> 0.2.0', require: false gem 'simplecov', '~> 0.21.2' diff --git a/spec/grape/validations_spec.rb b/spec/grape/validations_spec.rb index 0a34232541..7e2ae9bc93 100644 --- a/spec/grape/validations_spec.rb +++ b/spec/grape/validations_spec.rb @@ -1071,12 +1071,12 @@ def validate_param!(attr_name, params) } # debugger get '/multi_level', data - expect(last_response.body.split(', ')).to match_array([ - 'top[3][top_id] is empty', - 'top[2][middle_1][0][middle_1_id] is empty', - 'top[1][middle_1][1][middle_2][0][middle_2_id] is empty', - 'top[0][middle_1][1][middle_2][1][bottom][0][bottom_id] is empty' - ]) + expect(last_response.body.split(', ')).to contain_exactly( + 'top[3][top_id] is empty', + 'top[2][middle_1][0][middle_1_id] is empty', + 'top[1][middle_1][1][middle_2][0][middle_2_id] is empty', + 'top[0][middle_1][1][middle_2][1][bottom][0][bottom_id] is empty' + ) expect(last_response.status).to eq(400) end end