route_spec.rb in mongrel2-0.39.0

- old
+ new

@@ -1,21 +1,10 @@
 #!/usr/bin/env ruby
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
+require_relative '../../helpers'
 
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
-}
-
 require 'rspec'
-
-require 'spec/lib/helpers'
-
 require 'mongrel2'
 require 'mongrel2/config'
 
 
 #####################################################################
@@ -35,29 +24,30 @@
 
 	after( :all ) do
 		reset_logging()
 	end
 
+
 	it "returns a Mongrel2::Config::Directory if its target_type is 'dir'" do
 		dir = Mongrel2::Config::Directory.create(
 			:base => 'var/www/',
 			:default_ctype => 'text/plain',
 			:index_file => 'index.html' )
 
 		@route.target_type = 'dir'
 		@route.target_id = dir.id
 
-		@route.target.should == dir
+		expect( @route.target ).to eq( dir )
 	end
 
 	it "returns a Mongrel2::Config::Proxy if its target_type is 'proxy'" do
 		proxy = Mongrel2::Config::Proxy.create( :addr => '10.2.18.8' )
 
 		@route.target_type = 'proxy'
 		@route.target_id = proxy.id
 
-		@route.target.should == proxy
+		expect( @route.target ).to eq( proxy )
 	end
 
 	it "returns a Mongrel2::Config::Handler if its target_type is 'handler'" do
 		handler = Mongrel2::Config::Handler.create(
 			:send_ident => TEST_UUID,
@@ -65,10 +55,10 @@
 			:recv_spec => 'tcp://127.0.0.1:9997' )
 
 		@route.target_type = 'handler'
 		@route.target_id = handler.id
 
-		@route.target.should == handler
+		expect( @route.target ).to eq( handler )
 	end
 
 	it "raises an exception if its target_type is set to something invalid" do
 		@route.target_type = 'giraffes'
 