Fix: use rack-jsonp instead of rack-contrib to avoid undefined method bytesize for Rack::JSONP.

Author: dblock

gemfiles/rails_5.gemfile

@@ -26,7 +26,7 @@ group :test do
   gem 'rack-test'
   gem 'rspec', '~> 3.0'
   gem 'cookiejar'
-  gem 'rack-contrib'
+  gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'mime-types', '< 3.0'
   gem 'danger', '~> 2.0'
 end

spec/grape/api_spec.rb

@@ -374,12 +374,17 @@ def subject.enable_root_route!
     end
 
     context 'format' do
+      module ApiSpec
+        class DummyFormatClass
+        end
+      end
+
       before(:each) do
-        allow_any_instance_of(Object).to receive(:to_json).and_return('abc')
-        allow_any_instance_of(Object).to receive(:to_txt).and_return('def')
+        allow_any_instance_of(ApiSpec::DummyFormatClass).to receive(:to_json).and_return('abc')
+        allow_any_instance_of(ApiSpec::DummyFormatClass).to receive(:to_txt).and_return('def')
 
         subject.get('/abc') do
-          Object.new
+          ApiSpec::DummyFormatClass.new
         end
       end
 

spec/grape/entity_spec.rb

@@ -266,8 +266,6 @@ def initialize(args)
     end
 
     it 'presents with jsonp utilising Rack::JSONP' do
-      require 'rack/contrib'
-
       # Include JSONP middleware
       subject.use Rack::JSONP
 

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 >= 1 && ((minor == 5 && patch >= 3) || (minor >= 6))
+        pending 'Rack 1.5.3 or 1.6.1 required' unless major >= 2 || (major >= 1 && ((minor == 5 && patch >= 3) || (minor >= 6)))
       end
 
       expect(JSON.parse(app.call(env)[2].body.first)['params_keys']).to match_array('test')

spec/spec_helper.rb

@@ -6,14 +6,7 @@
 
 require 'rubygems'
 require 'bundler'
-Bundler.setup :default, :test
-
-require 'json'
-require 'rack/test'
-require 'base64'
-require 'cookiejar'
-require 'mime/types'
-require 'cgi'
+Bundler.require :default, :test
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|
   require file