Skip to content

Commit cdb8316

Browse files
authored
Fix tests by pinning rack-test to < 2.1 (#2311)
* Pin rack-test to < 2.1 * Fix Rubocop violation * Update CHANGELOG
1 parent 7cbf0b9 commit cdb8316

14 files changed

+19
-18
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* [#2302](https://github.com/ruby-grape/grape/pull/2302): Rack < 3 and update rack-test - [@ericproulx](https://github.com/ericproulx).
99
* [#2303](https://github.com/ruby-grape/grape/pull/2302): Rack >= 1.3.0 - [@ericproulx](https://github.com/ericproulx).
1010
* [#2301](https://github.com/ruby-grape/grape/pull/2301): Revisit GH workflows - [@ericproulx](https://github.com/ericproulx).
11+
* [#2311](https://github.com/ruby-grape/grape/pull/2311): Fix tests by pinning rack-test to < 2.1 - [@duffn](https://github.com/duffn).
1112
* Your contribution here.
1213

1314
#### Fixes

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/multi_json.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/multi_xml.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/rack_1_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/rack_2_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/rack_3_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/rack_edge.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/rails_5_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/rails_6_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/rails_6_1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/rails_7_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

gemfiles/rails_edge.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group :test do
3131
gem 'maruku'
3232
gem 'mime-types'
3333
gem 'rack-jsonp', require: 'rack/jsonp'
34-
gem 'rack-test'
34+
gem 'rack-test', '< 2.1'
3535
gem 'rspec', '~> 3.11.0'
3636
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3737
gem 'simplecov', '~> 0.21.2'

spec/grape/validations_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,12 +1071,12 @@ def validate_param!(attr_name, params)
10711071
}
10721072
# debugger
10731073
get '/multi_level', data
1074-
expect(last_response.body.split(', ')).to match_array([
1075-
'top[3][top_id] is empty',
1076-
'top[2][middle_1][0][middle_1_id] is empty',
1077-
'top[1][middle_1][1][middle_2][0][middle_2_id] is empty',
1078-
'top[0][middle_1][1][middle_2][1][bottom][0][bottom_id] is empty'
1079-
])
1074+
expect(last_response.body.split(', ')).to contain_exactly(
1075+
'top[3][top_id] is empty',
1076+
'top[2][middle_1][0][middle_1_id] is empty',
1077+
'top[1][middle_1][1][middle_2][0][middle_2_id] is empty',
1078+
'top[0][middle_1][1][middle_2][1][bottom][0][bottom_id] is empty'
1079+
)
10801080
expect(last_response.status).to eq(400)
10811081
end
10821082
end

0 commit comments

Comments
 (0)