Merge pull request #1104 from dm1try/fix_spec_for_rack_152_dependency

fix spec for rack 1.5.2 dependency

Author: dblock

.travis.yml

@@ -18,3 +18,4 @@ gemfile:
   - Gemfile
   - gemfiles/rails_3.gemfile
   - gemfiles/rails_4.gemfile
+  - gemfiles/rack_1.5.2.gemfile

Appraisals

@@ -5,3 +5,7 @@ end
 appraise "rails-4" do
   gem "rails", "4.1.6"
 end
+
+appraise "rack-1.5.2" do
+  gem "rack", "1.5.2"
+end

gemfiles/rack_1.5.2.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'rack', '1.5.2'
+
+group :development, :test do
+  gem 'rubocop', '~> 0.31.0'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+end
+
+gemspec :path => '../'

spec/grape/integration/rack_spec.rb

@@ -20,8 +20,9 @@
       env = Rack::MockRequest.env_for('/', options)
 
       unless RUBY_PLATFORM == 'java'
-        major, minor, release = Rack.release.split('.').map(&:to_i)
-        pending 'Rack 1.5.3 or 1.6.1 required' unless major >= 1 && ((minor == 5 && release >= 3) || (minor >= 6))
+        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 >= 1 && ((minor == 5 && patch >= 3) || (minor >= 6))
       end
 
       expect(JSON.parse(app.call(env)[2].body.first)['params_keys']).to match_array('test')