From 4a3d016192f5809d30f86a12483f83440be4bdba Mon Sep 17 00:00:00 2001 From: ashkan18 Date: Wed, 12 Jul 2017 21:37:20 -0400 Subject: [PATCH 1/3] #1656: Update specs after upgrading rack-test to 0.7.0 --- Gemfile | 2 +- spec/grape/validations_spec.rb | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index ff8ad4de9..409031850 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ end group :test do gem 'grape-entity', '~> 0.6' gem 'maruku' - gem 'rack-test', '~> 0.6.3' + gem 'rack-test', '~> 0.7.0' gem 'rspec', '~> 3.0' gem 'cookiejar' gem 'rack-jsonp', require: 'rack/jsonp' diff --git a/spec/grape/validations_spec.rb b/spec/grape/validations_spec.rb index 2c5e90e58..b1e685985 100644 --- a/spec/grape/validations_spec.rb +++ b/spec/grape/validations_spec.rb @@ -535,12 +535,12 @@ def validate_param!(attr_name, params) it 'handle errors for all array elements' do get '/within_array', children: [ - { name: 'Jim', parents: [] }, + { name: 'Jim' }, { name: 'Job', parents: [] } ] expect(last_response.status).to eq(400) - expect(last_response.body).to eq('children[0][parents] is missing, children[1][parents] is missing') + expect(last_response.body).to eq('children[0][parents] is missing, children[1][parents][0][name] is missing') end it 'safely handles empty arrays and blank parameters' do @@ -548,7 +548,8 @@ def validate_param!(attr_name, params) # should actually return 200, since an empty array is valid. get '/within_array', children: [] expect(last_response.status).to eq(400) - expect(last_response.body).to eq('children is missing') + expect(last_response.body).to eq('children[0][name] is missing, children[0][parents] is missing, '\ + 'children[0][parents] is invalid, children[0][parents][0][name] is missing, children[0][parents][0][name] is empty') get '/within_array', children: [name: 'Jay'] expect(last_response.status).to eq(400) expect(last_response.body).to eq('children[0][parents] is missing') From e377f0ed3d2b10366e5cedb2d05901fbf031676c Mon Sep 17 00:00:00 2001 From: ashkan18 Date: Wed, 12 Jul 2017 21:41:18 -0400 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81e93a4be..af551e280 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ #### Features * Your contribution here. +* [#1658](https://github.com/ruby-grape/grape/pull/1658): Update `rack-test` to `0.7.0` and fix failing specs - [@ashkan18](https://github.com/ashkan18). * [#1652](https://github.com/ruby-grape/grape/pull/1652): Add the original exception to the error_formatter the original exception - [@dcsg](https://github.com/dcsg). #### Fixes From 879493ac8cd2cbc571a931491fbe264debbf693f Mon Sep 17 00:00:00 2001 From: ashkan18 Date: Thu, 13 Jul 2017 08:38:51 -0400 Subject: [PATCH 3/3] Code review comment: regenerate appraisal --- CHANGELOG.md | 2 +- gemfiles/multi_json.gemfile | 2 +- gemfiles/multi_xml.gemfile | 2 +- gemfiles/rack_1.5.2.gemfile | 2 +- gemfiles/rack_edge.gemfile | 2 +- gemfiles/rails_3.gemfile | 2 +- gemfiles/rails_4.gemfile | 2 +- gemfiles/rails_5.gemfile | 2 +- gemfiles/rails_edge.gemfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af551e280..f0667ae6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ #### Features * Your contribution here. -* [#1658](https://github.com/ruby-grape/grape/pull/1658): Update `rack-test` to `0.7.0` and fix failing specs - [@ashkan18](https://github.com/ashkan18). +* [#1658](https://github.com/ruby-grape/grape/pull/1658): Update `rack-test` to `0.7.0` - [@ashkan18](https://github.com/ashkan18). * [#1652](https://github.com/ruby-grape/grape/pull/1652): Add the original exception to the error_formatter the original exception - [@dcsg](https://github.com/dcsg). #### Fixes diff --git a/gemfiles/multi_json.gemfile b/gemfiles/multi_json.gemfile index d2abcdff8..6f230cbb5 100644 --- a/gemfiles/multi_json.gemfile +++ b/gemfiles/multi_json.gemfile @@ -24,7 +24,7 @@ end group :test do gem 'grape-entity', '~> 0.6' gem 'maruku' - gem 'rack-test', '~> 0.6.3' + gem 'rack-test', '~> 0.7.0' gem 'rspec', '~> 3.0' gem 'cookiejar' gem 'rack-jsonp', require: 'rack/jsonp' diff --git a/gemfiles/multi_xml.gemfile b/gemfiles/multi_xml.gemfile index 69d112458..90c8ebe08 100644 --- a/gemfiles/multi_xml.gemfile +++ b/gemfiles/multi_xml.gemfile @@ -24,7 +24,7 @@ end group :test do gem 'grape-entity', '~> 0.6' gem 'maruku' - gem 'rack-test', '~> 0.6.3' + gem 'rack-test', '~> 0.7.0' gem 'rspec', '~> 3.0' gem 'cookiejar' gem 'rack-jsonp', require: 'rack/jsonp' diff --git a/gemfiles/rack_1.5.2.gemfile b/gemfiles/rack_1.5.2.gemfile index fb4036075..9e10efa6c 100644 --- a/gemfiles/rack_1.5.2.gemfile +++ b/gemfiles/rack_1.5.2.gemfile @@ -24,7 +24,7 @@ end group :test do gem 'grape-entity', '~> 0.6' gem 'maruku' - gem 'rack-test', '~> 0.6.3' + gem 'rack-test', '~> 0.7.0' gem 'rspec', '~> 3.0' gem 'cookiejar' gem 'rack-jsonp', require: 'rack/jsonp' diff --git a/gemfiles/rack_edge.gemfile b/gemfiles/rack_edge.gemfile index fa76907fb..0026216f8 100644 --- a/gemfiles/rack_edge.gemfile +++ b/gemfiles/rack_edge.gemfile @@ -24,7 +24,7 @@ end group :test do gem 'grape-entity', '~> 0.6' gem 'maruku' - gem 'rack-test', '~> 0.6.3' + gem 'rack-test', '~> 0.7.0' gem 'rspec', '~> 3.0' gem 'cookiejar' gem 'rack-jsonp', require: 'rack/jsonp' diff --git a/gemfiles/rails_3.gemfile b/gemfiles/rails_3.gemfile index fb43932b8..75aa4782c 100644 --- a/gemfiles/rails_3.gemfile +++ b/gemfiles/rails_3.gemfile @@ -25,7 +25,7 @@ end group :test do gem 'grape-entity', '~> 0.6' gem 'maruku' - gem 'rack-test', '~> 0.6.3' + gem 'rack-test', '~> 0.7.0' gem 'rspec', '~> 3.0' gem 'cookiejar' gem 'rack-jsonp', require: 'rack/jsonp' diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile index c3a6eeead..be14af354 100644 --- a/gemfiles/rails_4.gemfile +++ b/gemfiles/rails_4.gemfile @@ -24,7 +24,7 @@ end group :test do gem 'grape-entity', '~> 0.6' gem 'maruku' - gem 'rack-test', '~> 0.6.3' + gem 'rack-test', '~> 0.7.0' gem 'rspec', '~> 3.0' gem 'cookiejar' gem 'rack-jsonp', require: 'rack/jsonp' diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index 7f6bfc0bf..4c0cf8617 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -24,7 +24,7 @@ end group :test do gem 'grape-entity', '~> 0.6' gem 'maruku' - gem 'rack-test', '~> 0.6.3' + gem 'rack-test', '~> 0.7.0' gem 'rspec', '~> 3.0' gem 'cookiejar' gem 'rack-jsonp', require: 'rack/jsonp' diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index f693f8521..f21746719 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -24,7 +24,7 @@ end group :test do gem 'grape-entity', '~> 0.6' gem 'maruku' - gem 'rack-test', '~> 0.6.3' + gem 'rack-test', '~> 0.7.0' gem 'rspec', '~> 3.0' gem 'cookiejar' gem 'rack-jsonp', require: 'rack/jsonp'