param_spec.rb in grape-0.6.1

- old
+ new
@@ -1,58 +1,57 @@
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner::Param do
 
-  let(:app) { lambda{|env| [200, env, env['api.version']]} }
+  let(:app) { lambda { |env| [200, env, env['api.version']] } }
   subject { Grape::Middleware::Versioner::Param.new(app, @options || {}) }
 
   it 'sets the API version based on the default param (apiver)' do
-    env = Rack::MockRequest.env_for("/awesome", {:params => {"apiver" => "v1"}})
+    env = Rack::MockRequest.env_for("/awesome", { params: { "apiver" => "v1" } })
     subject.call(env)[1]["api.version"].should == 'v1'
   end
 
-  it 'cuts (only) the version out of the params', :focus => true do
-    env = Rack::MockRequest.env_for("/awesome", {:params => {"apiver" => "v1", "other_param" => "5"}})
+  it 'cuts (only) the version out of the params', focus: true do
+    env = Rack::MockRequest.env_for("/awesome", { params: { "apiver" => "v1", "other_param" => "5" } })
     subject.call(env)[1]['rack.request.query_hash']["apiver"].should be_nil
     subject.call(env)[1]['rack.request.query_hash']["other_param"].should == "5"
   end
 
   it 'provides a nil version if no version is given' do
     env = Rack::MockRequest.env_for("/")
     subject.call(env).last.should be_nil
   end
 
   context 'with specified parameter name' do
-    before{ @options = {:parameter => ['v']}}
+    before { @options = { parameter: 'v' } }
     it 'sets the API version based on the custom parameter name' do
-      env = Rack::MockRequest.env_for("/awesome", {:params => {"v" => "v1"}})
-      s = subject.call(env)[1]["api.version"] == "v1"
+      env = Rack::MockRequest.env_for("/awesome", { params: { "v" => "v1" } })
+      subject.call(env)[1]["api.version"].should == "v1"
     end
     it 'does not set the API version based on the default param' do
-      env = Rack::MockRequest.env_for("/awesome", {:params => {"apiver" => "v1"}})
-      s = subject.call(env)[1]["api.version"] == nil
+      env = Rack::MockRequest.env_for("/awesome", { params: { "apiver" => "v1" } })
+      subject.call(env)[1]["api.version"].should be_nil
     end
   end
 
   context 'with specified versions' do
-    before{ @options = {:versions => ['v1', 'v2']}}
+    before { @options = { versions: ['v1', 'v2'] } }
     it 'throws an error if a non-allowed version is specified' do
-      env = Rack::MockRequest.env_for("/awesome", {:params => {"apiver" => "v3"}})
-      catch(:error){subject.call(env)}[:status].should == 404
+      env = Rack::MockRequest.env_for("/awesome", { params: { "apiver" => "v3" } })
+      catch(:error) { subject.call(env) }[:status].should == 404
     end
-
     it 'allows versions that have been specified' do
-      env = Rack::MockRequest.env_for("/awesome", {:params => {"apiver" => "v1"}})
+      env = Rack::MockRequest.env_for("/awesome", { params: { "apiver" => "v1" } })
       subject.call(env)[1]["api.version"].should == 'v1'
     end
   end
 
   it 'returns a 200 when no version is set (matches the first version found)' do
     @options = {
-      :versions => ['v1'],
-      :version_options => {:using => :header}
+      versions: ['v1'],
+      version_options: { using: :header }
     }
-    env = Rack::MockRequest.env_for("/awesome", {:params => {}})
+    env = Rack::MockRequest.env_for("/awesome", { params: {} })
     subject.call(env).first.should == 200
   end
 
-end
\ No newline at end of file
+end