grape 0.2.3 → 0.2.4

data/spec/grape/middleware/auth/basic_spec.rb

@@ -13,18 +13,18 @@ describe Grape::Middleware::Auth::Basic do
     end
   end
   
-  it 'should throw a 401 if no auth is given' do
+  it 'throws a 401 if no auth is given' do
     @proc = lambda{ false }
     get '/whatever'
     last_response.status.should == 401
   end
   
-  it 'should authenticate if given valid creds' do
+  it 'authenticates if given valid creds' do
     get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin','admin')
     last_response.status.should == 200
   end
   
-  it 'should throw a 401 is wrong auth is given' do
+  it 'throws a 401 is wrong auth is given' do
     get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin','wrong')
     last_response.status.should == 401
   end

data/spec/grape/middleware/auth/digest_spec.rb

@@ -23,23 +23,23 @@ describe Grape::Middleware::Auth::Digest do
     Test
   end
   
-  it 'should be a digest authentication challenge' do
+  it 'is a digest authentication challenge' do
     get '/test'
     last_response.should be_challenge
   end
   
-  it 'should throw a 401 if no auth is given' do
+  it 'throws a 401 if no auth is given' do
     get '/test'
     last_response.status.should == 401
   end
 
-  it 'should authenticate if given valid creds' do
+  it 'authenticates if given valid creds' do
     digest_authorize "foo", "bar"
     get '/test'
     last_response.status.should == 200
   end
 
-  it 'should throw a 401 if given invalid creds' do
+  it 'throws a 401 if given invalid creds' do
     digest_authorize "bar", "foo"
     get '/test'
     last_response.status.should == 401

data/spec/grape/middleware/auth/oauth2_spec.rb

@@ -32,7 +32,7 @@ describe Grape::Middleware::Auth::OAuth2 do
     context 'and a valid token' do
       before { get '/awesome?oauth_token=g123' }
       
-      it 'should set env["api.token"]' do
+      it 'sets env["api.token"]' do
         last_response.body.should == 'g123'
       end
     end
@@ -44,11 +44,11 @@ describe Grape::Middleware::Auth::OAuth2 do
         end
       end
       
-      it 'should throw an error' do
+      it 'throws an error' do
         @err[:status].should == 401
       end
       
-      it 'should set the WWW-Authenticate header in the response' do
+      it 'sets the WWW-Authenticate header in the response' do
         @err[:headers]['WWW-Authenticate'].should == "OAuth realm='OAuth API', error='invalid_token'"
       end
     end
@@ -66,7 +66,7 @@ describe Grape::Middleware::Auth::OAuth2 do
   end
   
   %w(HTTP_AUTHORIZATION X_HTTP_AUTHORIZATION X-HTTP_AUTHORIZATION REDIRECT_X_HTTP_AUTHORIZATION).each do |head|  
-    context "with the token in the #{head} header" do
+    context 'with the token in the #{head} header' do
       before { get '/awesome', {}, head => 'OAuth g123' }
       it { last_response.body.should == 'g123' }
     end

data/spec/grape/middleware/base_spec.rb

@@ -9,38 +9,38 @@ describe Grape::Middleware::Base do
     subject.stub!(:dup).and_return(subject)
   end
 
-  it 'should have the app as an accessor' do
+  it 'has the app as an accessor' do
     subject.app.should == blank_app
   end
 
-  it 'should be able to access the request' do
+  it 'is able to access the request' do
     subject.call({})
     subject.request.should be_kind_of(Rack::Request)
   end
 
-  it 'should call through to the app' do
+  it 'calls through to the app' do
     subject.call({}).should == [200, {}, 'Hi there.']
   end
 
   context 'callbacks' do
-    it 'should call #before' do
+    it 'calls #before' do
       subject.should_receive(:before)
     end
 
-    it 'should call #after' do
+    it 'calls #after' do
       subject.should_receive(:after)
     end
 
     after{ subject.call!({}) }
   end
 
-  it 'should be able to access the response' do
+  it 'is able to access the response' do
     subject.call({})
     subject.response.should be_kind_of(Rack::Response)
   end
 
   context 'options' do
-    it 'should persist options passed at initialization' do
+    it 'persists options passed at initialization' do
       Grape::Middleware::Base.new(blank_app, {:abc => true}).options[:abc].should be_true
     end
 
@@ -51,11 +51,11 @@ describe Grape::Middleware::Base do
         end
       end
 
-      it 'should persist the default options' do
+      it 'persists the default options' do
         ExampleWare.new(blank_app).options[:monkey].should be_true
       end
 
-      it 'should override default options when provided' do
+      it 'overrides default options when provided' do
         ExampleWare.new(blank_app, :monkey => false).options[:monkey].should be_false
       end
     end

data/spec/grape/middleware/error_spec.rb

@@ -19,25 +19,25 @@ describe Grape::Middleware::Error do
     end
   end
   
-  it 'should set the status code appropriately' do
+  it 'sets the status code appropriately' do
     ErrApp.error = {:status => 410}
     get '/'
     last_response.status.should == 410
   end
   
-  it 'should set the error message appropriately' do
+  it 'sets the error message appropriately' do
     ErrApp.error = {:message => 'Awesome stuff.'}
     get '/'
     last_response.body.should == 'Awesome stuff.'
   end
   
-  it 'should default to a 403 status' do
+  it 'defaults to a 403 status' do
     ErrApp.error = {}
     get '/'
     last_response.status.should == 403
   end
   
-  it 'should have a default message' do
+  it 'has a default message' do
     ErrApp.error = {}
     get '/'
     last_response.body.should == 'Aww, hamburgers.'

data/spec/grape/middleware/exception_spec.rb

@@ -50,7 +50,7 @@ describe Grape::Middleware::Error do
     @app
   end
 
-  it 'should not trap errors by default' do
+  it 'does not trap errors by default' do
     @app ||= Rack::Builder.app do
       use Grape::Middleware::Error
       run ExceptionApp
@@ -59,7 +59,7 @@ describe Grape::Middleware::Error do
   end
 
   context 'with rescue_all set to true' do
-    it 'should set the message appropriately' do
+    it 'sets the message appropriately' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error, :rescue_all => true
         run ExceptionApp
@@ -68,7 +68,7 @@ describe Grape::Middleware::Error do
       last_response.body.should == "rain!"
     end
 
-    it 'should default to a 403 status' do
+    it 'defaults to a 403 status' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error, :rescue_all => true
         run ExceptionApp
@@ -77,7 +77,7 @@ describe Grape::Middleware::Error do
       last_response.status.should == 403
     end
 
-    it 'should be possible to specify a different default status code' do
+    it 'is possible to specify a different default status code' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error, :rescue_all => true, :default_status => 500
         run ExceptionApp
@@ -86,7 +86,7 @@ describe Grape::Middleware::Error do
       last_response.status.should == 500
     end
 
-    it 'should be possible to return errors in json format' do
+    it 'is possible to return errors in json format' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error, :rescue_all => true, :format => :json
         run ExceptionApp
@@ -95,17 +95,17 @@ describe Grape::Middleware::Error do
       last_response.body.should == '{"error":"rain!"}'
     end
 
-    it 'should be possible to return hash errors in json format' do
+    it 'is possible to return hash errors in json format' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error, :rescue_all => true, :format => :json
         run ErrorHashApp
       end
       get '/'
       ['{"error":"rain!","detail":"missing widget"}',
-       '{"detail":"missing widget","error":"rain!"}'].should be_include(last_response.body)
+       '{"detail":"missing widget","error":"rain!"}'].should include(last_response.body)
     end
 
-    it 'should be possible to return errors in xml format' do
+    it 'is possible to return errors in xml format' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error, :rescue_all => true, :format => :xml
         run ExceptionApp
@@ -114,17 +114,17 @@ describe Grape::Middleware::Error do
       last_response.body.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<error>\n  <message>rain!</message>\n</error>\n"
     end
 
-    it 'should be possible to return hash errors in xml format' do
+    it 'is possible to return hash errors in xml format' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error, :rescue_all => true, :format => :xml
         run ErrorHashApp
       end
       get '/'
       ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<error>\n  <detail>missing widget</detail>\n  <error>rain!</error>\n</error>\n",
-       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<error>\n  <error>rain!</error>\n  <detail>missing widget</detail>\n</error>\n"].should be_include(last_response.body)
+       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<error>\n  <error>rain!</error>\n  <detail>missing widget</detail>\n</error>\n"].should include(last_response.body)
     end
 
-    it 'should be possible to specify a custom formatter' do
+    it 'is possible to specify a custom formatter' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error,
           :rescue_all => true,
@@ -140,7 +140,7 @@ describe Grape::Middleware::Error do
       last_response.body.should == '{:custom_formatter=>"rain!"}'
     end
 
-    it 'should not trap regular error! codes' do
+    it 'does not trap regular error! codes' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error
         run AccessDeniedApp
@@ -149,7 +149,7 @@ describe Grape::Middleware::Error do
       last_response.status.should == 401
     end
 
-    it 'should respond to custom Grape exceptions appropriately' do
+    it 'responds to custom Grape exceptions appropriately' do
       @app ||= Rack::Builder.app do
         use Grape::Middleware::Error, :rescue_all => false
         run CustomErrorApp

data/spec/grape/middleware/formatter_spec.rb

@@ -7,13 +7,13 @@ describe Grape::Middleware::Formatter do
   let(:app){ lambda{|env| [200, {}, [@body]]} }
 
   context 'serialization' do
-    it 'should look at the bodies for possibly serializable data' do
+    it 'looks at the bodies for possibly serializable data' do
       @body = {"abc" => "def"}
       status, headers, bodies = *subject.call({'PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json'})
       bodies.each{|b| b.should == MultiJson.dump(@body) }
     end
 
-    it 'should call #to_json since default format is json' do
+    it 'calls #to_json since default format is json' do
       @body = ['foo']
       @body.instance_eval do
         def to_json
@@ -24,7 +24,7 @@ describe Grape::Middleware::Formatter do
       subject.call({'PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json'}).last.each{|b| b.should == '"bar"'}
     end
 
-    it 'should call #to_xml if the content type is xml' do
+    it 'calls #to_xml if the content type is xml' do
       @body = "string"
       @body.instance_eval do
         def to_xml
@@ -37,89 +37,89 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'detection' do
-    it 'should use the extension if one is provided' do
+    it 'uses the extension if one is provided' do
       subject.call({'PATH_INFO' => '/info.xml'})
       subject.env['api.format'].should == :xml
       subject.call({'PATH_INFO' => '/info.json'})
       subject.env['api.format'].should == :json
     end
 
-    it 'should use the format parameter if one is provided' do
+    it 'uses the format parameter if one is provided' do
       subject.call({'PATH_INFO' => '/somewhere','QUERY_STRING' => 'format=json'})
       subject.env['api.format'].should == :json
       subject.call({'PATH_INFO' => '/somewhere','QUERY_STRING' => 'format=xml'})
       subject.env['api.format'].should == :xml
     end
 
-    it 'should use the default format if none is provided' do
+    it 'uses the default format if none is provided' do
       subject.call({'PATH_INFO' => '/info'})
       subject.env['api.format'].should == :txt
     end
 
-    it 'should use the requested format if provided in headers' do
+    it 'uses the requested format if provided in headers' do
       subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/json'})
       subject.env['api.format'].should == :json
     end
 
-    it 'should use the file extension format if provided before headers' do
+    it 'uses the file extension format if provided before headers' do
       subject.call({'PATH_INFO' => '/info.txt', 'HTTP_ACCEPT' => 'application/json'})
       subject.env['api.format'].should == :txt
     end
   end
 
   context 'Accept header detection' do
-    it 'should detect from the Accept header' do
+    it 'detects from the Accept header' do
       subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/xml'})
       subject.env['api.format'].should == :xml
     end
 
-    it 'should look for case-indifferent headers' do
+    it 'looks for case-indifferent headers' do
       subject.call({'PATH_INFO' => '/info', 'http_accept' => 'application/xml'})
       subject.env['api.format'].should == :xml
     end
 
-    it 'should use quality rankings to determine formats' do
+    it 'uses quality rankings to determine formats' do
       subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/json; q=0.3,application/xml; q=1.0'})
       subject.env['api.format'].should == :xml
       subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/json; q=1.0,application/xml; q=0.3'})
       subject.env['api.format'].should == :json
     end
 
-    it 'should handle quality rankings mixed with nothing' do
+    it 'handles quality rankings mixed with nothing' do
       subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/json,application/xml; q=1.0'})
       subject.env['api.format'].should == :xml
     end
 
-    it 'should properly parse headers with other attributes' do
+    it 'parses headers with other attributes' do
       subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/json; abc=2.3; q=1.0,application/xml; q=0.7'})
       subject.env['api.format'].should == :json
     end
 
-    it 'should properly parse headers with vendor and api version' do
+    it 'parses headers with vendor and api version' do
       subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/vnd.test-v1+xml'})
       subject.env['api.format'].should == :xml
     end
 
-    it 'should properly parse headers with symbols as hash keys' do
+    it 'parses headers with symbols as hash keys' do
       subject.call({'PATH_INFO' => '/info', 'http_accept' => 'application/xml', :system_time => '091293'})
       subject.env[:system_time].should == '091293'
     end
   end
 
   context 'Content-type' do
-    it 'should be set for json' do
+    it 'is set for json' do
       _, headers, _ = subject.call({'PATH_INFO' => '/info.json'})
       headers['Content-type'].should == 'application/json'
     end
-    it 'should be set for xml' do
+    it 'is set for xml' do
       _, headers, _ = subject.call({'PATH_INFO' => '/info.xml'})
       headers['Content-type'].should == 'application/xml'
     end
-    it 'should be set for txt' do
+    it 'is set for txt' do
       _, headers, _ = subject.call({'PATH_INFO' => '/info.txt'})
       headers['Content-type'].should == 'text/plain'
     end
-    it 'should be set for custom' do
+    it 'is set for custom' do
       subject.options[:content_types] = {}
       subject.options[:content_types][:custom] = 'application/x-custom'
       _, headers, _ = subject.call({'PATH_INFO' => '/info.custom'})
@@ -128,19 +128,19 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'Format' do
-    it 'should use custom formatter' do
+    it 'uses custom formatter' do
       subject.options[:content_types] = {}
       subject.options[:content_types][:custom] = "don't care"
       subject.options[:formatters][:custom] = lambda { |obj, env| 'CUSTOM FORMAT' }
       _, _, body = subject.call({'PATH_INFO' => '/info.custom'})
       body.body.should == ['CUSTOM FORMAT']
     end
-    it 'should use default json formatter' do
+    it 'uses default json formatter' do
       @body = ['blah']
       _, _, body = subject.call({'PATH_INFO' => '/info.json'})
       body.body.should == ['["blah"]']
     end
-    it 'should use custom json formatter' do
+    it 'uses custom json formatter' do
       subject.options[:formatters][:json] = lambda { |obj, env| 'CUSTOM JSON FORMAT' }
       _, _, body = subject.call({'PATH_INFO' => '/info.json'})
       body.body.should == ['CUSTOM JSON FORMAT']
@@ -148,16 +148,16 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'Input' do
-    it 'should parse the body from a POST/PUT and put the contents into rack.request.form_hash' do
+    it 'parses the body from a POST/PUT and put the contents into rack.request.form_hash' do
       subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/json', 'rack.input' => StringIO.new('{"is_boolean":true,"string":"thing"}')})
       subject.env['rack.request.form_hash']['is_boolean'].should be_true
       subject.env['rack.request.form_hash']['string'].should == 'thing'
     end
-    it 'should parse the body from an xml POST/PUT and put the contents into rack.request.from_hash' do
+    it 'parses the body from an xml POST/PUT and put the contents into rack.request.from_hash' do
       subject.call({'PATH_INFO' => '/info.xml', 'HTTP_ACCEPT' => 'application/xml', 'rack.input' => StringIO.new('<thing><name>Test</name></thing>')})
       subject.env['rack.request.form_hash']['thing']['name'].should == 'Test'
     end
-    it 'should be able to fail gracefully if the body is regular POST content' do
+    it 'is able to fail gracefully if the body is regular POST content' do
       subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/json', 'rack.input' => StringIO.new('name=Other+Test+Thing')})
       subject.env['rack.request.form_hash'].should be_nil
     end

data/spec/grape/middleware/versioner/header_spec.rb

@@ -14,21 +14,21 @@ describe Grape::Middleware::Versioner::Header do
   end
 
   context 'api.type and api.subtype' do
-    it 'should set type and subtype to first choice of content type if no preference given' do
+    it 'sets type and subtype to first choice of content type if no preference given' do
       status, _, env = subject.call('HTTP_ACCEPT' => '*/*')
       env['api.type'].should eql 'application'
       env['api.subtype'].should eql 'vnd.vendor+xml'
       status.should == 200
     end
 
-    it 'should set preferred type' do
+    it 'sets preferred type' do
       status, _, env = subject.call('HTTP_ACCEPT' => 'application/*')
       env['api.type'].should eql 'application'
       env['api.subtype'].should eql 'vnd.vendor+xml'
       status.should == 200
     end
 
-    it 'should set preferred type and subtype' do
+    it 'sets preferred type and subtype' do
       status, _, env = subject.call('HTTP_ACCEPT' => 'text/plain')
       env['api.type'].should eql 'text'
       env['api.subtype'].should eql 'plain'
@@ -37,13 +37,13 @@ describe Grape::Middleware::Versioner::Header do
   end
 
   context 'api.format' do
-    it 'should be set' do
+    it 'is set' do
       status, _, env = subject.call('HTTP_ACCEPT' => 'application/vnd.vendor+json')
       env['api.format'].should eql 'json'
       status.should == 200
     end
 
-    it 'should be nil if not provided' do
+    it 'is nil if not provided' do
       status, _, env = subject.call('HTTP_ACCEPT' => 'application/vnd.vendor')
       env['api.format'].should eql nil
       status.should == 200
@@ -54,13 +54,13 @@ describe Grape::Middleware::Versioner::Header do
         @options[:versions] = ['v1']
       end
 
-      it 'should be set' do
+      it 'is set' do
         status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1+json')
         env['api.format'].should eql 'json'
         status.should == 200
       end
 
-      it 'should be nil if not provided' do
+      it 'is nil if not provided' do
         status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1')
         env['api.format'].should eql nil
         status.should == 200
@@ -69,19 +69,19 @@ describe Grape::Middleware::Versioner::Header do
   end
 
   context 'api.vendor' do
-    it 'should be set' do
+    it 'is set' do
       status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor')
       env['api.vendor'].should eql 'vendor'
       status.should == 200
     end
 
-    it 'should be set if format provided' do
+    it 'is set if format provided' do
       status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor+json')
       env['api.vendor'].should eql 'vendor'
       status.should == 200
     end
 
-    it 'should fail with 406 Not Acceptable if vendor is invalid' do
+    it 'fails with 406 Not Acceptable if vendor is invalid' do
       expect {
         env = subject.call('HTTP_ACCEPT' => 'application/vnd.othervendor+json').last
       }.to throw_symbol(
@@ -97,19 +97,19 @@ describe Grape::Middleware::Versioner::Header do
         @options[:versions] = ['v1']
       end
 
-      it 'should be set' do
+      it 'is set' do
         status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1')
         env['api.vendor'].should eql 'vendor'
         status.should == 200
       end
 
-      it 'should be set if format provided' do
+      it 'is set if format provided' do
         status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1+json')
         env['api.vendor'].should eql 'vendor'
         status.should == 200
       end
 
-      it 'should fail with 406 Not Acceptable if vendor is invalid' do
+      it 'fails with 406 Not Acceptable if vendor is invalid' do
         expect {
           env = subject.call('HTTP_ACCEPT' => 'application/vnd.othervendor-v1+json').last
         }.to throw_symbol(
@@ -127,19 +127,19 @@ describe Grape::Middleware::Versioner::Header do
       @options[:versions] = ['v1']
     end
 
-    it 'should be set' do
+    it 'is set' do
       status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1')
       env['api.version'].should eql 'v1'
       status.should == 200
     end
 
-    it 'should be set if format provided' do
+    it 'is set if format provided' do
       status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1+json')
       env['api.version'].should eql 'v1'
       status.should == 200
     end
 
-    it 'should fail with 406 Not Acceptable if version is invalid' do
+    it 'fails with 406 Not Acceptable if version is invalid' do
       expect {
         env = subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v2+json').last
       }.to throw_symbol(
@@ -151,12 +151,12 @@ describe Grape::Middleware::Versioner::Header do
     end
   end
 
-  it 'should succeed if :strict is not set' do
+  it 'succeeds if :strict is not set' do
     subject.call('HTTP_ACCEPT' => '').first.should == 200
     subject.call({}).first.should == 200
   end
 
-  it 'should succeed if :strict is set to false' do
+  it 'succeeds if :strict is set to false' do
     @options[:version_options][:strict] = false
     subject.call('HTTP_ACCEPT' => '').first.should == 200
     subject.call({}).first.should == 200
@@ -168,7 +168,7 @@ describe Grape::Middleware::Versioner::Header do
       @options[:version_options][:strict] = true
     end
 
-    it 'should fail with 406 Not Acceptable if header is not set' do
+    it 'fails with 406 Not Acceptable if header is not set' do
       expect {
         env = subject.call({}).last
       }.to throw_symbol(
@@ -179,7 +179,7 @@ describe Grape::Middleware::Versioner::Header do
       )
     end
 
-    it 'should fail with 406 Not Acceptable if header is empty' do
+    it 'fails with 406 Not Acceptable if header is empty' do
       expect {
         env = subject.call('HTTP_ACCEPT' => '').last
       }.to throw_symbol(
@@ -190,7 +190,7 @@ describe Grape::Middleware::Versioner::Header do
       )
     end
 
-    it 'should fail with 406 Not Acceptable if type is a range' do
+    it 'fails with 406 Not Acceptable if type is a range' do
       expect {
         env = subject.call('HTTP_ACCEPT' => '*/*').last
       }.to throw_symbol(
@@ -201,7 +201,7 @@ describe Grape::Middleware::Versioner::Header do
       )
     end
 
-    it 'should fail with 406 Not Acceptable if subtype is a range' do
+    it 'fails with 406 Not Acceptable if subtype is a range' do
       expect {
         env = subject.call('HTTP_ACCEPT' => 'application/*').last
       }.to throw_symbol(
@@ -212,7 +212,7 @@ describe Grape::Middleware::Versioner::Header do
       )
     end
 
-    it 'should succeed if proper header is set' do
+    it 'succeeds if proper header is set' do
       subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1+json').first.should == 200
     end
   end