goliath 1.0.5 → 1.0.6

data/spec/integration/http_log_spec.rb

@@ -42,7 +42,7 @@ describe HttpLog do
       mock_mongo(api)
 
       get_request({}, err) do |c|
-        c.response_header.status.should == 200
+        expect(c.response_header.status).to eq(200)
       end
     end
   end
@@ -53,9 +53,9 @@ describe HttpLog do
       mock_mongo(api)
 
       get_request({}, err) do |c|
-        c.response_header.status.should == 200
-        c.response_header['SPECIAL'].should == 'Header'
-        c.response.should == 'Hello from Responder'
+        expect(c.response_header.status).to eq(200)
+        expect(c.response_header['SPECIAL']).to eq('Header')
+        expect(c.response).to eq('Hello from Responder')
       end
     end
   end
@@ -63,8 +63,8 @@ describe HttpLog do
   context 'HTTP header handling' do
     it 'transforms back properly' do
       hl = HttpLog.new
-      hl.to_http_header("SPECIAL").should == 'Special'
-      hl.to_http_header("CONTENT_TYPE").should == 'Content-Type'
+      expect(hl.to_http_header("SPECIAL")).to eq('Special')
+      expect(hl.to_http_header("CONTENT_TYPE")).to eq('Content-Type')
     end
   end
 
@@ -75,8 +75,8 @@ describe HttpLog do
         mock_mongo(api)
 
         get_request({:query => {:first => :foo, :second => :bar, :third => :baz}}, err) do |c|
-          c.response_header.status.should == 200
-          c.response_header["PARAMS"].should == "first: foo|second: bar|third: baz"
+          expect(c.response_header.status).to eq(200)
+          expect(c.response_header["PARAMS"]).to eq("first: foo|second: bar|third: baz")
         end
       end
     end
@@ -89,8 +89,8 @@ describe HttpLog do
         mock_mongo(api)
 
         get_request({:path => '/my/request/path'}, err) do |c|
-          c.response_header.status.should == 200
-          c.response_header['PATH'].should == '/my/request/path'
+          expect(c.response_header.status).to eq(200)
+          expect(c.response_header['PATH']).to eq('/my/request/path')
         end
       end
     end
@@ -103,8 +103,8 @@ describe HttpLog do
         mock_mongo(api)
 
         get_request({:head => {:first => :foo, :second => :bar}}, err) do |c|
-          c.response_header.status.should == 200
-          c.response_header["HEADERS"].should =~ /First: foo\|Second: bar/
+          expect(c.response_header.status).to eq(200)
+          expect(c.response_header["HEADERS"]).to match(/First: foo\|Second: bar/)
         end
       end
     end
@@ -117,8 +117,8 @@ describe HttpLog do
         mock_mongo(api)
 
         get_request({}, err) do |c|
-          c.response_header.status.should == 200
-          c.response_header["METHOD"].should == "GET"
+          expect(c.response_header.status).to eq(200)
+          expect(c.response_header["METHOD"]).to eq("GET")
         end
       end
     end
@@ -129,8 +129,8 @@ describe HttpLog do
         mock_mongo(api)
 
         post_request({}, err) do |c|
-          c.response_header.status.should == 200
-          c.response_header["METHOD"].should == "POST"
+          expect(c.response_header.status).to eq(200)
+          expect(c.response_header["METHOD"]).to eq("POST")
         end
       end
     end

data/spec/integration/jsonp_spec.rb

@@ -30,7 +30,7 @@ describe 'JSONP' do
     it 'does not alter the content type' do
       with_api(JSON_API) do
         get_request({ query: query }, err) do |c|
-          c.response_header['CONTENT_TYPE'].should =~ %r{^application/json}
+          expect(c.response_header['CONTENT_TYPE']).to match(%r{^application/json})
         end
       end
     end
@@ -38,7 +38,7 @@ describe 'JSONP' do
     it 'does not alter the content length' do
       with_api(JSON_API) do
         get_request({ query: query }, err) do |c|
-          c.response_header['CONTENT_LENGTH'].to_i.should == 2
+          expect(c.response_header['CONTENT_LENGTH'].to_i).to eq(2)
         end
       end
     end
@@ -46,7 +46,7 @@ describe 'JSONP' do
     it 'does not wrap the response with anything' do
       with_api(JSON_API) do
         get_request({ query: query }, err) do |c|
-          c.response.should == 'OK'
+          expect(c.response).to eq('OK')
         end
       end
     end
@@ -58,7 +58,7 @@ describe 'JSONP' do
     it 'adjusts the content type' do
       with_api(JSON_API) do
         get_request({ query: query }, err) do |c|
-          c.response_header['CONTENT_TYPE'].should =~ %r{^application/javascript}
+          expect(c.response_header['CONTENT_TYPE']).to match(%r{^application/javascript})
         end
       end
     end
@@ -66,7 +66,7 @@ describe 'JSONP' do
     it 'adjusts the content length' do
       with_api(JSON_API) do
         get_request({ query: query }, err) do |c|
-          c.response_header['CONTENT_LENGTH'].to_i.should == 8
+          expect(c.response_header['CONTENT_LENGTH'].to_i).to eq(8)
         end
       end
     end
@@ -74,7 +74,7 @@ describe 'JSONP' do
     it 'wraps response with callback' do
       with_api(JSON_API) do
         get_request({ query: query }, err) do |c|
-          c.response.should =~ /^test\(.*\)$/
+          expect(c.response).to match(/^test\(.*\)$/)
         end
       end
     end

data/spec/integration/keepalive_spec.rb

@@ -10,13 +10,13 @@ describe 'HTTP Keep-Alive support' do
       r1.errback { fail }
       r1.callback do |c|
         b = MultiJson.load(c.response)
-        b['response'].should == 'test'
+        expect(b['response']).to eq('test')
 
         r2 = conn.get(:query => {:echo => 'test2'})
         r2.errback { fail }
         r2.callback do |c|
           b = MultiJson.load(c.response)
-          b['response'].should == 'test2'
+          expect(b['response']).to eq('test2')
 
           stop
         end

data/spec/integration/pipelining_spec.rb

@@ -24,15 +24,15 @@ describe 'HTTP Pipelining support' do
       r1.errback { fail }
       r1.callback do |c|
         res << c.response
-        c.response.should match('0.3')
+        expect(c.response).to match('0.3')
       end
 
       r2.errback { fail }
       r2.callback do |c|
         res << c.response
 
-        res.should == ['0.3', '0.2']
-        (Time.now.to_f - start).should be_within(0.1).of(0.3)
+        expect(res).to eq(['0.3', '0.2'])
+        expect(Time.now.to_f - start).to be_within(0.1).of(0.3)
 
         stop
       end

data/spec/integration/reloader_spec.rb

@@ -29,15 +29,15 @@ describe "Reloader" do
   end
 
   it 'adds reloader in dev mode' do
-    count(ReloaderDev).should == 1
+    expect(count(ReloaderDev)).to eq(1)
   end
 
   it "doesn't add if it's already there in dev mode" do
-    count(ReloaderAlreadyLoaded).should == 1
+    expect(count(ReloaderAlreadyLoaded)).to eq(1)
   end
 
   it "doesn't add in prod mode" do
     Goliath.env = :production
-    count(ReloaderProd).should == 0
+    expect(count(ReloaderProd)).to eq(0)
   end
 end

data/spec/integration/template_spec.rb

@@ -11,7 +11,7 @@ describe Template do
   it 'renders haml template with default haml layout' do
     with_api(Template, api_options) do
       get_request(:path => '/') do |c|
-        c.response.should =~ %r{<li><a href="/joke">Tell me a joke</a></li>}
+        expect(c.response).to match(%r{<li><a href="/joke">Tell me a joke</a></li>})
       end
     end
   end
@@ -19,7 +19,7 @@ describe Template do
   it 'renders haml template from string with default haml layout' do
     with_api(Template, api_options) do
       get_request(:path => '/haml_str') do |c|
-        c.response.should =~ %r{<h1>Header</h1>}
+        expect(c.response).to match(%r{<h1>Header</h1>})
       end
     end
   end
@@ -27,7 +27,7 @@ describe Template do
   it 'renders a markdown template with default haml layout' do
     with_api(Template, api_options) do
       get_request(:path => '/joke') do |c|
-        c.response.should =~ %r{<code>Arr, I dunno matey -- but it is driving me nuts!\s*</code>}m
+        expect(c.response).to match(%r{<code>Arr, I dunno matey -- but it is driving me nuts!\s*</code>}m)
       end
     end
   end
@@ -35,7 +35,7 @@ describe Template do
   it 'lets me specify an alternate layout engine' do
     with_api(Template, api_options) do
       get_request(:path => '/erb_me') do |c|
-        c.response.should =~ %r{I AM ERB</h1>}m
+        expect(c.response).to match(%r{I AM ERB</h1>}m)
       end
     end
   end
@@ -43,7 +43,7 @@ describe Template do
   it 'accepts local variables' do
     with_api(Template, api_options) do
       get_request(:path => '/erb_me') do |c|
-        c.response.should =~ %r{<title>HERE IS A JOKE</title>}m
+        expect(c.response).to match(%r{<title>HERE IS A JOKE</title>}m)
       end
     end
   end
@@ -52,8 +52,8 @@ describe Template do
     it 'raises an explanatory 500 error' do
       with_api(Template, api_options) do
         get_request(:path => '/oops') do |c|
-          c.response.should =~ %r{^\[:error, "Template no_such_template not found in .*examples/views for haml"\]$}
-          c.response_header.status.should == 500
+          expect(c.response).to match(%r{^\[:error, "Template no_such_template not found in .*examples/views for haml"\]$})
+          expect(c.response_header.status).to eq(500)
         end
       end
     end

data/spec/integration/test_helper_spec.rb

@@ -11,20 +11,20 @@ describe "with_api" do
     with_api(DummyServer, :log_file => "test.log") do |api|
       get_request({},err)
     end
-    File.exist?("test.log").should be_truthy
+    expect(File.exist?("test.log")).to be_truthy
     File.unlink("test.log")
   end
 
   it "should log on console if requested" do
     with_api(DummyServer, {:log_stdout => true }) do |api|
-      api.logger.outputters.select {|o| o.is_a? Log4r::StdoutOutputter}.should_not be_empty
+      expect(api.logger.outputters.select {|o| o.is_a? Log4r::StdoutOutputter}).not_to be_empty
       EM.stop
     end
   end
 
   it "should be verbose if asked" do
     with_api(DummyServer, {:verbose => true, :log_stdout => true }) do |api|
-      api.logger.level.should == Log4r::DEBUG
+      expect(api.logger.level).to eq(Log4r::DEBUG)
       EM.stop
     end
 

data/spec/integration/trace_spec.rb

@@ -8,7 +8,7 @@ describe Goliath::Rack::Tracer do
   it 'injects a trace param on a 200 (via async callback)' do
     with_api(Echo) do
       get_request({:query => {:echo => 'test'}}, err) do |c|
-        c.response_header['X_POSTRANK'].should =~ /trace\.start: [\d\.]+, total: [\d\.]+/
+        expect(c.response_header['X_POSTRANK']).to match(/trace\.start: [\d\.]+, total: [\d\.]+/)
       end
     end
   end
@@ -16,7 +16,7 @@ describe Goliath::Rack::Tracer do
   it 'injects a trace param on a 400 (direct callback)' do
     with_api(Echo) do
       get_request({}, err) do |c|
-        c.response_header['X_POSTRANK'].should =~ /trace\.start: [\d\.]+, total: [\d\.]+/
+        expect(c.response_header['X_POSTRANK']).to match(/trace\.start: [\d\.]+, total: [\d\.]+/)
       end
     end
   end

data/spec/integration/valid_spec.rb

@@ -38,7 +38,7 @@ describe ValidSingleParam do
   it 'returns OK with param' do
     with_api(ValidSingleParam) do
       get_request({:query => {:test => 'test'}}, err) do |c|
-        c.response.should == 'OK'
+        expect(c.response).to eq('OK')
       end
     end
   end
@@ -46,7 +46,7 @@ describe ValidSingleParam do
   it 'returns error without param' do
     with_api(ValidSingleParam) do
       get_request({}, err) do |c|
-        c.response.should == '[:error, "test identifier missing"]'
+        expect(c.response).to eq('[:error, "test identifier missing"]')
       end
     end
   end
@@ -64,9 +64,9 @@ describe ValidationErrorInEndpoint do
   it 'handles Goliath::Validation::Error correctly' do
     with_api(ValidationErrorInEndpoint) do
       get_request({}, err) do |c|
-        c.response.should == '[:error, "You Must Chill"]'
-        c.response_header.status.should == 420
-        c.response_header["Foo"].should == 'Bar'
+        expect(c.response).to eq('[:error, "You Must Chill"]')
+        expect(c.response_header.status).to eq(420)
+        expect(c.response_header["Foo"]).to eq('Bar')
       end
     end
   end
@@ -84,9 +84,9 @@ describe ValidationErrorWhileParsing do
   it 'handles Goliath::Validation::Error correctly' do
     with_api(ValidationErrorInEndpoint) do
       get_request({}, err) do |c|
-        c.response.should == '[:error, "You Must Chill"]'
-        c.response_header.status.should == 420
-        c.response_header["Foo"].should == 'Bar'
+        expect(c.response).to eq('[:error, "You Must Chill"]')
+        expect(c.response_header.status).to eq(420)
+        expect(c.response_header["Foo"]).to eq('Bar')
       end
     end
   end

data/spec/integration/websocket_spec.rb

@@ -26,7 +26,7 @@ describe "WebSocket" do
 
   it "should accept connection" do
     with_api(WebSocketEndPoint, {:verbose => true, :log_stdout => true}) do |server|
-      WebSocketEndPoint.any_instance.should_receive(:on_open)
+      expect_any_instance_of(WebSocketEndPoint).to receive(:on_open)
       ws_client_connect('/ws')
     end
   end
@@ -35,7 +35,7 @@ describe "WebSocket" do
     with_api(WebSocketEndPoint, {:verbose => true, :log_stdout => true}) do |server|
       ws_client_connect('/ws') do |client|
         client.send "hello"
-        client.receive.data.should == "hello"
+        expect(client.receive.data).to eq("hello")
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,7 +8,5 @@ require 'goliath/test_helper'
 Goliath.env = :test
 
 RSpec.configure do |c|
-  c.include Goliath::TestHelper, :example_group => {
-    :file_path => /spec\/integration/
-  }
+  c.include Goliath::TestHelper, :file_path => /spec\/integration/
 end

data/spec/unit/api_spec.rb

@@ -7,7 +7,7 @@ describe Goliath::API do
 
   describe "middlewares" do
     it "doesn't change after multi calls" do
-      2.times { DummyApi.middlewares.size.should eq(2) }
+      2.times { expect(DummyApi.middlewares.size).to eq(2) }
     end
   end
 end

data/spec/unit/connection_spec.rb

@@ -9,39 +9,39 @@ describe Goliath::Connection do
     it 'accepts an app' do
       app = double('app')
       @c.app = app
-      @c.app.should == app
+      expect(@c.app).to eq(app)
     end
 
     it 'accepts a logger' do
       logger = double('logger')
       @c.logger = logger
-      @c.logger.should == logger
+      expect(@c.logger).to eq(logger)
     end
 
     it 'accepts a status object' do
       status = double('status')
       @c.status = status
-      @c.status.should == status
+      expect(@c.status).to eq(status)
     end
 
     it 'accepts config' do
       config = double('config')
       @c.config = config
-      @c.config.should == config
+      expect(@c.config).to eq(config)
     end
   end
 
   describe 'post_init' do
     it 'sets up the parser' do
       @c.post_init
-      @c.instance_variable_get("@parser").should_not be_nil
+      expect(@c.instance_variable_get("@parser")).not_to be_nil
     end
   end
 
   describe 'receive_data' do
     it 'passes data to the http parser' do
       request_mock = double("parser").as_null_object
-      request_mock.should_receive(:<<)
+      expect(request_mock).to receive(:<<)
 
       current_mock = double("current").as_null_object
 
@@ -52,10 +52,10 @@ describe Goliath::Connection do
 
     it "closes the connection when a parse error is received" do
       current_mock = double("current").as_null_object
-      current_mock.should_receive(:close)
+      expect(current_mock).to receive(:close)
 
       @c.instance_variable_set("@current", current_mock)
-      lambda { @c.receive_data("bad data") }.should_not raise_error
+      expect { @c.receive_data("bad data") }.not_to raise_error
     end
   end
 

data/spec/unit/console_spec.rb

@@ -9,9 +9,9 @@ describe Goliath::Console do
 
   describe 'run!' do
     it "starts a irb session" do
-      Object.should_receive(:send).with(:define_method, :goliath_server)
-      IRB.should_receive(:start)
-      @server.should_receive(:load_config)
+      expect(Object).to receive(:send).with(:define_method, :goliath_server)
+      expect(IRB).to receive(:start)
+      expect(@server).to receive(:load_config)
       Goliath::Console.run!(@server)
     end
   end

data/spec/unit/env_spec.rb

@@ -7,49 +7,49 @@ describe Goliath::Env do
   end
 
   it 'responds to []=' do
-    lambda { @env['test'] = 'blah' }.should_not raise_error
+    expect { @env['test'] = 'blah' }.not_to raise_error
   end
 
   it 'responds to []' do
     @env['test'] = 'blah'
-    lambda { @env['test'].should == 'blah' }.should_not raise_error
+    expect { expect(@env['test']).to eq('blah') }.not_to raise_error
   end
 
   context '#method_missing' do
     it 'allows access to items as methods' do
       @env['db'] = 'test'
-      @env.db.should == 'test'
+      expect(@env.db).to eq('test')
     end
 
     it 'allows access to config items as methods' do
       @env['config'] = {}
       @env['config']['db'] = 'test'
-      @env.db.should == 'test'
+      expect(@env.db).to eq('test')
     end
   end
 
   context '#respond_to?' do
     it 'returns true for items in the hash' do
       @env['test'] = 'true'
-      @env.respond_to?(:test).should be true
+      expect(@env.respond_to?(:test)).to be true
     end
 
     it 'returns false for items not in hash' do
-      @env.respond_to?(:test).should be false
+      expect(@env.respond_to?(:test)).to be false
     end
 
     it 'returns true for items in the config hash' do
       @env['config'] = {'test' => true}
-      @env.respond_to?(:test).should be true
+      expect(@env.respond_to?(:test)).to be true
     end
 
     it 'returns false for items not in the config hash' do
       @env['config'] = {}
-      @env.respond_to?(:test).should be false
+      expect(@env.respond_to?(:test)).to be false
     end
 
     it 'delegates if not found' do
-      @env.respond_to?(:[]).should be true
+      expect(@env.respond_to?(:[])).to be true
     end
   end
 end