strelka 0.6.0 → 0.7.0

data/spec/strelka/app_spec.rb

@@ -2,18 +2,12 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-}
+require_relative '../helpers'
 
 require 'rspec'
 require 'zmq'
 require 'mongrel2'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/app'
 
@@ -66,100 +60,13 @@ describe Strelka::App do
 	# Examples
 	#
 
-	it "has a method for loading app class/es from a file" do
-		app_file = 'an_app.rb'
-		app_path = Pathname( app_file ).expand_path
-		app_class = nil
-
-		Kernel.should_receive( :load ).with( app_path.to_s ).and_return do
-			app_class = Class.new( Strelka::App )
-		end
-		Strelka::App.load( app_file ).should == [ app_class ]
-	end
-
-	it "has a method for discovering installed Strelka app files" do
-		specs = {}
-		specs[:donkey]     = make_gemspec( 'donkey',  '1.0.0' )
-		specs[:rabbit_old] = make_gemspec( 'rabbit',  '1.0.0' )
-		specs[:rabbit_new] = make_gemspec( 'rabbit',  '1.0.8' )
-		specs[:bear]       = make_gemspec( 'bear',    '1.0.0', false )
-		specs[:giraffe]    = make_gemspec( 'giraffe', '1.0.0' )
-
-		expectation = Gem::Specification.should_receive( :each )
-		specs.values.each {|spec| expectation.and_yield(spec) }
-
-		donkey_path  = specs[:donkey].full_gem_path
-		rabbit_path  = specs[:rabbit_new].full_gem_path
-		giraffe_path = specs[:giraffe].full_gem_path
-
-		Dir.should_receive( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
-			and_return( [] )
-		Dir.should_receive( :glob ).with( "#{giraffe_path}/data/giraffe/{apps,handlers}/**/*" ).
-			and_return([ "#{giraffe_path}/data/giraffe/apps/app" ])
-		Dir.should_receive( :glob ).with( "#{rabbit_path}/data/rabbit/{apps,handlers}/**/*" ).
-			and_return([ "#{rabbit_path}/data/rabbit/apps/subdir/app1.rb",
-			             "#{rabbit_path}/data/rabbit/apps/subdir/app2.rb" ])
-		Dir.should_receive( :glob ).with( "#{donkey_path}/data/donkey/{apps,handlers}/**/*" ).
-			and_return([ "#{donkey_path}/data/donkey/apps/app.rb" ])
-
-		app_paths = Strelka::App.discover_paths
-
-		# app_paths.should have( 4 ).members
-		app_paths.should include(
-			'donkey'  => [Pathname("#{donkey_path}/data/donkey/apps/app.rb")],
-			'rabbit'  => [Pathname("#{rabbit_path}/data/rabbit/apps/subdir/app1.rb"),
-			              Pathname("#{rabbit_path}/data/rabbit/apps/subdir/app2.rb")],
-			'giraffe' => [Pathname("#{giraffe_path}/data/giraffe/apps/app")]
-		)
-	end
-
-	it "has a method for loading discovered app classes from installed Strelka app files" do
-		gemspec = make_gemspec( 'blood-orgy', '0.0.3' )
-		Gem::Specification.should_receive( :each ).and_yield( gemspec ).at_least( :once )
-
-		Dir.should_receive( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
-			and_return( [] )
-		Dir.should_receive( :glob ).with( "#{gemspec.full_gem_path}/data/blood-orgy/{apps,handlers}/**/*" ).
-			and_return([ "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ])
-
-		Kernel.stub( :load ).
-			with( "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ).
-			and_return do
-				Class.new( Strelka::App )
-				true
-			end
-
-		app_classes = Strelka::App.discover
-		app_classes.should have( 1 ).member
-		app_classes.first.should be_a( Class )
-		app_classes.first.should < Strelka::App
-	end
-
-	it "handles exceptions while loading discovered apps" do
-		gemspec = make_gemspec( 'blood-orgy', '0.0.3' )
-		Gem::Specification.should_receive( :each ).and_yield( gemspec ).at_least( :once )
-
-		Dir.should_receive( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
-			and_return( [] )
-		Dir.should_receive( :glob ).with( "#{gemspec.full_gem_path}/data/blood-orgy/{apps,handlers}/**/*" ).
-			and_return([ "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ])
-
-		Kernel.stub( :load ).
-			with( "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ).
-			and_raise( SyntaxError.new("kurzweil:1: syntax error, unexpected coffeeshop philosopher") )
-
-		app_classes = Strelka::App.discover
-		app_classes.should be_empty()
-	end
-
-
 	it "returns a No Content response by default" do
 		res = @app.new.handle( @req )
 
-		res.should be_a( Mongrel2::HTTPResponse )
-		res.status_line.should == 'HTTP/1.1 204 No Content'
+		expect( res ).to be_a( Mongrel2::HTTPResponse )
+		expect( res.status_line ).to eq( 'HTTP/1.1 204 No Content' )
 		res.body.rewind
-		res.body.read.should == ''
+		expect( res.body.read ).to eq( '' )
 	end
 
 
@@ -178,10 +85,10 @@ describe Strelka::App do
 
 		res = @app.new.handle( @req )
 
-		res.should be_a( Mongrel2::HTTPResponse )
-		res.status_line.should == 'HTTP/1.1 304 Not Modified'
+		expect( res ).to be_a( Mongrel2::HTTPResponse )
+		expect( res.status_line ).to eq( 'HTTP/1.1 304 Not Modified' )
 		res.body.rewind
-		res.body.read.should == ''
+		expect( res.body.read ).to eq( '' )
 	end
 
 
@@ -199,11 +106,11 @@ describe Strelka::App do
 
 		res = @app.new.handle( @req )
 
-		res.should be_a( Mongrel2::HTTPResponse )
-		res.status_line.should == 'HTTP/1.1 403 Forbidden'
-		res.content_type.should == 'text/plain'
+		expect( res ).to be_a( Mongrel2::HTTPResponse )
+		expect( res.status_line ).to eq( 'HTTP/1.1 403 Forbidden' )
+		expect( res.content_type ).to eq( 'text/plain' )
 		res.body.rewind
-		res.body.read.should == "You aren't allowed to look at that.\n"
+		expect( res.body.read ).to eq( "You aren't allowed to look at that.\n" )
 	end
 
 
@@ -222,11 +129,11 @@ describe Strelka::App do
 
 		res = @app.new.handle( @req )
 
-		res.should be_a( Mongrel2::HTTPResponse )
-		res.status_line.should == 'HTTP/1.1 403 Forbidden'
-		res.content_type.should == 'text/html'
+		expect( res ).to be_a( Mongrel2::HTTPResponse )
+		expect( res.status_line ).to eq( 'HTTP/1.1 403 Forbidden' )
+		expect( res.content_type ).to eq( 'text/html' )
 		res.body.rewind
-		res.body.read.should == "You aren't allowed to look at that.\n"
+		expect( res.body.read ).to eq( "You aren't allowed to look at that.\n" )
 	end
 
 	it "sets the error status info in the transaction notes for error responses" do
@@ -242,10 +149,10 @@ describe Strelka::App do
 
 		res = @app.new.handle( @req )
 
-		res.notes.should include( :status_info )
-		res.notes[:status_info].should include( :status, :message, :headers )
-		res.notes[:status_info][:status].should == HTTP::FORBIDDEN
-		res.notes[:status_info][:message].should == "You aren't allowed to look at that."
+		expect( res.notes ).to include( :status_info )
+		expect( res.notes[:status_info] ).to include( :status, :message, :headers )
+		expect( res.notes[:status_info][:status] ).to eq( HTTP::FORBIDDEN )
+		expect( res.notes[:status_info][:message] ).to eq( "You aren't allowed to look at that." )
 	end
 
 
@@ -260,8 +167,8 @@ describe Strelka::App do
 
 		res = @app.new.handle( @req )
 
-		res.should be_a( Mongrel2::HTTPResponse )
-		res.content_type.should == 'text/css'
+		expect( res ).to be_a( Mongrel2::HTTPResponse )
+		expect( res.content_type ).to eq( 'text/css' )
 	end
 
 	it "doesn't override an explicitly-set content-type header with the default" do
@@ -276,8 +183,8 @@ describe Strelka::App do
 
 		res = @app.new.handle( @req )
 
-		res.should be_a( Mongrel2::HTTPResponse )
-		res.content_type.should == 'text/plain'
+		expect( res ).to be_a( Mongrel2::HTTPResponse )
+		expect( res.content_type ).to eq( 'text/plain' )
 	end
 
 
@@ -293,11 +200,11 @@ describe Strelka::App do
 		req = @request_factory.head( '/mail/inbox' )
 		res = @app.new.handle( req )
 
-		res.should be_a( Mongrel2::HTTPResponse )
-		res.content_type.should == 'text/plain'
+		expect( res ).to be_a( Mongrel2::HTTPResponse )
+		expect( res.content_type ).to eq( 'text/plain' )
 		res.body.rewind
-		res.body.read.should == ''
-		res.headers.content_length.should == "Rendered output.\n".bytesize
+		expect( res.body.read ).to eq( '' )
+		expect( res.headers.content_length ).to eq( "Rendered output.\n".bytesize )
 	end
 
 
@@ -305,9 +212,9 @@ describe Strelka::App do
 		@app.const_set( :ID, 'testing-app' )
 		conn = double( "Mongrel2 connection", close: true )
 
-		Mongrel2::Handler.should_receive( :connection_info_for ).with( 'testing-app' ).
+		expect( Mongrel2::Handler ).to receive( :connection_info_for ).with( 'testing-app' ).
 			and_return([ TEST_SEND_SPEC, TEST_RECV_SPEC ])
-		Mongrel2::Connection.should_receive( :new ).
+		expect( Mongrel2::Connection ).to receive( :new ).
 			with( 'testing-app', TEST_SEND_SPEC, TEST_RECV_SPEC ).
 			and_return( conn )
 
@@ -321,9 +228,9 @@ describe Strelka::App do
 		end
 		conn = double( "Mongrel2 connection", close: true )
 
-		Mongrel2::Handler.should_receive( :connection_info_for ).with( 'my-first-blog' ).
+		expect( Mongrel2::Handler ).to receive( :connection_info_for ).with( 'my-first-blog' ).
 			and_return([ TEST_SEND_SPEC, TEST_RECV_SPEC ])
-		Mongrel2::Connection.should_receive( :new ).
+		expect( Mongrel2::Connection ).to receive( :new ).
 			with( 'my-first-blog', TEST_SEND_SPEC, TEST_RECV_SPEC ).
 			and_return( conn )
 
@@ -340,20 +247,20 @@ describe Strelka::App do
 
 		res = @app.new.handle( @req )
 
-		res.should be_a( Mongrel2::HTTPResponse )
-		res.status.should == HTTP::SERVER_ERROR
+		expect( res ).to be_a( Mongrel2::HTTPResponse )
+		expect( res.status ).to eq( HTTP::SERVER_ERROR )
 		res.content_type = 'text/plain'
 		res.body.rewind
-		res.body.read.should =~ /internal server error/i
+		expect( res.body.read ).to match( /internal server error/i )
 	end
 
 	it "isn't in 'developer mode' by default" do
-		@app.should_not be_in_devmode()
+		expect( @app ).to_not be_in_devmode()
 	end
 
 	it "can be configured to be in 'developer mode' using the Configurability API" do
 		@app.configure( devmode: true )
-		@app.should be_in_devmode()
+		expect( @app ).to be_in_devmode()
 	end
 
 	it "configures itself to be in 'developer mode' if debugging is enabled" do
@@ -362,28 +269,22 @@ describe Strelka::App do
 		begin
 			$DEBUG = true
 			@app.configure
-			@app.should be_in_devmode()
+			expect( @app ).to be_in_devmode()
 		ensure
 			$DEBUG = debugsetting
 		end
 	end
 
-	it "uses the default local data directory if the config is present without that key" do
-		config = Configurability::Config.new( 'devmode: true' )
-		@app.configure( config )
-		@app.local_data_dirs.should == Strelka::App::CONFIG_DEFAULTS[:local_data_dirs]
-	end
-
 	it "closes async uploads with a 413 Request Entity Too Large by default" do
 		@req.headers.x_mongrel2_upload_start = 'an/uploaded/file/path'
 
 		app = @app.new
-		app.conn.should_receive( :reply ).with( an_instance_of(Strelka::HTTPResponse) )
-		app.conn.should_receive( :reply_close ).with( @req )
+		expect( app.conn ).to receive( :reply ).with( an_instance_of(Strelka::HTTPResponse) )
+		expect( app.conn ).to receive( :reply_close ).with( @req )
 
 		res = app.handle_async_upload_start( @req )
 
-		res.should be_nil()
+		expect( res ).to be_nil()
 	end
 
 
@@ -400,8 +301,8 @@ describe Strelka::App do
 		it "sets the process name to something more interesting than the command line" do
 			@app.new.run
 
-			$0.should =~ /#{@app.inspect}/
-			$0.should =~ %r|\{\S+\} tcp://\S+ <-> \S+|
+			expect( $0 ).to match( /#{@app.inspect}/ )
+			expect( $0 ).to match( %r|\{\S+\} tcp://\S+ <-> \S+| )
 		end
 
 	end
@@ -428,10 +329,10 @@ describe Strelka::App do
 
 			res = @app.new.handle( @req )
 
-			res.should be_a( Mongrel2::HTTPResponse )
-			res.status_line.should == 'HTTP/1.1 200 OK'
+			expect( res ).to be_a( Mongrel2::HTTPResponse )
+			expect( res.status_line ).to eq( 'HTTP/1.1 200 OK' )
 			res.body.rewind
-			res.body.read.should == "Request was funted by Cragnux/1.1.3!\n"
+			expect( res.body.read ).to eq( "Request was funted by Cragnux/1.1.3!\n" )
 		end
 
 
@@ -455,9 +356,9 @@ describe Strelka::App do
 
 			res = @app.new.handle( @req )
 
-			res.should be_a( Mongrel2::HTTPResponse )
-			res.status_line.should == 'HTTP/1.1 200 OK'
-			res.header_data.should =~ %r{X-Funted-By: Cragnux/1.1.3}
+			expect( res ).to be_a( Mongrel2::HTTPResponse )
+			expect( res.status_line ).to eq( 'HTTP/1.1 200 OK' )
+			expect( res.header_data ).to match( %r{X-Funted-By: Cragnux/1.1.3} )
 		end
 
 	end

data/spec/strelka/authprovider/basic_spec.rb

@@ -1,17 +1,11 @@
 # -*- rspec -*-
 # vim: set nosta noet ts=4 sw=4:
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-}
+require_relative '../../helpers'
 
 require 'rspec'
 require 'ipaddr'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/authprovider/basic'
 
@@ -28,7 +22,7 @@ describe Strelka::AuthProvider::Basic do
 	end
 
 	before( :each ) do
-		@app = stub( "Strelka::App", :conn => stub("Connection", :app_id => 'test-app') )
+		@app = double( "Strelka::App", :conn => double("Connection", :app_id => 'test-app') )
 		@provider = Strelka::AuthProvider.create( :basic, @app )
 		@config = {
 			:realm => 'Pern',
@@ -66,8 +60,8 @@ describe Strelka::AuthProvider::Basic do
 
 	it "can be configured via the Configurability API" do
 		described_class.configure( @config )
-		described_class.realm.should == @config[:realm]
-		described_class.users.should == @config[:users]
+		expect( described_class.realm ).to eq( @config[:realm] )
+		expect( described_class.users ).to eq( @config[:users] )
 	end
 
 
@@ -171,7 +165,7 @@ describe Strelka::AuthProvider::Basic do
 			req = @request_factory.get( '/admin/console' )
 			req.header.authorization = make_authorization_header( 'lessa', 'ramoth' )
 
-			@provider.authenticate( req ).should be_true()
+			expect( @provider.authenticate(req) ).to be_true()
 		end
 	end
 

data/spec/strelka/authprovider/hostaccess_spec.rb

@@ -1,17 +1,11 @@
 # -*- rspec -*-
 # vim: set nosta noet ts=4 sw=4:
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-}
+require_relative '../../helpers'
 
 require 'rspec'
 require 'ipaddr'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/authprovider/hostaccess'
 
@@ -28,7 +22,7 @@ describe Strelka::AuthProvider::HostAccess do
 	end
 
 	before( :each ) do
-		@app = stub( "Strelka::App" )
+		@app = double( "Strelka::App" )
 		@provider = Strelka::AuthProvider.create( :hostaccess, @app )
 	end
 
@@ -38,31 +32,31 @@ describe Strelka::AuthProvider::HostAccess do
 
 
 	it "knows what its allowed netblocks are" do
-		@provider.allowed_netblocks.should be_an( Array )
-		@provider.allowed_netblocks.should include( IPAddr.new('127.0.0.0/8') )
+		expect( @provider.allowed_netblocks ).to be_an( Array )
+		expect( @provider.allowed_netblocks ).to include( IPAddr.new('127.0.0.0/8') )
 	end
 
 	it "allows its netblocks to be set" do
 		@provider.allowed_netblocks = %w[10.5.2.0/22 10.6.2.0/24]
-		@provider.allowed_netblocks.should have( 2 ).members
-		@provider.allowed_netblocks.should include( IPAddr.new('10.5.2.0/22'), IPAddr.new('10.6.2.0/24') )
+		expect( @provider.allowed_netblocks ).to have( 2 ).members
+		expect( @provider.allowed_netblocks ).to include( IPAddr.new('10.5.2.0/22'), IPAddr.new('10.6.2.0/24') )
 	end
 
 	it "can be configured via the Configurability API" do
 		@provider.configure( 'allowed_netblocks' => %w[10.5.2.0/22 10.6.2.0/24] )
-		@provider.allowed_netblocks.should include( IPAddr.new('10.5.2.0/22'), IPAddr.new('10.6.2.0/24') )
+		expect( @provider.allowed_netblocks ).to include( IPAddr.new('10.5.2.0/22'), IPAddr.new('10.6.2.0/24') )
 	end
 
 
 	it "allows a request that originates from one of its allowed netblocks" do
 		req = @request_factory.get( '/admin/console', :x_forwarded_for => '127.0.0.1' )
-		@provider.authorize( nil, req, nil ).should be_true()
+		expect( @provider.authorize( nil, req, nil ) ).to be_true()
 	end
 
 
 	it "doesn't allow a request which is not from one of its allowed netblocks" do
 		req = @request_factory.get( '/admin/console', :x_forwarded_for => '8.8.8.8' )
-		@provider.authorize( nil, req, nil ).should be_false()
+		expect( @provider.authorize( nil, req, nil ) ).to be_false()
 	end
 
 

data/spec/strelka/authprovider_spec.rb

@@ -1,16 +1,10 @@
 # -*- rspec -*-
 # vim: set nosta noet ts=4 sw=4:
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-}
+require_relative '../helpers'
 
 require 'rspec'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/authprovider'
 
@@ -32,7 +26,7 @@ describe Strelka::AuthProvider do
 
 
 	it "looks for plugins under strelka/authprovider" do
-		described_class.plugin_prefixes.should include( 'strelka/authprovider' )
+		expect( described_class.plugin_prefixes ).to include( 'strelka/authprovider' )
 	end
 
 
@@ -64,7 +58,7 @@ describe Strelka::AuthProvider do
 
 			it "returns 'anonymous' as credentials if asked to authenticate" do
 				req = @request_factory.get( '/admin/console' )
-				@provider.authenticate( req ).should == 'anonymous'
+				expect( @provider.authenticate(req) ).to eq( 'anonymous' )
 			end
 
 			it "has a callback for adding authentication information to the request" do

data/spec/strelka/cookie_spec.rb

@@ -2,16 +2,10 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-}
+require_relative '../helpers'
 
 require 'uri'
 require 'rspec'
-require 'spec/lib/helpers'
 require 'strelka/cookie'
 
 
@@ -30,39 +24,39 @@ describe Strelka::Cookie do
 	end
 
 	it "parses a 'nil' Cookie header field as an empty Hash" do
-		Strelka::Cookie.parse( nil ).should == {}
+		expect( Strelka::Cookie.parse( nil ) ).to eq( {} )
 	end
 
 	it "parses an empty string Cookie header field as an empty Hash" do
-		Strelka::Cookie.parse( '' ).should == {}
+		expect( Strelka::Cookie.parse( '' ) ).to eq( {} )
 	end
 
 	it "parses a cookie header field with a single value as a cookie with a single value" do
 		result = Strelka::Cookie.parse( 'a=b' )
 
-		result.should be_a( Hash )
-		result.should have(1).member
-		result[:a].should be_a( Strelka::Cookie )
-		result[:a].name.should == 'a'
-		result[:a].value.should == 'b'
+		expect( result ).to be_a( Hash )
+		expect( result ).to have(1).member
+		expect( result[:a] ).to be_a( Strelka::Cookie )
+		expect( result[:a].name ).to eq( 'a' )
+		expect( result[:a].value ).to eq( 'b' )
 	end
 
 	it "parses a cookie header field with an empty value as a cookie with a nil value" do
 		result = Strelka::Cookie.parse( 'a=' )
 
-		result.should have( 1 ).member
-		result[:a].should be_a( Strelka::Cookie )
-		result[:a].name.should == 'a'
-		result[:a].value.should be_nil()
+		expect( result ).to have( 1 ).member
+		expect( result[:a] ).to be_a( Strelka::Cookie )
+		expect( result[:a].name ).to eq( 'a' )
+		expect( result[:a].value ).to be_nil()
 	end
 
 	it "doesn't raise an error if asked to parse an invalid cookie header" do
 		result = Strelka::Cookie.parse( "{a}=foo" )
-		result.should == {}
+		expect( result ).to eq( {} )
 	end
 
 	it "guards against a nil options hash" do
-		Strelka::Cookie.new( :name, 'value', nil ).should be_a( Strelka::Cookie )
+		expect( Strelka::Cookie.new( :name, 'value', nil ) ).to be_a( Strelka::Cookie )
 	end
 
 
@@ -73,28 +67,28 @@ describe Strelka::Cookie do
 		end
 
 		it "stringifies as a valid header value" do
-			@cookie.to_s.should == 'by_rickirac=9917eb'
+			expect( @cookie.to_s ).to eq( 'by_rickirac=9917eb' )
 		end
 
 		it "stringifies with a version number if its version is set to something other than 0" do
 			@cookie.version = 1
-			@cookie.to_s.should =~ /; Version=1/i
+			expect( @cookie.to_s ).to match( /; Version=1/i )
 		end
 
 		it "stringifies with a domain if one is set" do
 			@cookie.domain = 'example.com'
-			@cookie.to_s.should =~ /; Domain=example.com/
+			expect( @cookie.to_s ).to match( /; Domain=example.com/ )
 		end
 
 		it "stringifies with the leading '.' in the domain" do
 			@cookie.domain = '.example.com'
-			@cookie.to_s.should =~ /; Domain=example.com/
+			expect( @cookie.to_s ).to match( /; Domain=example.com/ )
 		end
 
 		it "doesn't stringify with a domain if it is reset" do
 			@cookie.domain = 'example.com'
 			@cookie.domain = nil
-			@cookie.to_s.should_not =~ /; Domain=/
+			expect( @cookie.to_s ).to_not match( /; Domain=/ )
 		end
 
 		it "raises an exception if the cookie value would be invalid when serialized" do
@@ -105,56 +99,56 @@ describe Strelka::Cookie do
 
 		it "provides a convenience mechanism for setting the value to binary data" do
 			@cookie.binary_value = %{"modern technology"; ain't it a paradox?}
-			@cookie.to_s.should == 'by_rickirac=Im1vZGVybiB0ZWNobm9sb2d5IjsgYWluJ3Qg' +
-				'aXQgYSBwYXJhZG94Pw=='
+			expect( @cookie.to_s ).
+				to eq( 'by_rickirac=Im1vZGVybiB0ZWNobm9sb2d5IjsgYWluJ3QgaXQgYSBwYXJhZG94Pw==' )
 		end
 
 		it "stringifies with an expires date if one is set" do
 			@cookie.expires = Time.at( 1331761184 )
-			@cookie.to_s.should == 'by_rickirac=9917eb; Expires=Wed, 14 Mar 2012 21:39:44 GMT'
+			expect( @cookie.to_s ).to eq( 'by_rickirac=9917eb; Expires=Wed, 14 Mar 2012 21:39:44 GMT' )
 		end
 
 		it "stringifies with a max age if the 'max age' is set" do
 			@cookie.max_age = 3600
-			@cookie.to_s.should == 'by_rickirac=9917eb; Max-age=3600'
+			expect( @cookie.to_s ).to eq( 'by_rickirac=9917eb; Max-age=3600' )
 		end
 
 		it "stringifies with a Secure flag if secure is set" do
 			@cookie.secure = true
-			@cookie.to_s.should =~ /; Secure/i
+			expect( @cookie.to_s ).to match( /; Secure/i )
 		end
 
 		it "stringifies with an HttpOnly flag if httponly is set" do
 			@cookie.httponly = true
-			@cookie.to_s.should =~ /; HttpOnly/i
+			expect( @cookie.to_s ).to match( /; HttpOnly/i )
 		end
 
 		it "stringifies with both Secure and HttpOnly flags if they're both set" do
 			@cookie.httponly = true
 			@cookie.secure = true
-			@cookie.to_s.should =~ /; HttpOnly/i
-			@cookie.to_s.should =~ /; Secure/i
+			expect( @cookie.to_s ).to match( /; HttpOnly/i )
+			expect( @cookie.to_s ).to match( /; Secure/i )
 		end
 
 		it "hashes the same as another cookie with the same name, regardless of value" do
-			@cookie.hash.should == Strelka::Cookie.new('by_rickirac', 'something_else').hash
+			expect( @cookie.hash ).to eq( Strelka::Cookie.new('by_rickirac', 'something_else').hash )
 		end
 
 
 		it "sets its expiration time to a time in the past if it's told to expire" do
 			@cookie.expire!
-			@cookie.expires.should < Time.now
+			expect( @cookie.expires ).to be < Time.now
 		end
 
 		it "uses the hash of its name as its hash value" do
-			@cookie.hash.should == @cookie.name.to_s.hash
+			expect( @cookie.hash ).to eq( @cookie.name.to_s.hash )
 		end
 
 		it "can return its options as a Hash" do
 			@cookie.domain = '.example.com'
 			@cookie.secure = true
 
-			@cookie.options.should == {
+			expect( @cookie.options ).to eq({
 				domain:   'example.com',
 				path:     nil,
 				secure:   true,
@@ -162,7 +156,7 @@ describe Strelka::Cookie do
 				expires:  nil,
 				max_age:  nil,
 				version:  0,
-			}
+			})
 		end
 
 	end