From 022a642dcfd9f9bde7a01c42abcc3700085275c6 Mon Sep 17 00:00:00 2001
From: darren987469 <darren987469@gmail.com>
Date: Sat, 3 Nov 2018 09:11:51 +0800
Subject: [PATCH] Update rack from 1.5.2 to 1.5.5

---
 .travis.yml                                         | 6 +++---
 gemfiles/{rack_1.5.2.gemfile => rack_1.5.5.gemfile} | 2 +-
 spec/grape/integration/rack_spec.rb                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename gemfiles/{rack_1.5.2.gemfile => rack_1.5.5.gemfile} (97%)

diff --git a/.travis.yml b/.travis.yml
index 68430a18fc..1d56c6e906 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
     - rvm: 2.5.3
       gemfile: gemfiles/rack_edge.gemfile
     - rvm: 2.5.3
-      gemfile: gemfiles/rack_1.5.2.gemfile
+      gemfile: gemfiles/rack_1.5.5.gemfile
     - rvm: 2.5.3
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.5.3
@@ -32,7 +32,7 @@ matrix:
     - rvm: 2.4.5
       gemfile: gemfiles/rack_edge.gemfile
     - rvm: 2.4.5
-      gemfile: gemfiles/rack_1.5.2.gemfile
+      gemfile: gemfiles/rack_1.5.5.gemfile
     - rvm: 2.4.5
       gemfile: gemfiles/rails_5.gemfile
     - rvm: 2.3.8
@@ -40,7 +40,7 @@ matrix:
     - rvm: 2.3.8
       gemfile: gemfiles/rack_edge.gemfile
     - rvm: 2.3.8
-      gemfile: gemfiles/rack_1.5.2.gemfile
+      gemfile: gemfiles/rack_1.5.5.gemfile
     - rvm: 2.3.8
       gemfile: gemfiles/rails_5.gemfile
     - rvm: 2.2.10
diff --git a/gemfiles/rack_1.5.2.gemfile b/gemfiles/rack_1.5.5.gemfile
similarity index 97%
rename from gemfiles/rack_1.5.2.gemfile
rename to gemfiles/rack_1.5.5.gemfile
index a9b955f017..d7cdf495fd 100644
--- a/gemfiles/rack_1.5.2.gemfile
+++ b/gemfiles/rack_1.5.5.gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'rack', '1.5.2'
+gem 'rack', '1.5.5'
 
 group :development, :test do
   gem 'bundler'
diff --git a/spec/grape/integration/rack_spec.rb b/spec/grape/integration/rack_spec.rb
index e7c9f56659..e4b82a4897 100644
--- a/spec/grape/integration/rack_spec.rb
+++ b/spec/grape/integration/rack_spec.rb
@@ -22,7 +22,7 @@
       unless RUBY_PLATFORM == 'java'
         major, minor, patch = Rack.release.split('.').map(&:to_i)
         patch ||= 0 # rack <= 1.5.2 does not specify patch version
-        pending 'Rack 1.5.3 or 1.6.1 required' unless major >= 2 || (major >= 1 && ((minor == 5 && patch >= 3) || (minor >= 6)))
+        pending 'Rack 1.5.5 or 1.6.1 required' unless major >= 2 || (major >= 1 && ((minor == 5 && patch >= 5) || (minor >= 6)))
       end
 
       expect(JSON.parse(app.call(env)[2].body.first)['params_keys']).to match_array('test')