strelka 0.6.0 → 0.7.0

data/spec/strelka/httpresponse/negotiation_spec.rb

@@ -1,20 +1,10 @@
 #!/usr/bin/env ruby
 #encoding: utf-8
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
-}
+require_relative '../../helpers'
 
 require 'rspec'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/httprequest/negotiation'
 require 'strelka/httpresponse/negotiation'
@@ -48,7 +38,7 @@ describe Strelka::HTTPResponse::Negotiation do
 		@res.puts( "FOOM!" )
 		@res.content_type = 'text/plain'
 		@res.charset = Encoding::UTF_8
-		@res.to_s.should include(
+		expect( @res.to_s ).to include(
 			'HTTP/1.1 200 OK',
 			'Content-Length: 6',
 			'Content-Type: text/plain; charset=UTF-8',
@@ -67,9 +57,9 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.for( 'application/x-yaml' ) { { 'a' => "YAML dump" } }
 
 			@res.negotiated_body.rewind
-			@res.negotiated_body.read.should == "---\na: YAML dump\n"
-			@res.content_type.should == "application/x-yaml"
-			@res.header_data.should =~ /accept(?!-)/i
+			expect( @res.negotiated_body.read ).to eq( "---\na: YAML dump\n" )
+			expect( @res.content_type ).to eq( "application/x-yaml" )
+			expect( @res.header_data ).to match( /accept(?!-)/i )
 		end
 
 		it "can provide a single block for bodies of several different mediatypes" do
@@ -80,10 +70,11 @@ describe Strelka::HTTPResponse::Negotiation do
 			end
 
 			@res.negotiated_body.rewind
-			@res.negotiated_body.read.should == "{\"uuid\":\"fc85e35b-c9c3-4675-a882-25bf98d11e1b\"," +
-				"\"name\":\"Harlot's Garden\"}"
-			@res.content_type.should == "application/json"
-			@res.header_data.should =~ /accept(?!-)/i
+			expect( @res.negotiated_body.read ).
+				to eq( "{\"uuid\":\"fc85e35b-c9c3-4675-a882-25bf98d11e1b\"," +
+				       "\"name\":\"Harlot's Garden\"}" )
+			expect( @res.content_type ).to eq( "application/json" )
+			expect( @res.header_data ).to match( /accept(?!-)/i )
 		end
 
 		it "can provide a block for bodies of several different symbolic mediatypes" do
@@ -94,10 +85,11 @@ describe Strelka::HTTPResponse::Negotiation do
 			end
 
 			@res.negotiated_body.rewind
-			@res.negotiated_body.read.should == "{\"uuid\":\"fc85e35b-c9c3-4675-a882-25bf98d11e1b\"," +
-				"\"name\":\"Harlot's Garden\"}"
-			@res.content_type.should == "application/json"
-			@res.header_data.should =~ /accept(?!-)/i
+			expect( @res.negotiated_body.read ).
+				to eq( "{\"uuid\":\"fc85e35b-c9c3-4675-a882-25bf98d11e1b\"," +
+				       "\"name\":\"Harlot's Garden\"}" )
+			expect( @res.content_type ).to eq( "application/json" )
+			expect( @res.header_data ).to match( /accept(?!-)/i )
 		end
 
 		it "raises an exception if given a block for an unknown symbolic mediatype" do
@@ -106,6 +98,22 @@ describe Strelka::HTTPResponse::Negotiation do
 			}.to raise_error( StandardError, /no known mimetype/i )
 		end
 
+		it "treat exceptions raised from the block as failed transformations" do
+			@req.headers.accept = 'application/json, text/plain; q=0.9'
+
+			@res.for( :json ) do
+				raise "Oops! I fail at JSON!"
+			end
+			@res.for( :text ) do
+				"But I can do plain-text all day long!"
+			end
+
+			@res.negotiated_body.rewind
+			expect( @res.negotiated_body.read ).to eq( "But I can do plain-text all day long!" )
+			expect( @res.content_type ).to eq( 'text/plain' )
+			expect( @res.header_data ).to match( /accept(?!-)/i )
+		end
+
 	end
 
 
@@ -117,8 +125,8 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.body = File.read( __FILE__, encoding: 'iso-8859-5' )
 			@res.content_type = 'text/plain'
 
-			@res.negotiated_body.external_encoding.should == Encoding::KOI8_R
-			@res.header_data.should =~ /accept-charset(?!-)/i
+			expect( @res.negotiated_body.external_encoding ).to eq( Encoding::KOI8_R )
+			expect( @res.header_data ).to match( /accept-charset(?!-)/i )
 		end
 
 		it "transcodes String entity bodies if the charset is not acceptable" do
@@ -127,8 +135,8 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.body = File.read( __FILE__, encoding: 'iso-8859-5' )
 			@res.content_type = 'application/json'
 
-			@res.negotiated_body.external_encoding.should == Encoding::UTF_8
-			@res.header_data.should =~ /accept-charset(?!-)/i
+			expect( @res.negotiated_body.external_encoding ).to eq( Encoding::UTF_8 )
+			expect( @res.header_data ).to match( /accept-charset(?!-)/i )
 		end
 
 		it "transcodes File entity bodies if the charset is not acceptable" do
@@ -138,8 +146,8 @@ describe Strelka::HTTPResponse::Negotiation do
 				@res.body = File.open( __FILE__, 'r:iso-8859-5' )
 				@res.content_type = 'text/plain'
 
-				@res.negotiated_body.read.encoding.should == Encoding::KOI8_R
-				@res.header_data.should =~ /accept-charset(?!-)/i
+				expect( @res.negotiated_body.read.encoding ).to eq( Encoding::KOI8_R )
+				expect( @res.header_data ).to match( /accept-charset(?!-)/i )
 			end
 		end
 
@@ -159,9 +167,9 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.for_language( :sl ) { "Slovenian translation" }
 
 			@res.negotiated_body.rewind
-			@res.negotiated_body.read.should == "German translation"
-			@res.languages.should == ["de"]
-			@res.header_data.should =~ /accept-language/i
+			expect( @res.negotiated_body.read ).to eq( "German translation" )
+			expect( @res.languages ).to eq( ["de"] )
+			expect( @res.header_data ).to match( /accept-language/i )
 		end
 
 		it "can provide blocks for bodies of several different languages without setting a " +
@@ -175,9 +183,9 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.for_language( :sl ) { "Slovenian translation" }
 
 			@res.negotiated_body.rewind
-			@res.negotiated_body.read.should == "German translation"
-			@res.languages.should == ["de"]
-			@res.header_data.should =~ /accept-language/i
+			expect( @res.negotiated_body.read ).to eq( "German translation" )
+			expect( @res.languages ).to eq( ["de"] )
+			expect( @res.header_data ).to match( /accept-language/i )
 		end
 
 		it "can provide a single block for bodies of several different languages" do
@@ -195,9 +203,9 @@ describe Strelka::HTTPResponse::Negotiation do
 			end
 
 			@res.negotiated_body.rewind
-			@res.negotiated_body.read.should == "Portuguese translation"
-			@res.languages.should == ["pt"]
-			@res.header_data.should =~ /accept-language/i
+			expect( @res.negotiated_body.read ).to eq( "Portuguese translation" )
+			expect( @res.languages ).to eq( ["pt"] )
+			expect( @res.header_data ).to match( /accept-language/i )
 		end
 
 		it "calls the first block for requests with no accept-language header" do
@@ -210,9 +218,9 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.for_language( :sl ) { "Slovenian translation" }
 
 			@res.negotiated_body.rewind
-			@res.negotiated_body.read.should == "English translation"
-			@res.languages.should == ["en"]
-			@res.header_data.should =~ /accept-language/i
+			expect( @res.negotiated_body.read ).to eq( "English translation" )
+			expect( @res.languages ).to eq( ["en"] )
+			expect( @res.header_data ).to match( /accept-language/i )
 		end
 	end
 
@@ -229,10 +237,10 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.for_encoding( :gzip ) { @res.body << " (gzipped)" }
 
 			@res.negotiated_body.rewind
-			@res.negotiated_body.read.should == "the text body (gzipped)"
-			@res.encodings.should include( "gzip" )
-			@res.header_data.should =~ /accept-encoding/i
-			@res.header_data.should_not =~ /identity/i
+			expect( @res.negotiated_body.read ).to eq( "the text body (gzipped)" )
+			expect( @res.encodings ).to include( "gzip" )
+			expect( @res.header_data ).to match( /accept-encoding/i )
+			expect( @res.header_data ).to_not match( /identity/i )
 		end
 
 		it "chooses the content coding with the highest qvalue" do
@@ -245,10 +253,10 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.for_encoding( :gzip ) { @res.body << " (gzipped)" }
 
 			@res.negotiated_body.rewind
-			@res.negotiated_body.read.should == "the text body (deflated)"
-			@res.encodings.should include( "deflate" )
-			@res.header_data.should =~ /accept-encoding/i
-			@res.header_data.should_not =~ /identity/i
+			expect( @res.negotiated_body.read ).to eq( "the text body (deflated)" )
+			expect( @res.encodings ).to include( "deflate" )
+			expect( @res.header_data ).to match( /accept-encoding/i )
+			expect( @res.header_data ).to_not match( /identity/i )
 		end
 
 	end
@@ -261,14 +269,14 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept = 'application/x-yaml, application/json; q=0.7'
 			@res.content_type = 'application/json'
 
-			@res.should have_acceptable_content_type()
+			expect( @res ).to have_acceptable_content_type
 		end
 
 		it "knows that it is acceptable if its request doesn't have accepted types" do
 			@req.headers.delete( :accept )
 			@res.content_type = 'application/x-ruby-marshalled'
 
-			@res.should have_acceptable_content_type()
+			expect( @res ).to have_acceptable_content_type
 		end
 
 		it "knows that it is acceptable if it doesn't have an originating request" do
@@ -276,7 +284,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			res.extend( Strelka::HTTPResponse::Negotiation )
 			res.content_type = 'application/x-ruby-marshalled'
 
-			res.should have_acceptable_content_type()
+			expect( res ).to have_acceptable_content_type
 		end
 
 		it "knows that it is not acceptable if its content_type isn't in the list of " +
@@ -284,7 +292,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept = 'application/x-yaml, application/json; q=0.7'
 			@res.content_type = 'application/x-ruby-marshalled'
 
-			@res.should_not have_acceptable_content_type()
+			expect( @res ).to_not have_acceptable_content_type
 		end
 
 	end
@@ -297,20 +305,20 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_charset = 'iso-8859-5, utf-8;q=0.8'
 			@res.charset = 'iso-8859-5'
 
-			@res.should have_acceptable_charset()
+			expect( @res ).to have_acceptable_charset()
 		end
 
 		it "knows that it is acceptable if its request doesn't have accepted types" do
 			@req.headers.delete( :accept_charset )
 			@res.charset = 'koi8-u'
-			@res.should have_acceptable_charset()
+			expect( @res ).to have_acceptable_charset()
 		end
 
 		it "knows that it is acceptable if it doesn't have an originating request" do
 			res = Strelka::HTTPResponse.new( 'appid', 88 )
 			res.charset = 'iso8859-15'
 
-			res.should have_acceptable_charset()
+			expect( res ).to have_acceptable_charset()
 		end
 
 		it "knows that it is acceptable if its explicit charset is set to ascii-8bit" do
@@ -318,7 +326,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.content_type = 'image/jpeg'
 			@res.charset = Encoding::ASCII_8BIT
 
-			@res.should have_acceptable_charset()
+			expect( @res ).to have_acceptable_charset()
 		end
 
 		it "knows that it is acceptable if no charset can be derived, but the list of " +
@@ -327,7 +335,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.content_type = 'text/plain'
 			@res.body = "some stuff".force_encoding( Encoding::ASCII_8BIT )
 
-			@res.should have_acceptable_charset()
+			expect( @res ).to have_acceptable_charset()
 		end
 
 		it "knows that it is not acceptable if no charset can be derived, the content is a " +
@@ -336,7 +344,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.content_type = 'text/plain'
 			@res.body = "some stuff".force_encoding( Encoding::ASCII_8BIT )
 
-			@res.should_not have_acceptable_charset()
+			expect( @res ).to_not have_acceptable_charset()
 		end
 
 		it "knows that it is not acceptable if its explicit charset isn't in the list of " +
@@ -344,7 +352,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_charset = 'iso-8859-5, utf-8;q=0.8'
 			@res.charset = 'sjis'
 
-			@res.should_not have_acceptable_charset()
+			expect( @res ).to_not have_acceptable_charset()
 		end
 
 		it "knows that it is not acceptable if the charset in its content-type header isn't in " +
@@ -352,7 +360,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_charset = 'iso-8859-5, utf-8;q=0.8'
 			@res.content_type = 'text/plain; charset=sjis'
 
-			@res.should_not have_acceptable_charset()
+			expect( @res ).to_not have_acceptable_charset()
 		end
 
 		it "knows that it is not acceptable if the charset derived from its entity body isn't in " +
@@ -361,7 +369,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.content_type = 'text/plain'
 			@res.body = File.open( __FILE__, 'r:iso8859-5' )
 
-			@res.should_not have_acceptable_charset()
+			expect( @res ).to_not have_acceptable_charset()
 		end
 
 	end
@@ -374,7 +382,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_language = 'en-gb, en; q=0.7, ja;q=0.2'
 			@res.languages << 'ja'
 
-			@res.should have_acceptable_language()
+			expect( @res ).to have_acceptable_language()
 		end
 
 		it "knows that it is acceptable if all of its multiple languages are in the list of " +
@@ -382,7 +390,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_language = 'en-gb, en; q=0.7, ja;q=0.2'
 			@res.languages << 'ja' << 'en-us'
 
-			@res.should have_acceptable_language()
+			expect( @res ).to have_acceptable_language()
 		end
 
 		# I'm not sure if this is what RFC1616 means. It might be that *all* of its languages
@@ -392,7 +400,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_language = 'en-gb, en; q=0.7, ja;q=0.2'
 			@res.languages << 'pt' << 'en'
 
-			@res.should have_acceptable_language()
+			expect( @res ).to have_acceptable_language()
 		end
 
 		it "knows that it is acceptable if it has a body but doesn't have a language set" do
@@ -400,14 +408,14 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.languages.clear
 			@res.puts( "Some content in an unspecified language." )
 
-			@res.should have_acceptable_language()
+			expect( @res ).to have_acceptable_language()
 		end
 
 		it "knows that it is acceptable if it has no body yet" do
 			@req.headers.accept_language = 'en-gb, en; q=0.7, ja;q=0.2'
 			@res.languages.clear
 
-			@res.should have_acceptable_language()
+			expect( @res ).to have_acceptable_language()
 		end
 
 		it "knows that it is acceptable if it doesn't have an originating request" do
@@ -415,7 +423,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			res.extend( Strelka::HTTPResponse::Negotiation )
 			res.languages << 'kh'
 
-			res.should have_acceptable_language()
+			expect( res ).to have_acceptable_language()
 		end
 
 		it "knows that it is not acceptable if it has a single language that isn't in the " +
@@ -423,7 +431,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_language = 'en-gb, en; q=0.7, ja;q=0.2'
 			@res.languages << 'pt'
 
-			@res.should_not have_acceptable_language()
+			expect( @res ).to_not have_acceptable_language()
 		end
 
 		it "knows that it is not acceptable if it has multiple languages, none of which are " +
@@ -431,7 +439,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_language = 'en-gb, en; q=0.7, ja;q=0.2'
 			@res.languages << 'pt-br' << 'fr-ca'
 
-			@res.should_not have_acceptable_language()
+			expect( @res ).to_not have_acceptable_language()
 		end
 
 	end
@@ -444,7 +452,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_encoding = 'gzip;q=1.0, identity; q=0.5, *;q=0'
 			@res.encodings << 'gzip'
 
-			@res.should have_acceptable_encoding()
+			expect( @res ).to have_acceptable_encoding()
 		end
 
 		it "knows that it is acceptable if all of its content codings are in the list of accepted " +
@@ -452,7 +460,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_encoding = 'gzip;q=1.0, frobnify;q=0.9, identity; q=0.5, *;q=0'
 			@res.encodings << 'gzip' << 'frobnify'
 
-			@res.should have_acceptable_encoding()
+			expect( @res ).to have_acceptable_encoding()
 		end
 
 		it "knows that it is not acceptable if one of its content codings is not in the list " +
@@ -460,7 +468,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_encoding = 'gzip;q=1.0, identity; q=0.5, *;q=0'
 			@res.encodings << 'gzip' << 'frobnify'
 
-			@res.should_not have_acceptable_encoding()
+			expect( @res ).to_not have_acceptable_encoding()
 		end
 
 		it "knows that it is not acceptable if it doesn't have any explicit content codings " +
@@ -468,7 +476,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_encoding = 'gzip;q=1.0, identity; q=0'
 			@res.encodings.clear
 
-			@res.should_not have_acceptable_encoding()
+			expect( @res ).to_not have_acceptable_encoding()
 		end
 
 		it "knows that it is not acceptable if it doesn't have any explicit content codings " +
@@ -476,7 +484,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_encoding = 'gzip;q=1.0, identity; q=0'
 			@res.encodings.clear
 
-			@res.should_not have_acceptable_encoding()
+			expect( @res ).to_not have_acceptable_encoding()
 		end
 
 		it "knows that it is not acceptable if it doesn't have any explicit content codings, " +
@@ -484,7 +492,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@req.headers.accept_encoding = 'gzip;q=1.0, *;q=0'
 			@res.encodings.clear
 
-			@res.should_not have_acceptable_encoding()
+			expect( @res ).to_not have_acceptable_encoding()
 		end
 
 	end

data/spec/strelka/httpresponse/session_spec.rb

@@ -1,20 +1,10 @@
 # -*- rspec -*-
 # vim: set nosta noet ts=4 sw=4:
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
-}
+require_relative '../../helpers'
 
 require 'rspec'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/app/sessions'
 require 'strelka/httprequest/session'
@@ -51,34 +41,34 @@ describe Strelka::HTTPResponse::Session, "-extended response" do
 
 
 	it "has a session_namespace attribute" do
-		@res.should respond_to( :session_namespace )
+		expect( @res ).to respond_to( :session_namespace )
 	end
 
 	it "sets its request's session when its session is set" do
 		@res.session = Strelka::Session.create( :default )
 		pending "not sure if it should do this or not" do
-			@req.session.should be( @res.session )
+			expect( @req.session ).to be( @res.session )
 		end
 	end
 
 	context "for a request with no session ID" do
 
 		it "knows that it doesn't have a session" do
-			@res.should_not have_session()
+			expect( @res ).to_not have_session()
 		end
 
 		it "doesn't load the session when the session namespace is set" do
 			@res.session_namespace = 'an_appid'
-			@res.should_not have_session()
+			expect( @res ).to_not have_session()
 		end
 
 		it "creates a new session as soon as it's accessed" do
-			@res.session.should be_a( Strelka::Session::Default )
+			expect( @res.session ).to be_a( Strelka::Session::Default )
 		end
 
 		it "sets its session's namespace when it loads if the session_namespace is set" do
 			@res.session_namespace = 'an_appid'
-			@res.session.namespace.should == :an_appid
+			expect( @res.session.namespace ).to eq( :an_appid )
 		end
 
 
@@ -90,16 +80,16 @@ describe Strelka::HTTPResponse::Session, "-extended response" do
 			end
 
 			it "knows that it has a session" do
-				@res.should have_session()
+				expect( @res ).to have_session()
 			end
 
 			it "copies the session from its request when accessed" do
-				@res.session.should be( @session )
+				expect( @res.session ).to be( @session )
 			end
 
 			it "sets the session's namespace when its session_namespace is set" do
 				@res.session_namespace = 'the_appid'
-				@res.session.namespace.should == :the_appid
+				expect( @res.session.namespace ).to eq( :the_appid )
 			end
 
 		end
@@ -116,7 +106,7 @@ describe Strelka::HTTPResponse::Session, "-extended response" do
 		end
 
 		it "knows that it doesn't have a session unless the ID exists" do
-			@res.should_not have_session()
+			expect( @res ).to_not have_session()
 		end
 
 
@@ -127,49 +117,49 @@ describe Strelka::HTTPResponse::Session, "-extended response" do
 			end
 
 			it "knows that it has a session" do
-				@res.should have_session()
+				expect( @res ).to have_session()
 			end
 
 			it "knows that its session has been loaded if it has one" do
 				@res.session
-				@res.session_loaded?.should be_true()
+				expect( @res.session_loaded? ).to be_true()
 			end
 
 			it "knows that its session has been loaded if its request has one" do
 				@res.request.session
-				@res.session_loaded?.should be_true()
+				expect( @res.session_loaded? ).to be_true()
 			end
 
 			it "knows that its session hasn't been loaded if neither its request not itself has one" do
-				@res.session_loaded?.should be_false()
+				expect( @res.session_loaded? ).to be_false()
 			end
 
 			it "saves the session via itself if it was loaded" do
-				@res.cookies.should_not include( @cookie_name )
+				expect( @res.cookies ).to_not include( @cookie_name )
 				@res.session
 				@res.save_session
-				@res.cookies[ @cookie_name ].value.should == @sess_id
+				expect( @res.cookies[ @cookie_name ].value ).to eq( @sess_id )
 			end
 
 			it "doesn't save the session via itself if it wasn't loaded" do
-				@res.cookies.should_not include( @cookie_name )
+				expect( @res.cookies ).to_not include( @cookie_name )
 				@res.save_session
-				@res.cookies.should be_empty()
+				expect( @res.cookies ).to be_empty()
 			end
 
 			it "destroys the session via itself if it was loaded" do
-				@res.cookies.should_not include( @cookie_name )
+				expect( @res.cookies ).to_not include( @cookie_name )
 				@res.session
 				@res.destroy_session
-				@res.cookies[ @cookie_name ].value.should == @sess_id
-				@res.cookies[ @cookie_name ].expires.should < Time.now
+				expect( @res.cookies[ @cookie_name ].value ).to eq( @sess_id )
+				expect( @res.cookies[ @cookie_name ].expires ).to be < Time.now
 			end
 
 			it "destroys the session via itself even if it wasn't loaded" do
-				@res.cookies.should_not include( @cookie_name )
+				expect( @res.cookies ).to_not include( @cookie_name )
 				@res.destroy_session
-				@res.cookies[ @cookie_name ].value.should == @sess_id
-				@res.cookies[ @cookie_name ].expires.should < Time.now
+				expect( @res.cookies[ @cookie_name ].value ).to eq( @sess_id )
+				expect( @res.cookies[ @cookie_name ].expires ).to be < Time.now
 			end
 
 		end