grape 0.7.0 → 0.8.0

data/lib/grape/util/hash_stack.rb

@@ -46,7 +46,7 @@ module Grape
       #
       # @param key [Symbol] key to look for in hash frames
       # @return true if key exists, false otherwise
-      def has_key?(key)
+      def key?(key)
         (@stack.length - 1).downto(0).each do |i|
           return true if @stack[i].key? key
         end

data/lib/grape/validations.rb

@@ -19,7 +19,7 @@ module Grape
       def validate!(params)
         attributes = AttributesIterator.new(self, @scope, params)
         attributes.each do |resource_params, attr_name|
-          if @required || resource_params.has_key?(attr_name)
+          if @required || resource_params.key?(attr_name)
             validate_param!(attr_name, resource_params)
           end
         end
@@ -43,8 +43,6 @@ module Grape
         end
       end
 
-      private
-
       def self.convert_to_short_name(klass)
         ret = klass.name.gsub(/::/, '/')
           .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
@@ -132,6 +130,14 @@ module Grape
           push_declared_params(attrs)
       end
 
+      def mutually_exclusive(*attrs)
+        validates(attrs, mutual_exclusion: true)
+      end
+
+      def exactly_one_of(*attrs)
+        validates(attrs, exactly_one_of: true)
+      end
+
       def group(*attrs, &block)
         requires(*attrs, &block)
       end
@@ -152,11 +158,12 @@ module Grape
 
       def use(*names)
         named_params = @api.settings[:named_params] || {}
+        options = names.last.is_a?(Hash) ? names.pop : {}
         names.each do |name|
           params_block = named_params.fetch(name) do
             raise "Params :#{name} not found!"
           end
-          instance_eval(&params_block)
+          instance_exec(options, &params_block)
         end
       end
       alias_method :use_scope, :use
@@ -167,6 +174,10 @@ module Grape
         name.to_s
       end
 
+      def root?
+        !@parent
+      end
+
       protected
 
       def push_declared_params(attrs)
@@ -184,10 +195,13 @@ module Grape
           optional_fields = opts[:using].keys - required_fields
         end
         required_fields.each do |field|
-          requires(field, opts[:using][field])
+          field_opts = opts[:using][field]
+          raise ArgumentError, "required field not exist: #{field}" unless field_opts
+          requires(field, field_opts)
         end
         optional_fields.each do |field|
-          optional(field, opts[:using][field])
+          field_opts = opts[:using][field]
+          optional(field, field_opts) if field_opts
         end
       end
 
@@ -250,7 +264,7 @@ module Grape
         @api.document_attribute(full_attrs, doc_attrs)
 
         # Validate for presence before any other validators
-        if validations.has_key?(:presence) && validations[:presence]
+        if validations.key?(:presence) && validations[:presence]
           validate('presence', validations[:presence], attrs, doc_attrs)
           validations.delete(:presence)
         end
@@ -258,7 +272,7 @@ module Grape
         # Before we run the rest of the validators, lets handle
         # whatever coercion so that we are working with correctly
         # type casted values
-        if validations.has_key? :coerce
+        if validations.key? :coerce
           validate('coerce', validations[:coerce], attrs, doc_attrs)
           validations.delete(:coerce)
         end

data/lib/grape/validations/default.rb

@@ -7,7 +7,7 @@ module Grape
       end
 
       def validate_param!(attr_name, params)
-        params[attr_name] = @default.is_a?(Proc) ? @default.call : @default unless params.has_key?(attr_name)
+        params[attr_name] = @default.is_a?(Proc) ? @default.call : @default unless params.key?(attr_name)
       end
 
       def validate!(params)

data/lib/grape/validations/exactly_one_of.rb

@@ -0,0 +1,26 @@
+module Grape
+  module Validations
+    require 'grape/validations/mutual_exclusion'
+    class ExactlyOneOfValidator < MutualExclusionValidator
+      attr_reader :params
+
+      def validate!(params)
+        super
+        if none_of_restricted_params_is_present
+          raise Grape::Exceptions::Validation, param: "#{all_keys}", message_key: :exactly_one
+        end
+        params
+      end
+
+      private
+
+      def none_of_restricted_params_is_present
+        keys_in_common.length < 1
+      end
+
+      def all_keys
+        attrs.map(&:to_sym)
+      end
+    end
+  end
+end

data/lib/grape/validations/mutual_exclusion.rb

@@ -0,0 +1,25 @@
+module Grape
+  module Validations
+    class MutualExclusionValidator < Validator
+      attr_reader :params
+
+      def validate!(params)
+        @params = params
+        if two_or_more_exclusive_params_are_present
+          raise Grape::Exceptions::Validation, param: "#{keys_in_common.map(&:to_sym)}", message_key: :mutual_exclusion
+        end
+        params
+      end
+
+      private
+
+      def two_or_more_exclusive_params_are_present
+        keys_in_common.length > 1
+      end
+
+      def keys_in_common
+        attrs.map(&:to_s) & params.stringify_keys.keys
+      end
+    end
+  end
+end

data/lib/grape/validations/presence.rb

@@ -7,7 +7,7 @@ module Grape
       end
 
       def validate_param!(attr_name, params)
-        unless params.respond_to?(:has_key?) && params.has_key?(attr_name)
+        unless params.respond_to?(:key?) && params.key?(attr_name)
           raise Grape::Exceptions::Validation, param: @scope.full_name(attr_name), message_key: :presence
         end
       end

data/lib/grape/validations/regexp.rb

@@ -2,7 +2,8 @@ module Grape
   module Validations
     class RegexpValidator < SingleOptionValidator
       def validate_param!(attr_name, params)
-        if params[attr_name] && !(params[attr_name].to_s =~ @option)
+        if params.key?(attr_name) &&
+          (params[attr_name].nil? || !(params[attr_name].to_s =~ @option))
           raise Grape::Exceptions::Validation, param: @scope.full_name(attr_name), message_key: :regexp
         end
       end

data/lib/grape/validations/values.rb

@@ -8,10 +8,16 @@ module Grape
       end
 
       def validate_param!(attr_name, params)
-        if (params[attr_name] || @required) && !(@values.is_a?(Proc) ? @values.call : @values).include?(params[attr_name])
+        if (params[attr_name] || required_for_root_scope?) && !(@values.is_a?(Proc) ? @values.call : @values).include?(params[attr_name])
           raise Grape::Exceptions::Validation, param: @scope.full_name(attr_name), message_key: :values
         end
       end
+
+      private
+
+      def required_for_root_scope?
+        @required && @scope.root?
+      end
     end
   end
 end

data/lib/grape/version.rb

@@ -1,3 +1,3 @@
 module Grape
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/spec/grape/api_spec.rb

@@ -9,7 +9,6 @@ describe Grape::API do
   end
 
   describe '.prefix' do
-
     it 'routes root through with the prefix' do
       subject.prefix 'awesome/sauce'
       subject.get do
@@ -17,7 +16,7 @@ describe Grape::API do
       end
 
       get 'awesome/sauce/'
-      last_response.body.should eql "Hello there."
+      expect(last_response.body).to eql "Hello there."
     end
 
     it 'routes through with the prefix' do
@@ -27,25 +26,24 @@ describe Grape::API do
       end
 
       get 'awesome/sauce/hello'
-      last_response.body.should eql "Hello there."
+      expect(last_response.body).to eql "Hello there."
 
       get '/hello'
-      last_response.status.should eql 404
+      expect(last_response.status).to eql 404
     end
-
   end
 
   describe '.version' do
     context 'when defined' do
       it 'returns version value' do
         subject.version 'v1'
-        subject.version.should == 'v1'
+        expect(subject.version).to eq('v1')
       end
     end
 
     context 'when not defined' do
       it 'returns nil' do
-        subject.version.should be_nil
+        expect(subject.version).to be_nil
       end
     end
   end
@@ -117,7 +115,7 @@ describe Grape::API do
     it 'adds the association to the :representations setting' do
       klass = Class.new
       subject.represent Object, with: klass
-      subject.settings[:representations][Object].should == klass
+      expect(subject.settings[:representations][Object]).to eq(klass)
     end
   end
 
@@ -137,7 +135,7 @@ describe Grape::API do
       end
 
       get "/rad/v1/awesome/hello"
-      last_response.body.should == "worked"
+      expect(last_response.body).to eq("worked")
     end
 
     it 'cancels itself after the block is over' do
@@ -145,7 +143,7 @@ describe Grape::API do
         namespace.should == '/awesome'
       end
 
-      subject.namespace.should == '/'
+      expect(subject.namespace).to eq('/')
     end
 
     it 'is stackable' do
@@ -155,7 +153,7 @@ describe Grape::API do
         end
         namespace.should == '/awesome'
       end
-      subject.namespace.should == '/'
+      expect(subject.namespace).to eq('/')
     end
 
     it 'accepts path segments correctly' do
@@ -168,7 +166,7 @@ describe Grape::API do
         end
       end
       get '/members/23'
-      last_response.body.should == "23"
+      expect(last_response.body).to eq("23")
     end
 
     it 'is callable with nil just to push onto the stack' do
@@ -179,9 +177,9 @@ describe Grape::API do
       subject.get('/hello') { "outer" }
 
       get '/v2/hello'
-      last_response.body.should == "inner"
+      expect(last_response.body).to eq("inner")
       get '/hello'
-      last_response.body.should == "outer"
+      expect(last_response.body).to eq("outer")
     end
 
     %w(group resource resources segment).each do |als|
@@ -204,7 +202,7 @@ describe Grape::API do
       end
 
       get '/users/23'
-      last_response.body.should == '23'
+      expect(last_response.body).to eq('23')
     end
 
     it 'should be able to define requirements with a single hash' do
@@ -217,9 +215,9 @@ describe Grape::API do
       end
 
       get '/users/michael'
-      last_response.status.should == 404
+      expect(last_response.status).to eq(404)
       get '/users/23'
-      last_response.status.should == 200
+      expect(last_response.status).to eq(200)
     end
   end
 
@@ -235,15 +233,15 @@ describe Grape::API do
       end
 
       get '/votes'
-      last_response.body.should eql 'Votes'
+      expect(last_response.body).to eql 'Votes'
       post '/votes'
-      last_response.body.should eql 'Created a Vote'
+      expect(last_response.body).to eql 'Created a Vote'
     end
 
     it 'handles empty calls' do
       subject.get "/"
       get "/"
-      last_response.body.should eql ""
+      expect(last_response.body).to eql ""
     end
 
     describe 'root routes should work with' do
@@ -255,7 +253,7 @@ describe Grape::API do
       end
 
       after do
-        last_response.body.should eql "root"
+        expect(last_response.body).to eql "root"
       end
 
       describe 'path versioned APIs' do
@@ -315,9 +313,9 @@ describe Grape::API do
       end
 
       get '/abc'
-      last_response.body.should eql 'foo'
+      expect(last_response.body).to eql 'foo'
       get '/def'
-      last_response.body.should eql 'foo'
+      expect(last_response.body).to eql 'foo'
     end
 
     context 'format' do
@@ -329,14 +327,14 @@ describe Grape::API do
 
       it 'allows .json' do
         get '/abc.json'
-        last_response.status.should == 200
-        last_response.body.should eql 'abc' # json-encoded symbol
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eql 'abc' # json-encoded symbol
       end
 
       it 'allows .txt' do
         get '/abc.txt'
-        last_response.status.should == 200
-        last_response.body.should eql 'def' # raw text
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eql 'def' # raw text
       end
     end
 
@@ -346,7 +344,7 @@ describe Grape::API do
       end
 
       get '/awesome.json'
-      last_response.body.should eql '{"id":"awesome"}'
+      expect(last_response.body).to eql '{"id":"awesome"}'
     end
 
     it 'allows for format in namespace with no path' do
@@ -357,7 +355,7 @@ describe Grape::API do
       end
 
       get '/abc.json'
-      last_response.body.should eql '["json"]'
+      expect(last_response.body).to eql '["json"]'
     end
 
     it 'allows for multiple verbs' do
@@ -366,13 +364,13 @@ describe Grape::API do
       end
 
       subject.endpoints.first.routes.each do |route|
-        route.route_path.should eql '/abc(.:format)'
+        expect(route.route_path).to eql '/abc(.:format)'
       end
 
       get '/abc'
-      last_response.body.should eql 'hiya'
+      expect(last_response.body).to eql 'hiya'
       post '/abc'
-      last_response.body.should eql 'hiya'
+      expect(last_response.body).to eql 'hiya'
     end
 
     [:put, :post].each do |verb|
@@ -384,9 +382,9 @@ describe Grape::API do
               env['api.request.body']
             end
             send verb, '/', MultiJson.dump(object), 'CONTENT_TYPE' => 'application/json'
-            last_response.status.should == (verb == :post ? 201 : 200)
-            last_response.body.should eql MultiJson.dump(object)
-            last_request.params.should eql Hash.new
+            expect(last_response.status).to eq(verb == :post ? 201 : 200)
+            expect(last_response.body).to eql MultiJson.dump(object)
+            expect(last_request.params).to eql Hash.new
           end
           it "stores input in api.request.input" do
             subject.format :json
@@ -394,8 +392,8 @@ describe Grape::API do
               env['api.request.input']
             end
             send verb, '/', MultiJson.dump(object), 'CONTENT_TYPE' => 'application/json'
-            last_response.status.should == (verb == :post ? 201 : 200)
-            last_response.body.should eql MultiJson.dump(object).to_json
+            expect(last_response.status).to eq(verb == :post ? 201 : 200)
+            expect(last_response.body).to eql MultiJson.dump(object).to_json
           end
           context "chunked transfer encoding" do
             it "stores input in api.request.input" do
@@ -404,8 +402,8 @@ describe Grape::API do
                 env['api.request.input']
               end
               send verb, '/', MultiJson.dump(object), 'CONTENT_TYPE' => 'application/json', 'HTTP_TRANSFER_ENCODING' => 'chunked', 'CONTENT_LENGTH' => nil
-              last_response.status.should == (verb == :post ? 201 : 200)
-              last_response.body.should eql MultiJson.dump(object).to_json
+              expect(last_response.status).to eq(verb == :post ? 201 : 200)
+              expect(last_response.body).to eql MultiJson.dump(object).to_json
             end
           end
         end
@@ -426,15 +424,15 @@ describe Grape::API do
       end
 
       get '/1'
-      last_response.body.should eql 'ola'
+      expect(last_response.body).to eql 'ola'
       post '/1'
-      last_response.body.should eql 'ola'
+      expect(last_response.body).to eql 'ola'
       get '/1/first'
-      last_response.body.should eql 'first'
+      expect(last_response.body).to eql 'first'
       post '/1/first'
-      last_response.body.should eql 'first'
+      expect(last_response.body).to eql 'first'
       get '/1/first/second'
-      last_response.body.should eql 'second'
+      expect(last_response.body).to eql 'second'
 
     end
 
@@ -445,7 +443,7 @@ describe Grape::API do
 
       %w(get post put delete options patch).each do |m|
         send(m, '/abc')
-        last_response.body.should eql 'lol'
+        expect(last_response.body).to eql 'lol'
       end
     end
 
@@ -456,10 +454,10 @@ describe Grape::API do
           verb
         end
         send(verb, '/example')
-        last_response.body.should eql verb == 'head' ? '' : verb
+        expect(last_response.body).to eql verb == 'head' ? '' : verb
         # Call it with a method other than the properly constrained one.
         send(used_verb = verbs[(verbs.index(verb) + 2) % verbs.size], '/example')
-        last_response.status.should eql used_verb == 'options' ? 204 : 405
+        expect(last_response.status).to eql used_verb == 'options' ? 204 : 405
       end
     end
 
@@ -469,8 +467,8 @@ describe Grape::API do
       end
 
       post '/example'
-      last_response.status.should eql 201
-      last_response.body.should eql 'Created'
+      expect(last_response.status).to eql 201
+      expect(last_response.body).to eql 'Created'
     end
 
     it 'returns a 405 for an unsupported method with an X-Custom-Header' do
@@ -479,9 +477,9 @@ describe Grape::API do
         "example"
       end
       put '/example'
-      last_response.status.should eql 405
-      last_response.body.should eql ''
-      last_response.headers['X-Custom-Header'].should eql 'foo'
+      expect(last_response.status).to eql 405
+      expect(last_response.body).to eql ''
+      expect(last_response.headers['X-Custom-Header']).to eql 'foo'
     end
 
     specify '405 responses includes an Allow header specifying supported methods' do
@@ -492,7 +490,7 @@ describe Grape::API do
         "example"
       end
       put '/example'
-      last_response.headers['Allow'].should eql 'OPTIONS, GET, POST, HEAD'
+      expect(last_response.headers['Allow']).to eql 'OPTIONS, GET, POST, HEAD'
     end
 
     specify '405 responses includes an Content-Type header' do
@@ -503,7 +501,7 @@ describe Grape::API do
         "example"
       end
       put '/example'
-      last_response.headers['Content-Type'].should eql 'text/plain'
+      expect(last_response.headers['Content-Type']).to eql 'text/plain'
     end
 
     it 'adds an OPTIONS route that returns a 204, an Allow header and a X-Custom-Header' do
@@ -512,10 +510,10 @@ describe Grape::API do
         "example"
       end
       options '/example'
-      last_response.status.should eql 204
-      last_response.body.should eql ''
-      last_response.headers['Allow'].should eql 'OPTIONS, GET, HEAD'
-      last_response.headers['X-Custom-Header'].should eql 'foo'
+      expect(last_response.status).to eql 204
+      expect(last_response.body).to eql ''
+      expect(last_response.headers['Allow']).to eql 'OPTIONS, GET, HEAD'
+      expect(last_response.headers['X-Custom-Header']).to eql 'foo'
     end
 
     it 'allows HEAD on a GET request' do
@@ -523,8 +521,8 @@ describe Grape::API do
         "example"
       end
       head '/example'
-      last_response.status.should eql 200
-      last_response.body.should eql ''
+      expect(last_response.status).to eql 200
+      expect(last_response.body).to eql ''
     end
 
     it 'overwrites the default HEAD request' do
@@ -535,7 +533,7 @@ describe Grape::API do
         "example"
       end
       head '/example'
-      last_response.status.should eql 400
+      expect(last_response.status).to eql 400
     end
   end
 
@@ -548,13 +546,13 @@ describe Grape::API do
     end
     it 'options does not contain HEAD' do
       options '/example'
-      last_response.status.should eql 204
-      last_response.body.should eql ''
-      last_response.headers['Allow'].should eql 'OPTIONS, GET'
+      expect(last_response.status).to eql 204
+      expect(last_response.body).to eql ''
+      expect(last_response.headers['Allow']).to eql 'OPTIONS, GET'
     end
     it 'does not allow HEAD on a GET request' do
       head '/example'
-      last_response.status.should eql 405
+      expect(last_response.status).to eql 405
     end
   end
 
@@ -567,7 +565,7 @@ describe Grape::API do
     end
     it 'options does not exist' do
       options '/example'
-      last_response.status.should eql 405
+      expect(last_response.status).to eql 405
     end
   end
 
@@ -580,7 +578,7 @@ describe Grape::API do
       end
 
       get '/'
-      last_response.body.should eql 'first second'
+      expect(last_response.body).to eql 'first second'
     end
 
     it 'adds a before filter to current and child namespaces only' do
@@ -601,11 +599,11 @@ describe Grape::API do
       end
 
       get '/'
-      last_response.body.should eql 'root - '
+      expect(last_response.body).to eql 'root - '
       get '/blah'
-      last_response.body.should eql 'blah - foo'
+      expect(last_response.body).to eql 'blah - foo'
       get '/blah/bar'
-      last_response.body.should eql 'blah - bar - foo'
+      expect(last_response.body).to eql 'blah - bar - foo'
     end
 
     it 'adds a after_validation filter' do
@@ -619,7 +617,7 @@ describe Grape::API do
       end
 
       get '/', id: "32"
-      last_response.body.should eql 'first 32:Fixnum second'
+      expect(last_response.body).to eql 'first 32:Fixnum second'
     end
 
     it 'adds a after filter' do
@@ -630,9 +628,9 @@ describe Grape::API do
         @var ||= 'default'
       end
 
-      m.should_receive(:do_something!).exactly(2).times
+      expect(m).to receive(:do_something!).exactly(2).times
       get '/'
-      last_response.body.should eql 'default'
+      expect(last_response.body).to eql 'default'
     end
 
     it 'calls all filters when validation passes' do
@@ -654,14 +652,14 @@ describe Grape::API do
         end
       end
 
-      a.should_receive(:do_something!).exactly(1).times
-      b.should_receive(:do_something!).exactly(1).times
-      c.should_receive(:do_something!).exactly(1).times
-      d.should_receive(:do_something!).exactly(1).times
+      expect(a).to receive(:do_something!).exactly(1).times
+      expect(b).to receive(:do_something!).exactly(1).times
+      expect(c).to receive(:do_something!).exactly(1).times
+      expect(d).to receive(:do_something!).exactly(1).times
 
       get '/123'
-      last_response.status.should eql 200
-      last_response.body.should eql 'got it'
+      expect(last_response.status).to eql 200
+      expect(last_response.body).to eql 'got it'
     end
 
     it 'calls only before filters when validation fails' do
@@ -683,14 +681,14 @@ describe Grape::API do
         end
       end
 
-      a.should_receive(:do_something!).exactly(1).times
-      b.should_receive(:do_something!).exactly(1).times
-      c.should_receive(:do_something!).exactly(0).times
-      d.should_receive(:do_something!).exactly(0).times
+      expect(a).to receive(:do_something!).exactly(1).times
+      expect(b).to receive(:do_something!).exactly(1).times
+      expect(c).to receive(:do_something!).exactly(0).times
+      expect(d).to receive(:do_something!).exactly(0).times
 
       get '/abc'
-      last_response.status.should eql 400
-      last_response.body.should eql 'id is invalid'
+      expect(last_response.status).to eql 400
+      expect(last_response.body).to eql 'id is invalid'
     end
 
     it 'calls filters in the correct order' do
@@ -713,14 +711,14 @@ describe Grape::API do
         end
       end
 
-      a.should_receive(:here).with(1).exactly(1).times
-      b.should_receive(:here).with(2).exactly(1).times
-      c.should_receive(:here).with(3).exactly(1).times
-      d.should_receive(:here).with(4).exactly(1).times
+      expect(a).to receive(:here).with(1).exactly(1).times
+      expect(b).to receive(:here).with(2).exactly(1).times
+      expect(c).to receive(:here).with(3).exactly(1).times
+      expect(d).to receive(:here).with(4).exactly(1).times
 
       get '/123'
-      last_response.status.should eql 200
-      last_response.body.should eql 'got it'
+      expect(last_response.status).to eql 200
+      expect(last_response.body).to eql 'got it'
     end
   end
 
@@ -731,32 +729,32 @@ describe Grape::API do
 
     it 'sets content type for txt format' do
       get '/foo'
-      last_response.headers['Content-Type'].should eql 'text/plain'
+      expect(last_response.headers['Content-Type']).to eql 'text/plain'
     end
 
     it 'sets content type for json' do
       get '/foo.json'
-      last_response.headers['Content-Type'].should eql 'application/json'
+      expect(last_response.headers['Content-Type']).to eql 'application/json'
     end
 
     it 'sets content type for error' do
       subject.get('/error') { error!('error in plain text', 500) }
       get '/error'
-      last_response.headers['Content-Type'].should eql 'text/plain'
+      expect(last_response.headers['Content-Type']).to eql 'text/plain'
     end
 
     it 'sets content type for error' do
       subject.format :json
       subject.get('/error') { error!('error in json', 500) }
       get '/error.json'
-      last_response.headers['Content-Type'].should eql 'application/json'
+      expect(last_response.headers['Content-Type']).to eql 'application/json'
     end
 
     it 'sets content type for xml' do
       subject.format :xml
       subject.get('/error') { error!('error in xml', 500) }
       get '/error.xml'
-      last_response.headers['Content-Type'].should eql 'application/xml'
+      expect(last_response.headers['Content-Type']).to eql 'application/xml'
     end
 
     context 'with a custom content_type' do
@@ -770,12 +768,48 @@ describe Grape::API do
 
       it 'sets content type' do
         get '/custom.custom'
-        last_response.headers['Content-Type'].should eql 'application/custom'
+        expect(last_response.headers['Content-Type']).to eql 'application/custom'
       end
 
       it 'sets content type for error' do
         get '/error.custom'
-        last_response.headers['Content-Type'].should eql 'application/custom'
+        expect(last_response.headers['Content-Type']).to eql 'application/custom'
+      end
+    end
+
+    context 'env["api.format"]' do
+      before do
+        subject.post "attachment" do
+          filename = params[:file][:filename]
+          content_type MIME::Types.type_for(filename)[0].to_s
+          env['api.format'] = :binary # there's no formatter for :binary, data will be returned "as is"
+          header "Content-Disposition", "attachment; filename*=UTF-8''#{URI.escape(filename)}"
+          params[:file][:tempfile].read
+        end
+      end
+
+      ['/attachment.png', 'attachment'].each do |url|
+        it "uploads and downloads a PNG file via #{url}" do
+          image_filename = "grape.png"
+          post url, file: Rack::Test::UploadedFile.new(image_filename, 'image/png', true)
+          last_response.status.should == 201
+          last_response.headers['Content-Type'].should == "image/png"
+          last_response.headers['Content-Disposition'].should == "attachment; filename*=UTF-8''grape.png"
+          File.open(image_filename, 'rb') do |io|
+            last_response.body.should eq io.read
+          end
+        end
+      end
+
+      it "uploads and downloads a Ruby file" do
+        filename = __FILE__
+        post "/attachment.rb", file: Rack::Test::UploadedFile.new(filename, 'application/x-ruby', true)
+        last_response.status.should == 201
+        last_response.headers['Content-Type'].should == "application/x-ruby"
+        last_response.headers['Content-Disposition'].should == "attachment; filename*=UTF-8''api_spec.rb"
+        File.open(filename, 'rb') do |io|
+          last_response.body.should eq io.read
+        end
       end
     end
   end
@@ -801,21 +835,21 @@ describe Grape::API do
     describe '.middleware' do
       it 'includes middleware arguments from settings' do
         settings = Grape::Util::HashStack.new
-        settings.stub(:stack).and_return([{ middleware: [[ApiSpec::PhonyMiddleware, 'abc', 123]] }])
-        subject.stub(:settings).and_return(settings)
-        subject.middleware.should eql [[ApiSpec::PhonyMiddleware, 'abc', 123]]
+        allow(settings).to receive(:stack).and_return([{ middleware: [[ApiSpec::PhonyMiddleware, 'abc', 123]] }])
+        allow(subject).to receive(:settings).and_return(settings)
+        expect(subject.middleware).to eql [[ApiSpec::PhonyMiddleware, 'abc', 123]]
       end
 
       it 'includes all middleware from stacked settings' do
         settings = Grape::Util::HashStack.new
-        settings.stub(:stack).and_return [
+        allow(settings).to receive(:stack).and_return [
           { middleware: [[ApiSpec::PhonyMiddleware, 123], [ApiSpec::PhonyMiddleware, 'abc']] },
           { middleware: [[ApiSpec::PhonyMiddleware, 'foo']] }
         ]
 
-        subject.stub(:settings).and_return(settings)
+        allow(subject).to receive(:settings).and_return(settings)
 
-        subject.middleware.should eql [
+        expect(subject.middleware).to eql [
           [ApiSpec::PhonyMiddleware, 123],
           [ApiSpec::PhonyMiddleware, 'abc'],
           [ApiSpec::PhonyMiddleware, 'foo']
@@ -826,7 +860,7 @@ describe Grape::API do
     describe '.use' do
       it 'adds middleware' do
         subject.use ApiSpec::PhonyMiddleware, 123
-        subject.middleware.should eql [[ApiSpec::PhonyMiddleware, 123]]
+        expect(subject.middleware).to eql [[ApiSpec::PhonyMiddleware, 123]]
       end
 
       it 'does not show up outside the namespace' do
@@ -836,7 +870,7 @@ describe Grape::API do
           middleware.should == [[ApiSpec::PhonyMiddleware, 123], [ApiSpec::PhonyMiddleware, 'abc']]
         end
 
-        subject.middleware.should eql [[ApiSpec::PhonyMiddleware, 123]]
+        expect(subject.middleware).to eql [[ApiSpec::PhonyMiddleware, 123]]
       end
 
       it 'calls the middleware' do
@@ -846,13 +880,13 @@ describe Grape::API do
         end
 
         get '/'
-        last_response.body.should eql 'hello'
+        expect(last_response.body).to eql 'hello'
       end
 
       it 'adds a block if one is given' do
         block = lambda {}
         subject.use ApiSpec::PhonyMiddleware, &block
-        subject.middleware.should eql [[ApiSpec::PhonyMiddleware, block]]
+        expect(subject.middleware).to eql [[ApiSpec::PhonyMiddleware, block]]
       end
 
       it 'uses a block if one is given' do
@@ -863,7 +897,7 @@ describe Grape::API do
         end
 
         get '/'
-        last_response.body.should == 'true'
+        expect(last_response.body).to eq('true')
       end
 
       it 'does not destroy the middleware settings on multiple runs' do
@@ -875,7 +909,7 @@ describe Grape::API do
 
         2.times do
           get '/'
-          last_response.body.should == 'true'
+          expect(last_response.body).to eq('true')
         end
       end
 
@@ -889,8 +923,8 @@ describe Grape::API do
         subject.get "/" do
         end
         get "/"
-        last_response.status.should == 400
-        last_response.body.should == "Caught in the Net"
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eq("Caught in the Net")
       end
     end
   end
@@ -901,9 +935,9 @@ describe Grape::API do
       end
       subject.get(:hello) { "Hello, world." }
       get '/hello'
-      last_response.status.should eql 401
+      expect(last_response.status).to eql 401
       get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow', 'whatever')
-      last_response.status.should eql 200
+      expect(last_response.status).to eql 200
     end
 
     it 'is scopable' do
@@ -917,9 +951,9 @@ describe Grape::API do
       end
 
       get '/hello'
-      last_response.status.should eql 200
+      expect(last_response.status).to eql 200
       get '/admin/hello'
-      last_response.status.should eql 401
+      expect(last_response.status).to eql 401
     end
 
     it 'is callable via .auth as well' do
@@ -929,9 +963,9 @@ describe Grape::API do
 
       subject.get(:hello) { "Hello, world." }
       get '/hello'
-      last_response.status.should eql 401
+      expect(last_response.status).to eql 401
       get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow', 'whatever')
-      last_response.status.should eql 200
+      expect(last_response.status).to eql 200
     end
 
     it 'has access to the current endpoint' do
@@ -945,7 +979,7 @@ describe Grape::API do
 
       subject.get(:hello) { "Hello, world." }
       get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow', 'whatever')
-      basic_auth_context.should be_an_instance_of(Grape::Endpoint)
+      expect(basic_auth_context).to be_an_instance_of(Grape::Endpoint)
     end
 
     it 'has access to helper methods' do
@@ -961,9 +995,9 @@ describe Grape::API do
 
       subject.get(:hello) { "Hello, world." }
       get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow', 'whatever')
-      last_response.status.should eql 200
+      expect(last_response.status).to eql 200
       get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('disallow', 'whatever')
-      last_response.status.should eql 401
+      expect(last_response.status).to eql 401
     end
 
     it 'can set instance variables accessible to routes' do
@@ -975,27 +1009,27 @@ describe Grape::API do
 
       subject.get(:hello) { @hello }
       get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow', 'whatever')
-      last_response.status.should eql 200
-      last_response.body.should eql "Hello, world."
+      expect(last_response.status).to eql 200
+      expect(last_response.body).to eql "Hello, world."
     end
   end
 
   describe '.logger' do
     it 'returns an instance of Logger class by default' do
-      subject.logger.class.should eql Logger
+      expect(subject.logger.class).to eql Logger
     end
 
     it 'allows setting a custom logger' do
       mylogger = Class.new
       subject.logger mylogger
-      mylogger.should_receive(:info).exactly(1).times
+      expect(mylogger).to receive(:info).exactly(1).times
       subject.logger.info "this will be logged"
     end
 
     it "defaults to a standard logger log format" do
       t = Time.at(100)
-      Time.stub(:now).and_return(t)
-      STDOUT.should_receive(:write).with("I, [#{Logger::Formatter.new.send(:format_datetime, t)}\##{Process.pid}]  INFO -- : this will be logged\n")
+      allow(Time).to receive(:now).and_return(t)
+      expect(STDOUT).to receive(:write).with("I, [#{Logger::Formatter.new.send(:format_datetime, t)}\##{Process.pid}]  INFO -- : this will be logged\n")
       subject.logger.info "this will be logged"
     end
   end
@@ -1013,7 +1047,7 @@ describe Grape::API do
       end
 
       get '/howdy'
-      last_response.body.should eql 'Hello, world.'
+      expect(last_response.body).to eql 'Hello, world.'
     end
 
     it 'is scopable' do
@@ -1040,9 +1074,9 @@ describe Grape::API do
       end
 
       get '/generic'
-      last_response.body.should eql 'always there:false'
+      expect(last_response.body).to eql 'always there:false'
       get '/admin/secret'
-      last_response.body.should eql 'always there:only in admin'
+      expect(last_response.body).to eql 'always there:only in admin'
     end
 
     it 'is reopenable' do
@@ -1062,7 +1096,7 @@ describe Grape::API do
         [one, two]
       end
 
-      lambda { get '/howdy' }.should_not raise_error
+      expect { get '/howdy' }.not_to raise_error
     end
 
     it 'allows for modules' do
@@ -1078,7 +1112,7 @@ describe Grape::API do
       end
 
       get '/howdy'
-      last_response.body.should eql 'Hello, world.'
+      expect(last_response.body).to eql 'Hello, world.'
     end
 
     it 'allows multiple calls with modules and blocks' do
@@ -1100,7 +1134,7 @@ describe Grape::API do
       subject.get 'howdy' do
         [one, two, three]
       end
-      lambda { get '/howdy' }.should_not raise_error
+      expect { get '/howdy' }.not_to raise_error
     end
   end
 
@@ -1122,13 +1156,13 @@ describe Grape::API do
       end
 
       get '/new/abc'
-      last_response.status.should eql 404
+      expect(last_response.status).to eql 404
       get '/legacy/abc'
-      last_response.status.should eql 200
+      expect(last_response.status).to eql 200
       get '/legacy/def'
-      last_response.status.should eql 404
+      expect(last_response.status).to eql 404
       get '/new/def'
-      last_response.status.should eql 200
+      expect(last_response.status).to eql 200
     end
   end
 
@@ -1137,7 +1171,7 @@ describe Grape::API do
       subject.get '/exception' do
         raise "rain!"
       end
-      lambda { get '/exception' }.should raise_error
+      expect { get '/exception' }.to raise_error
     end
 
     it 'rescues all errors if rescue_from :all is called' do
@@ -1146,7 +1180,7 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception'
-      last_response.status.should eql 500
+      expect(last_response.status).to eql 500
     end
 
     it 'rescues only certain errors if rescue_from is called with specific errors' do
@@ -1155,9 +1189,9 @@ describe Grape::API do
       subject.get('/unrescued') { raise "beefcake" }
 
       get '/rescued'
-      last_response.status.should eql 500
+      expect(last_response.status).to eql 500
 
-      lambda { get '/unrescued' }.should raise_error
+      expect { get '/unrescued' }.to raise_error
     end
 
     context 'CustomError subclass of Grape::Exceptions::Base' do
@@ -1168,7 +1202,7 @@ describe Grape::API do
       it 'does not re-raise exceptions of type Grape::Exceptions::Base' do
         subject.get('/custom_exception') { raise CustomError }
 
-        lambda { get '/custom_exception' }.should_not raise_error
+        expect { get '/custom_exception' }.not_to raise_error
       end
 
       it 'rescues custom grape exceptions' do
@@ -1180,15 +1214,15 @@ describe Grape::API do
         end
 
         get '/custom_error'
-        last_response.status.should == 400
-        last_response.body.should == 'New Error'
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eq('New Error')
       end
     end
 
     it 'can rescue exceptions raised in the formatter' do
       formatter = double(:formatter)
-      formatter.stub(:call) { raise StandardError }
-      Grape::Formatter::Base.stub(:formatter_for) { formatter }
+      allow(formatter).to receive(:call) { raise StandardError }
+      allow(Grape::Formatter::Base).to receive(:formatter_for) { formatter }
 
       subject.rescue_from :all do |e|
         rack_response('Formatter Error', 500)
@@ -1196,8 +1230,8 @@ describe Grape::API do
       subject.get('/formatter_exception') { 'Hello world' }
 
       get '/formatter_exception'
-      last_response.status.should eql 500
-      last_response.body.should == 'Formatter Error'
+      expect(last_response.status).to eql 500
+      expect(last_response.body).to eq('Formatter Error')
     end
   end
 
@@ -1210,8 +1244,8 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception'
-      last_response.status.should eql 202
-      last_response.body.should == 'rescued from rain!'
+      expect(last_response.status).to eql 202
+      expect(last_response.body).to eq('rescued from rain!')
     end
 
     context 'custom errors' do
@@ -1229,8 +1263,8 @@ describe Grape::API do
           raise ConnectionError
         end
         get '/exception'
-        last_response.status.should eql 500
-        last_response.body.should == 'rescued from ConnectionError'
+        expect(last_response.status).to eql 500
+        expect(last_response.body).to eq('rescued from ConnectionError')
       end
       it 'rescues a specific error' do
         subject.rescue_from ConnectionError do |e|
@@ -1240,8 +1274,19 @@ describe Grape::API do
           raise ConnectionError
         end
         get '/exception'
-        last_response.status.should eql 500
-        last_response.body.should == 'rescued from ConnectionError'
+        expect(last_response.status).to eql 500
+        expect(last_response.body).to eq('rescued from ConnectionError')
+      end
+      it 'rescues a subclass of an error by default' do
+        subject.rescue_from RuntimeError do |e|
+          rack_response("rescued from #{e.class.name}", 500)
+        end
+        subject.get '/exception' do
+          raise ConnectionError
+        end
+        get '/exception'
+        expect(last_response.status).to eql 500
+        expect(last_response.body).to eq('rescued from ConnectionError')
       end
       it 'rescues multiple specific errors' do
         subject.rescue_from ConnectionError do |e|
@@ -1257,11 +1302,11 @@ describe Grape::API do
           raise DatabaseError
         end
         get '/connection'
-        last_response.status.should eql 500
-        last_response.body.should == 'rescued from ConnectionError'
+        expect(last_response.status).to eql 500
+        expect(last_response.body).to eq('rescued from ConnectionError')
         get '/database'
-        last_response.status.should eql 500
-        last_response.body.should == 'rescued from DatabaseError'
+        expect(last_response.status).to eql 500
+        expect(last_response.body).to eq('rescued from DatabaseError')
       end
       it 'does not rescue a different error' do
         subject.rescue_from RuntimeError do |e|
@@ -1270,7 +1315,7 @@ describe Grape::API do
         subject.get '/uncaught' do
           raise CommunicationError
         end
-        lambda { get '/uncaught' }.should raise_error(CommunicationError)
+        expect { get '/uncaught' }.to raise_error(CommunicationError)
       end
     end
   end
@@ -1283,8 +1328,8 @@ describe Grape::API do
       subject.get('/rescue_lambda') { raise ArgumentError }
 
       get '/rescue_lambda'
-      last_response.status.should == 400
-      last_response.body.should == "rescued with a lambda"
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to eq("rescued with a lambda")
     end
 
     it 'can execute the lambda with an argument' do
@@ -1294,8 +1339,8 @@ describe Grape::API do
       subject.get('/rescue_lambda') { raise ArgumentError, 'lambda takes an argument' }
 
       get '/rescue_lambda'
-      last_response.status.should == 400
-      last_response.body.should == 'lambda takes an argument'
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to eq('lambda takes an argument')
     end
   end
 
@@ -1309,8 +1354,8 @@ describe Grape::API do
       subject.get('/rescue_method') { raise ArgumentError }
 
       get '/rescue_method'
-      last_response.status.should == 400
-      last_response.body.should == 'rescued with a method'
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to eq('rescued with a method')
     end
   end
 
@@ -1337,10 +1382,22 @@ describe Grape::API do
       end
 
       get '/caught_child'
-      last_response.status.should eql 500
+      expect(last_response.status).to eql 500
       get '/caught_parent'
-      last_response.status.should eql 500
-      lambda { get '/uncaught_parent' }.should raise_error(StandardError)
+      expect(last_response.status).to eql 500
+      expect { get '/uncaught_parent' }.to raise_error(StandardError)
+    end
+
+    it 'sets rescue_subclasses to true by default' do
+      subject.rescue_from APIErrors::ParentError do |e|
+        rack_response("rescued from #{e.class.name}", 500)
+      end
+      subject.get '/caught_child' do
+        raise APIErrors::ChildError
+      end
+
+      get '/caught_child'
+      expect(last_response.status).to eql 500
     end
 
     it 'does not rescue child errors if rescue_subclasses is false' do
@@ -1350,7 +1407,7 @@ describe Grape::API do
       subject.get '/uncaught' do
         raise APIErrors::ChildError
       end
-      lambda { get '/uncaught' }.should raise_error(APIErrors::ChildError)
+      expect { get '/uncaught' }.to raise_error(APIErrors::ChildError)
     end
   end
 
@@ -1362,7 +1419,7 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception'
-      last_response.body.should eql "rain!"
+      expect(last_response.body).to eql "rain!"
     end
 
     it 'rescues all errors and return :txt with backtrace' do
@@ -1372,7 +1429,7 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception'
-      last_response.body.start_with?("rain!\r\n").should be true
+      expect(last_response.body.start_with?("rain!\r\n")).to be true
     end
 
     it 'rescues all errors with a default formatter' do
@@ -1383,7 +1440,7 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception.foo'
-      last_response.body.should start_with "rain!"
+      expect(last_response.body).to start_with "rain!"
     end
 
     it 'defaults the error formatter to format' do
@@ -1395,9 +1452,9 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception.json'
-      last_response.body.should == '{"error":"rain!"}'
+      expect(last_response.body).to eq('{"error":"rain!"}')
       get '/exception.foo'
-      last_response.body.should == '{"error":"rain!"}'
+      expect(last_response.body).to eq('{"error":"rain!"}')
     end
 
     context 'class' do
@@ -1415,7 +1472,7 @@ describe Grape::API do
           raise "rain!"
         end
         get '/exception'
-        last_response.body.should == "message: rain! @backtrace"
+        expect(last_response.body).to eq("message: rain! @backtrace")
       end
     end
 
@@ -1435,7 +1492,7 @@ describe Grape::API do
           subject.get('/exception') { raise "rain!" }
 
           get '/exception'
-          last_response.body.should == 'message: rain! @backtrace'
+          expect(last_response.body).to eq('message: rain! @backtrace')
         end
       end
     end
@@ -1447,7 +1504,7 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception'
-      last_response.body.should eql '{"error":"rain!"}'
+      expect(last_response.body).to eql '{"error":"rain!"}'
     end
     it 'rescues all errors and return :json with backtrace' do
       subject.rescue_from :all, backtrace: true
@@ -1457,8 +1514,8 @@ describe Grape::API do
       end
       get '/exception'
       json = MultiJson.load(last_response.body)
-      json["error"].should eql 'rain!'
-      json["backtrace"].length.should > 0
+      expect(json["error"]).to eql 'rain!'
+      expect(json["backtrace"].length).to be > 0
     end
     it 'rescues error! and return txt' do
       subject.format :txt
@@ -1466,7 +1523,7 @@ describe Grape::API do
         error!("Access Denied", 401)
       end
       get '/error'
-      last_response.body.should eql "Access Denied"
+      expect(last_response.body).to eql "Access Denied"
     end
     it 'rescues error! and return json' do
       subject.format :json
@@ -1474,7 +1531,7 @@ describe Grape::API do
         error!("Access Denied", 401)
       end
       get '/error'
-      last_response.body.should eql '{"error":"Access Denied"}'
+      expect(last_response.body).to eql '{"error":"Access Denied"}'
     end
   end
 
@@ -1485,7 +1542,7 @@ describe Grape::API do
         "some binary content"
       end
       get '/excel.xls'
-      last_response.content_type.should == "application/vnd.ms-excel"
+      expect(last_response.content_type).to eq("application/vnd.ms-excel")
     end
     it 'allows to override content-type' do
       subject.get :content do
@@ -1493,7 +1550,7 @@ describe Grape::API do
         "var x = 1;"
       end
       get '/content'
-      last_response.content_type.should == "text/javascript"
+      expect(last_response.content_type).to eq("text/javascript")
     end
     it 'removes existing content types' do
       subject.content_type :xls, "application/vnd.ms-excel"
@@ -1501,8 +1558,8 @@ describe Grape::API do
         "some binary content"
       end
       get '/excel.json'
-      last_response.status.should == 406
-      last_response.body.should == "The requested format 'txt' is not supported."
+      expect(last_response.status).to eq(406)
+      expect(last_response.body).to eq("The requested format 'txt' is not supported.")
     end
   end
 
@@ -1517,11 +1574,11 @@ describe Grape::API do
       end
       it 'sets one formatter' do
         get '/simple.json'
-        last_response.body.should eql '{"custom_formatter":"hash"}'
+        expect(last_response.body).to eql '{"custom_formatter":"hash"}'
       end
       it 'sets another formatter' do
         get '/simple.txt'
-        last_response.body.should eql 'custom_formatter: hash'
+        expect(last_response.body).to eql 'custom_formatter: hash'
       end
     end
     context 'custom formatter' do
@@ -1535,11 +1592,11 @@ describe Grape::API do
       end
       it 'uses json' do
         get '/simple.json'
-        last_response.body.should eql '{"some":"hash"}'
+        expect(last_response.body).to eql '{"some":"hash"}'
       end
       it 'uses custom formatter' do
         get '/simple.custom', 'HTTP_ACCEPT' => 'application/custom'
-        last_response.body.should eql '{"custom_formatter":"hash"}'
+        expect(last_response.body).to eql '{"custom_formatter":"hash"}'
       end
     end
     context 'custom formatter class' do
@@ -1558,11 +1615,11 @@ describe Grape::API do
       end
       it 'uses json' do
         get '/simple.json'
-        last_response.body.should eql '{"some":"hash"}'
+        expect(last_response.body).to eql '{"some":"hash"}'
       end
       it 'uses custom formatter' do
         get '/simple.custom', 'HTTP_ACCEPT' => 'application/custom'
-        last_response.body.should eql '{"custom_formatter":"hash"}'
+        expect(last_response.body).to eql '{"custom_formatter":"hash"}'
       end
     end
   end
@@ -1574,8 +1631,8 @@ describe Grape::API do
         { x: params[:x] }
       end
       post "/data", '{"x":42}', 'CONTENT_TYPE' => 'application/json'
-      last_response.status.should == 201
-      last_response.body.should == '{"x":42}'
+      expect(last_response.status).to eq(201)
+      expect(last_response.body).to eq('{"x":42}')
     end
     context 'lambda parser' do
       before :each do
@@ -1589,8 +1646,8 @@ describe Grape::API do
       ["text/custom", "text/custom; charset=UTF-8"].each do |content_type|
         it "uses parser for #{content_type}" do
           put '/simple', "simple", "CONTENT_TYPE" => content_type
-          last_response.status.should == 200
-          last_response.body.should eql "elpmis"
+          expect(last_response.status).to eq(200)
+          expect(last_response.body).to eql "elpmis"
         end
       end
     end
@@ -1610,8 +1667,8 @@ describe Grape::API do
       end
       it 'uses custom parser' do
         put '/simple', "simple", "CONTENT_TYPE" => "text/custom"
-        last_response.status.should == 200
-        last_response.body.should eql "elpmis"
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eql "elpmis"
       end
     end
     context "multi_xml" do
@@ -1620,8 +1677,8 @@ describe Grape::API do
           params[:tag]
         end
         put '/yaml', '<tag type="symbol">a123</tag>', "CONTENT_TYPE" => "application/xml"
-        last_response.status.should == 400
-        last_response.body.should eql 'Disallowed type attribute: "symbol"'
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eql 'Disallowed type attribute: "symbol"'
       end
     end
     context "none parser class" do
@@ -1633,8 +1690,8 @@ describe Grape::API do
       end
       it "does not parse data" do
         put '/data', 'not valid json', "CONTENT_TYPE" => "application/json"
-        last_response.status.should == 200
-        last_response.body.should == "body: not valid json"
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq("body: not valid json")
       end
     end
   end
@@ -1649,16 +1706,16 @@ describe Grape::API do
         { x: 42 }
       end
       get "/data"
-      last_response.status.should == 200
-      last_response.body.should == '{"x":42}'
+      expect(last_response.status).to eq(200)
+      expect(last_response.body).to eq('{"x":42}')
     end
     it 'parses data in default format' do
       subject.post '/data' do
         { x: params[:x] }
       end
       post "/data", '{"x":42}', "CONTENT_TYPE" => ""
-      last_response.status.should == 201
-      last_response.body.should == '{"x":42}'
+      expect(last_response.status).to eq(201)
+      expect(last_response.body).to eq('{"x":42}')
     end
   end
 
@@ -1670,7 +1727,7 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception'
-      last_response.status.should eql 200
+      expect(last_response.status).to eql 200
     end
     it 'has a default error status' do
       subject.rescue_from :all
@@ -1678,7 +1735,7 @@ describe Grape::API do
         raise "rain!"
       end
       get '/exception'
-      last_response.status.should eql 500
+      expect(last_response.status).to eql 500
     end
     it 'uses the default error status in error!' do
       subject.rescue_from :all
@@ -1687,14 +1744,14 @@ describe Grape::API do
         error! "rain!"
       end
       get '/exception'
-      last_response.status.should eql 400
+      expect(last_response.status).to eql 400
     end
   end
 
   context 'routes' do
     describe 'empty api structure' do
       it 'returns an empty array of routes' do
-        subject.routes.should == []
+        expect(subject.routes).to eq([])
       end
     end
     describe 'single method api structure' do
@@ -1704,11 +1761,11 @@ describe Grape::API do
         end
       end
       it 'returns one route' do
-        subject.routes.size.should == 1
+        expect(subject.routes.size).to eq(1)
         route = subject.routes[0]
-        route.route_version.should be_nil
-        route.route_path.should == "/ping(.:format)"
-        route.route_method.should == "GET"
+        expect(route.route_version).to be_nil
+        expect(route.route_path).to eq("/ping(.:format)")
+        expect(route.route_method).to eq("GET")
       end
     end
     describe 'api structure with two versions and a namespace' do
@@ -1729,25 +1786,25 @@ describe Grape::API do
         end
       end
       it 'returns the latest version set' do
-        subject.version.should == 'v2'
+        expect(subject.version).to eq('v2')
       end
       it 'returns versions' do
-        subject.versions.should == ['v1', 'v2']
+        expect(subject.versions).to eq(['v1', 'v2'])
       end
       it 'sets route paths' do
-        subject.routes.size.should >= 2
-        subject.routes[0].route_path.should == "/:version/version(.:format)"
-        subject.routes[1].route_path.should == "/p/:version/n1/n2/version(.:format)"
+        expect(subject.routes.size).to be >= 2
+        expect(subject.routes[0].route_path).to eq("/:version/version(.:format)")
+        expect(subject.routes[1].route_path).to eq("/p/:version/n1/n2/version(.:format)")
       end
       it 'sets route versions' do
-        subject.routes[0].route_version.should == 'v1'
-        subject.routes[1].route_version.should == 'v2'
+        expect(subject.routes[0].route_version).to eq('v1')
+        expect(subject.routes[1].route_version).to eq('v2')
       end
       it 'sets a nested namespace' do
-        subject.routes[1].route_namespace.should == "/n1/n2"
+        expect(subject.routes[1].route_namespace).to eq("/n1/n2")
       end
       it 'sets prefix' do
-        subject.routes[1].route_prefix.should == 'p'
+        expect(subject.routes[1].route_prefix).to eq('p')
       end
     end
     describe 'api structure with additional parameters' do
@@ -1758,16 +1815,16 @@ describe Grape::API do
       end
       it 'splits a string' do
         get "/split/a,b,c.json", token: ','
-        last_response.body.should == '["a","b","c"]'
+        expect(last_response.body).to eq('["a","b","c"]')
       end
       it 'splits a string with limit' do
         get "/split/a,b,c.json", token: ',', limit: '2'
-        last_response.body.should == '["a","b,c"]'
+        expect(last_response.body).to eq('["a","b,c"]')
       end
       it 'sets route_params' do
-        subject.routes.map { |route|
+        expect(subject.routes.map { |route|
           { params: route.route_params, optional_params: route.route_optional_params }
-        }.should eq [
+        }).to eq [
           { params: { "string" => "", "token" => "a token" }, optional_params: { "limit" => "the limit" } }
       ]
       end
@@ -1776,30 +1833,30 @@ describe Grape::API do
 
   context 'desc' do
     it 'empty array of routes' do
-      subject.routes.should == []
+      expect(subject.routes).to eq([])
     end
     it 'empty array of routes' do
       subject.desc "grape api"
-      subject.routes.should == []
+      expect(subject.routes).to eq([])
     end
     it 'describes a method' do
       subject.desc "first method"
       subject.get :first do ; end
-      subject.routes.length.should == 1
+      expect(subject.routes.length).to eq(1)
       route = subject.routes.first
-      route.route_description.should == "first method"
-      route.route_foo.should be_nil
-      route.route_params.should == {}
+      expect(route.route_description).to eq("first method")
+      expect(route.route_foo).to be_nil
+      expect(route.route_params).to eq({})
     end
     it 'describes methods separately' do
       subject.desc "first method"
       subject.get :first do ; end
       subject.desc "second method"
       subject.get :second do ; end
-      subject.routes.count.should == 2
-      subject.routes.map { |route|
+      expect(subject.routes.count).to eq(2)
+      expect(subject.routes.map { |route|
         { description: route.route_description, params: route.route_params }
-      }.should eq [
+      }).to eq [
         { description: "first method", params: {} },
         { description: "second method", params: {} }
     ]
@@ -1808,9 +1865,9 @@ describe Grape::API do
       subject.desc "first method"
       subject.get :first do ; end
       subject.get :second do ; end
-      subject.routes.map { |route|
+      expect(subject.routes.map { |route|
         { description: route.route_description, params: route.route_params }
-      }.should eq [
+      }).to eq [
         { description: "first method", params: {} },
         { description: nil, params: {} }
     ]
@@ -1820,19 +1877,19 @@ describe Grape::API do
         desc "ns second", foo: "bar"
         get 'second' do ; end
       end
-      subject.routes.map { |route|
+      expect(subject.routes.map { |route|
         { description: route.route_description, foo: route.route_foo, params: route.route_params }
-      }.should eq [
-        { description: "ns second", foo: "bar", params: {} },
+      }).to eq [
+        { description: "ns second", foo: "bar", params: {} }
     ]
     end
     it 'includes details' do
       subject.desc "method", details: "method details"
       subject.get 'method' do ; end
-      subject.routes.map { |route|
+      expect(subject.routes.map { |route|
         { description: route.route_description, details: route.route_details, params: route.route_params }
-      }.should eq [
-        { description: "method", details: "method details", params: {} },
+      }).to eq [
+        { description: "method", details: "method details", params: {} }
     ]
     end
     it 'describes a method with parameters' do
@@ -1840,9 +1897,9 @@ describe Grape::API do
       subject.get 'reverse' do
         params[:s].reverse
       end
-      subject.routes.map { |route|
+      expect(subject.routes.map { |route|
         { description: route.route_description, params: route.route_params }
-      }.should eq [
+      }).to eq [
         { description: "Reverses a string.", params: { "s" => { desc: "string to reverse", type: "string" } } }
     ]
     end
@@ -1858,9 +1915,9 @@ describe Grape::API do
         end
         get 'method' do ; end
       end
-      subject.routes.map { |route|
+      expect(subject.routes.map { |route|
         { description: route.route_description, params: route.route_params }
-      }.should eq [
+      }).to eq [
         { description: "method",
           params: {
             "ns_param" => { required: true, desc: "namespace parameter" },
@@ -1889,9 +1946,9 @@ describe Grape::API do
           get 'method' do ; end
         end
       end
-      subject.routes.map { |route|
+      expect(subject.routes.map { |route|
         { description: route.route_description, params: route.route_params }
-      }.should eq [
+      }).to eq [
         { description: "method",
           params: {
             "ns_param" => { required: true, desc: "ns param 2" },
@@ -1916,9 +1973,9 @@ describe Grape::API do
       end
       subject.get "method" do ; end
 
-      subject.routes.map { |route|
+      expect(subject.routes.map { |route|
         route.route_params
-      }.should eq [{
+      }).to eq [{
         "group1"         => { required: true, type: "Array" },
         "group1[param1]" => { required: false, desc: "group1 param1 desc" },
         "group1[param2]" => { required: true, desc: "group1 param2 desc" },
@@ -1936,9 +1993,9 @@ describe Grape::API do
         end
       end
       subject.get 'method' do ; end
-      subject.routes.map { |route|
+      expect(subject.routes.map { |route|
         { description: route.route_description, params: route.route_params }
-      }.should eq [
+      }).to eq [
         { description: "nesting",
           params: {
             "root_param" => { required: true, desc: "root param" },
@@ -1960,9 +2017,9 @@ describe Grape::API do
         requires :one_param, desc: "one param"
       end
       subject.get 'method' do ; end
-      subject.routes.map { |route|
+      expect(subject.routes.map { |route|
         { description: route.route_description, params: route.route_params }
-      }.should eq [
+      }).to eq [
         { description: nil, params: { "one_param" => { required: true, desc: "one param" } } }
     ]
     end
@@ -1971,9 +2028,9 @@ describe Grape::API do
       subject.get 'reverse/:s' do
         params[:s].reverse
       end
-      subject.routes.map { |route|
+      expect(subject.routes.map { |route|
         { description: route.route_description, params: route.route_params }
-      }.should eq [
+      }).to eq [
         { description: "Reverses a string.", params: { "s" => { desc: "string to reverse", type: "string" } } }
     ]
     end
@@ -1989,12 +2046,12 @@ describe Grape::API do
 
       it 'makes a bare Rack app available at the endpoint' do
         get '/mounty'
-        last_response.body.should == 'MOUNTED'
+        expect(last_response.body).to eq('MOUNTED')
       end
 
       it 'anchors the routes, passing all subroutes to it' do
         get '/mounty/awesome'
-        last_response.body.should == 'MOUNTED'
+        expect(last_response.body).to eq('MOUNTED')
       end
 
       it 'is able to cascade' do
@@ -2005,9 +2062,9 @@ describe Grape::API do
         } => '/'
 
         get '/boo'
-        last_response.body.should == 'Farfegnugen'
+        expect(last_response.body).to eq('Farfegnugen')
         get '/mounty'
-        last_response.body.should == 'MOUNTED'
+        expect(last_response.body).to eq('MOUNTED')
       end
     end
 
@@ -2015,7 +2072,7 @@ describe Grape::API do
       it 'calls through setting the route to "/"' do
         subject.mount mounted_app
         get '/'
-        last_response.body.should == 'MOUNTED'
+        expect(last_response.body).to eq('MOUNTED')
       end
     end
 
@@ -2033,7 +2090,7 @@ describe Grape::API do
         end
 
         get '/v1/cool/awesome'
-        last_response.body.should == 'yo'
+        expect(last_response.body).to eq('yo')
       end
 
       it 'applies the settings to nested mounted apis' do
@@ -2051,7 +2108,7 @@ describe Grape::API do
         end
 
         get '/v1/cool/awesome'
-        last_response.body.should == 'yo'
+        expect(last_response.body).to eq('yo')
       end
 
       it 'inherits rescues even when some defined by mounted' do
@@ -2065,8 +2122,8 @@ describe Grape::API do
           mount app
         end
         get '/mounted/fail'
-        last_response.status.should eql 202
-        last_response.body.should == 'rescued from doh!'
+        expect(last_response.status).to eql 202
+        expect(last_response.body).to eq('rescued from doh!')
       end
 
       it 'collects the routes of the mounted api' do
@@ -2076,9 +2133,9 @@ describe Grape::API do
           app.post('/sauce') {}
           mount app
         end
-        subject.routes.size.should == 2
-        subject.routes.first.route_path.should =~ %r{\/cool\/awesome}
-        subject.routes.last.route_path.should =~ %r{\/cool\/sauce}
+        expect(subject.routes.size).to eq(2)
+        expect(subject.routes.first.route_path).to match(%r{\/cool\/awesome})
+        expect(subject.routes.last.route_path).to match(%r{\/cool\/sauce})
       end
 
       it 'mounts on a path' do
@@ -2090,8 +2147,8 @@ describe Grape::API do
           mount app => '/mounted'
         end
         get "/mounted/cool/awesome"
-        last_response.status.should == 200
-        last_response.body.should == "sauce"
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq("sauce")
       end
 
       it 'mounts on a nested path' do
@@ -2104,10 +2161,10 @@ describe Grape::API do
         subject.mount app1 => '/app1'
         app1.mount app2 => '/app2'
         get "/app1/app2/nice"
-        last_response.status.should == 200
-        last_response.body.should == "play"
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq("play")
         options "/app1/app2/nice"
-        last_response.status.should == 204
+        expect(last_response.status).to eq(204)
       end
 
       it 'responds to options' do
@@ -2124,15 +2181,15 @@ describe Grape::API do
           mount app
         end
         get '/apples/colour'
-        last_response.status.should eql 200
-        last_response.body.should == 'red'
+        expect(last_response.status).to eql 200
+        expect(last_response.body).to eq('red')
         options '/apples/colour'
-        last_response.status.should eql 204
+        expect(last_response.status).to eql 204
         get '/apples/pears/colour'
-        last_response.status.should eql 200
-        last_response.body.should == 'green'
+        expect(last_response.status).to eql 200
+        expect(last_response.body).to eq('green')
         options '/apples/pears/colour'
-        last_response.status.should eql 204
+        expect(last_response.status).to eql 204
       end
 
       it 'responds to options with path versioning' do
@@ -2146,10 +2203,10 @@ describe Grape::API do
         end
 
         get '/v1/apples/colour'
-        last_response.status.should eql 200
-        last_response.body.should == 'red'
+        expect(last_response.status).to eql 200
+        expect(last_response.body).to eq('red')
         options '/v1/apples/colour'
-        last_response.status.should eql 204
+        expect(last_response.status).to eql 204
       end
 
     end
@@ -2159,15 +2216,15 @@ describe Grape::API do
     it 'adds one for each route created' do
       subject.get '/'
       subject.post '/'
-      subject.endpoints.size.should == 2
+      expect(subject.endpoints.size).to eq(2)
     end
   end
 
   describe '.compile' do
     it 'sets the instance' do
-      subject.instance.should be_nil
+      expect(subject.instance).to be_nil
       subject.compile
-      subject.instance.should be_kind_of(subject)
+      expect(subject.instance).to be_kind_of(subject)
     end
   end
 
@@ -2175,7 +2232,7 @@ describe Grape::API do
     it 'invalidates any compiled instance' do
       subject.compile
       subject.change!
-      subject.instance.should be_nil
+      expect(subject.instance).to be_nil
     end
   end
 
@@ -2192,9 +2249,9 @@ describe Grape::API do
     it 'path' do
       get '/endpoint/options'
       options = MultiJson.load(last_response.body)
-      options["path"].should == ["/endpoint/options"]
-      options["source_location"][0].should include "api_spec.rb"
-      options["source_location"][1].to_i.should > 0
+      expect(options["path"]).to eq(["/endpoint/options"])
+      expect(options["source_location"][0]).to include "api_spec.rb"
+      expect(options["source_location"][1].to_i).to be > 0
     end
   end
 
@@ -2210,9 +2267,9 @@ describe Grape::API do
       end
       it 'provides access to route info' do
         get '/'
-        last_response.body.should == "/(.:format)"
+        expect(last_response.body).to eq("/(.:format)")
         get '/path'
-        last_response.body.should == "/path(.:format)"
+        expect(last_response.body).to eq("/path(.:format)")
       end
     end
     context 'with desc' do
@@ -2228,11 +2285,11 @@ describe Grape::API do
       end
       it 'returns route description' do
         get '/description'
-        last_response.body.should == "returns description"
+        expect(last_response.body).to eq("returns description")
       end
       it 'returns route parameters' do
         get '/params/x'
-        last_response.body.should == "y"
+        expect(last_response.body).to eq("y")
       end
     end
   end
@@ -2247,15 +2304,15 @@ describe Grape::API do
       end
       it 'forces txt without an extension' do
         get '/meaning_of_life'
-        last_response.body.should == { meaning_of_life: 42 }.to_s
+        expect(last_response.body).to eq({ meaning_of_life: 42 }.to_s)
       end
       it 'does not force txt with an extension' do
         get '/meaning_of_life.json'
-        last_response.body.should == { meaning_of_life: 42 }.to_json
+        expect(last_response.body).to eq({ meaning_of_life: 42 }.to_json)
       end
       it 'forces txt from a non-accepting header' do
         get '/meaning_of_life', {}, 'HTTP_ACCEPT' => 'application/json'
-        last_response.body.should == { meaning_of_life: 42 }.to_s
+        expect(last_response.body).to eq({ meaning_of_life: 42 }.to_s)
       end
     end
     context ':txt only' do
@@ -2267,15 +2324,15 @@ describe Grape::API do
       end
       it 'forces txt without an extension' do
         get '/meaning_of_life'
-        last_response.body.should == { meaning_of_life: 42 }.to_s
+        expect(last_response.body).to eq({ meaning_of_life: 42 }.to_s)
       end
       it 'forces txt with the wrong extension' do
         get '/meaning_of_life.json'
-        last_response.body.should == { meaning_of_life: 42 }.to_s
+        expect(last_response.body).to eq({ meaning_of_life: 42 }.to_s)
       end
       it 'forces txt from a non-accepting header' do
         get '/meaning_of_life', {}, 'HTTP_ACCEPT' => 'application/json'
-        last_response.body.should == { meaning_of_life: 42 }.to_s
+        expect(last_response.body).to eq({ meaning_of_life: 42 }.to_s)
       end
     end
     context ':json' do
@@ -2288,15 +2345,15 @@ describe Grape::API do
       end
       it 'forces json without an extension' do
         get '/meaning_of_life'
-        last_response.body.should == { meaning_of_life: 42 }.to_json
+        expect(last_response.body).to eq({ meaning_of_life: 42 }.to_json)
       end
       it 'does not force json with an extension' do
         get '/meaning_of_life.txt'
-        last_response.body.should == { meaning_of_life: 42 }.to_s
+        expect(last_response.body).to eq({ meaning_of_life: 42 }.to_s)
       end
       it 'forces json from a non-accepting header' do
         get '/meaning_of_life', {}, 'HTTP_ACCEPT' => 'text/html'
-        last_response.body.should == { meaning_of_life: 42 }.to_json
+        expect(last_response.body).to eq({ meaning_of_life: 42 }.to_json)
       end
       it 'can be overwritten with an explicit content type' do
         subject.get '/meaning_of_life_with_content_type' do
@@ -2304,7 +2361,7 @@ describe Grape::API do
           { meaning_of_life: 42 }.to_s
         end
         get '/meaning_of_life_with_content_type'
-        last_response.body.should == { meaning_of_life: 42 }.to_s
+        expect(last_response.body).to eq({ meaning_of_life: 42 }.to_s)
       end
       it 'raised :error from middleware' do
         middleware = Class.new(Grape::Middleware::Base) do
@@ -2317,8 +2374,8 @@ describe Grape::API do
 
         end
         get "/"
-        last_response.status.should == 42
-        last_response.body.should == { error: "Unauthorized" }.to_json
+        expect(last_response.status).to eq(42)
+        expect(last_response.body).to eq({ error: "Unauthorized" }.to_json)
       end
 
     end
@@ -2336,21 +2393,21 @@ describe Grape::API do
           SerializableHashExample.new
         end
         get '/example'
-        last_response.body.should == '{"abc":"def"}'
+        expect(last_response.body).to eq('{"abc":"def"}')
       end
       it 'root' do
         subject.get '/example' do
           { "root" => SerializableHashExample.new }
         end
         get '/example'
-        last_response.body.should == '{"root":{"abc":"def"}}'
+        expect(last_response.body).to eq('{"root":{"abc":"def"}}')
       end
       it 'array' do
         subject.get '/examples' do
           [SerializableHashExample.new, SerializableHashExample.new]
         end
         get '/examples'
-        last_response.body.should == '[{"abc":"def"},{"abc":"def"}]'
+        expect(last_response.body).to eq('[{"abc":"def"},{"abc":"def"}]')
       end
     end
     context ":xml" do
@@ -2362,8 +2419,8 @@ describe Grape::API do
           "example"
         end
         get '/example'
-        last_response.status.should == 500
-        last_response.body.should == <<-XML
+        expect(last_response.status).to eq(500)
+        expect(last_response.body).to eq <<-XML
 <?xml version="1.0" encoding="UTF-8"?>
 <error>
   <message>cannot convert String to xml</message>
@@ -2378,8 +2435,8 @@ XML
         ]
         end
         get '/example'
-        last_response.status.should == 200
-        last_response.body.should == <<-XML
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq <<-XML
 <?xml version="1.0" encoding="UTF-8"?>
 <hash>
   <example1>example1</example1>
@@ -2392,8 +2449,8 @@ XML
           ["example1", "example2"]
         end
         get '/example'
-        last_response.status.should == 200
-        last_response.body.should == <<-XML
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq <<-XML
 <?xml version="1.0" encoding="UTF-8"?>
 <strings type="array">
   <string>example1</string>
@@ -2412,8 +2469,8 @@ XML
 
         end
         get "/"
-        last_response.status.should == 42
-        last_response.body.should == <<-XML
+        expect(last_response.status).to eq(42)
+        expect(last_response.body).to eq <<-XML
 <?xml version="1.0" encoding="UTF-8"?>
 <error>
   <message>Unauthorized</message>
@@ -2444,14 +2501,14 @@ XML
           error!("Unrecognized request path: #{params[:path] } - #{env['PATH_INFO'] }#{env['SCRIPT_NAME'] }", 404)
         end
         get "/v1/hello"
-        last_response.status.should == 200
-        last_response.body.should == "v1"
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq("v1")
         get "/v2/hello"
-        last_response.status.should == 200
-        last_response.body.should == "v2"
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq("v2")
         get "/foobar"
-        last_response.status.should == 404
-        last_response.body.should == "Unrecognized request path: foobar - /foobar"
+        expect(last_response.status).to eq(404)
+        expect(last_response.body).to eq("Unrecognized request path: foobar - /foobar")
       end
     end
   end
@@ -2461,28 +2518,28 @@ XML
       it "cascades" do
         subject.version 'v1', using: :path, cascade: true
         get "/v1/hello"
-        last_response.status.should == 404
-        last_response.headers["X-Cascade"].should == "pass"
+        expect(last_response.status).to eq(404)
+        expect(last_response.headers["X-Cascade"]).to eq("pass")
       end
       it "does not cascade" do
         subject.version 'v2', using: :path, cascade: false
         get "/v2/hello"
-        last_response.status.should == 404
-        last_response.headers.keys.should_not include "X-Cascade"
+        expect(last_response.status).to eq(404)
+        expect(last_response.headers.keys).not_to include "X-Cascade"
       end
     end
     context "via endpoint" do
       it "cascades" do
         subject.cascade true
         get "/hello"
-        last_response.status.should == 404
-        last_response.headers["X-Cascade"].should == "pass"
+        expect(last_response.status).to eq(404)
+        expect(last_response.headers["X-Cascade"]).to eq("pass")
       end
       it "does not cascade" do
         subject.cascade false
         get "/hello"
-        last_response.status.should == 404
-        last_response.headers.keys.should_not include "X-Cascade"
+        expect(last_response.status).to eq(404)
+        expect(last_response.headers.keys).not_to include "X-Cascade"
       end
     end
   end
@@ -2495,8 +2552,8 @@ XML
         'foo'
       end
       get '/something'
-      last_response.status.should == 406
-      last_response.body.should == "{\"error\":\"The requested format 'txt' is not supported.\"}"
+      expect(last_response.status).to eq(406)
+      expect(last_response.body).to eq("{\"error\":\"The requested format 'txt' is not supported.\"}")
     end
   end
 end