mongrel2 0.38.0 → 0.39.0

data/spec/mongrel2/config/filter_spec.rb

@@ -1,19 +1,8 @@
 #!/usr/bin/env ruby
 
-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 'mongrel2'
 require 'mongrel2/config'
 

data/spec/mongrel2/config/handler_spec.rb

@@ -1,19 +1,8 @@
 #!/usr/bin/env ruby
 
-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 'mongrel2'
 require 'mongrel2/config'
 
@@ -25,11 +14,12 @@ require 'mongrel2/config'
 describe Mongrel2::Config::Handler do
 
 	before( :all ) do
-		setup_logging( :fatal )
+		setup_logging()
 		setup_config_db()
 	end
 
 	before( :each ) do
+		Mongrel2::Config::Handler.truncate
 		@handler = Mongrel2::Config::Handler.new(
 			:send_spec  => TEST_SEND_SPEC,
 			:send_ident => TEST_UUID,
@@ -43,75 +33,75 @@ describe Mongrel2::Config::Handler do
 	end
 
 	it "is valid if its specs and identities are all valid" do
-		@handler.should be_valid()
+		expect( @handler ).to be_valid()
 	end
 
 
 	it "isn't valid if it doesn't have a send_spec" do
 		@handler.send_spec = nil
-		@handler.should_not be_valid()
-		@handler.errors.full_messages.first.should =~ /must not be nil/i
+		expect( @handler ).to_not be_valid()
+		expect( @handler.errors.full_messages.first ).to match( /must not be nil/i )
 	end
 
 	it "isn't valid if it doesn't have a recv_spec" do
 		@handler.recv_spec = nil
-		@handler.should_not be_valid()
-		@handler.errors.full_messages.first.should =~ /must not be nil/i
+		expect( @handler ).to_not be_valid()
+		expect( @handler.errors.full_messages.first ).to match( /must not be nil/i )
 	end
 
 
 	it "isn't valid if it doesn't have a valid URL in its send_spec" do
 		@handler.send_spec = 'carrier pigeon'
-		@handler.should_not be_valid()
-		@handler.errors.full_messages.first.should =~ /not a uri/i
+		expect( @handler ).to_not be_valid()
+		expect( @handler.errors.full_messages.first ).to match( /not a uri/i )
 	end
 
 	it "isn't valid if it doesn't have a valid URL in its recv_spec" do
 		@handler.recv_spec = 'smoke signals'
-		@handler.should_not be_valid()
-		@handler.errors.full_messages.first.should =~ /not a uri/i
+		expect( @handler ).to_not be_valid()
+		expect( @handler.errors.full_messages.first ).to match( /not a uri/i )
 	end
 
 
 	it "isn't valid if has an unsupported transport in its send_spec" do
 		@handler.send_spec = 'inproc://application'
-		@handler.should_not be_valid()
-		@handler.errors.full_messages.first.should =~ /invalid 0mq transport/i
+		expect( @handler ).to_not be_valid()
+		expect( @handler.errors.full_messages.first ).to match( /invalid 0mq transport/i )
 	end
 
 	it "isn't valid if has an unsupported transport in its recv_spec" do
 		@handler.recv_spec = 'inproc://application'
-		@handler.should_not be_valid()
-		@handler.errors.full_messages.first.should =~ /invalid 0mq transport/i
+		expect( @handler ).to_not be_valid()
+		expect( @handler.errors.full_messages.first ).to match( /invalid 0mq transport/i )
 	end
 
 
 	it "isn't valid if it doesn't have a send_ident" do
 		@handler.send_ident = nil
-		@handler.should_not be_valid()
-		@handler.errors.full_messages.first.should =~ /invalid sender identity/i
+		expect( @handler ).to_not be_valid()
+		expect( @handler.errors.full_messages.first ).to match( /invalid sender identity/i )
 	end
 
 	it "*is* valid if it doesn't have a recv_ident" do
 		@handler.recv_ident = nil
-		@handler.should be_valid()
+		expect( @handler ).to be_valid()
 	end
 
 
 	it "is valid if it has 'json' set as the protocol" do
 		@handler.protocol = 'json'
-		@handler.should be_valid()
+		expect( @handler ).to be_valid()
 	end
 
 	it "is valid if it has 'tnetstring' set as the protocol" do
 		@handler.protocol = 'tnetstring'
-		@handler.should be_valid()
+		expect( @handler ).to be_valid()
 	end
 
 	it "isn't valid if it has an invalid protocol" do
 		@handler.protocol = 'morsecode'
-		@handler.should_not be_valid()
-		@handler.errors.full_messages.first.should =~ /invalid/i
+		expect( @handler ).to_not be_valid()
+		expect( @handler.errors.full_messages.first ).to match( /invalid/i )
 	end
 
 	it "isn't valid if its send_spec isn't unique" do

data/spec/mongrel2/config/host_spec.rb

@@ -1,19 +1,8 @@
 #!/usr/bin/env ruby
 
-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 'mongrel2'
 require 'mongrel2/config'
 

data/spec/mongrel2/config/log_spec.rb

@@ -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 'socket'
 require 'rspec'
 
-require 'spec/lib/constants'
-require 'spec/lib/helpers'
-
+require 'socket'
 require 'mongrel2'
 require 'mongrel2/config'
 
@@ -27,7 +16,7 @@ require 'mongrel2/config'
 describe Mongrel2::Config::Log do
 
 	before( :all ) do
-		setup_logging( :fatal )
+		setup_logging()
 		setup_config_db()
 	end
 
@@ -44,10 +33,10 @@ describe Mongrel2::Config::Log do
 
 		log = Mongrel2::Config::Log.log_action( what, why, where, how )
 
-		log.what.should == what
-		log.why.should == why
-		log.location.should == where
-		log.how.should == how
+		expect( log.what ).to eq( what )
+		expect( log.why ).to eq( why )
+		expect( log.location ).to eq( where )
+		expect( log.how ).to eq( how )
 	end
 
 	it "has reasonable defaults for 'where' and 'how'" do
@@ -56,8 +45,8 @@ describe Mongrel2::Config::Log do
 
 		log = Mongrel2::Config::Log.log_action( what, why )
 
-		log.location.should == Socket.gethostname
-		log.how.should == File.basename( $0 )
+		expect( log.location ).to eq( Socket.gethostname )
+		expect( log.how ).to eq( File.basename( $0 ) )
 	end
 
 	describe "an entry" do
@@ -76,7 +65,7 @@ describe Mongrel2::Config::Log do
 		it "stringifies as a readable log file line" do
 
 			# 2011-09-09 20:29:47 -0700 [mgranger] @localhost m2sh: load etc/mongrel2.conf (updating)
-			@log.to_s.should =~ %r{
+			expect( @log.to_s ).to match(%r{
 				^
 				(?-x:\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [\+\-]\d{4} )
 				\[who\] \s
@@ -84,14 +73,14 @@ describe Mongrel2::Config::Log do
 				how: \s
 				what
 				$
-			}x
+			}x)
 		end
 
 		it "stringifies with a reason if it has one" do
 			@log.why = 'Because'
 
 			# 2011-09-09 20:29:47 -0700 [mgranger] @localhost m2sh: load etc/mongrel2.conf (updating)
-			@log.to_s.should =~ %r{
+			expect( @log.to_s ).to match(%r{
 				^
 				(?-x:\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [\+\-]\d{4} )
 				\[who\] \s
@@ -100,7 +89,7 @@ describe Mongrel2::Config::Log do
 				what \s
 				\(Because\)
 				$
-			}x
+			}x)
 		end
 
 	end

data/spec/mongrel2/config/proxy_spec.rb

@@ -1,19 +1,8 @@
 #!/usr/bin/env ruby
 
-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 'mongrel2'
 require 'mongrel2/config'
 

data/spec/mongrel2/config/route_spec.rb

@@ -1,19 +1,8 @@
 #!/usr/bin/env ruby
 
-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 'mongrel2'
 require 'mongrel2/config'
 
@@ -37,6 +26,7 @@ describe Mongrel2::Config::Route 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/',
@@ -46,7 +36,7 @@ describe Mongrel2::Config::Route do
 		@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
@@ -55,7 +45,7 @@ describe Mongrel2::Config::Route do
 		@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
@@ -67,7 +57,7 @@ describe Mongrel2::Config::Route do
 		@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

data/spec/mongrel2/config/server_spec.rb

@@ -1,19 +1,8 @@
 #!/usr/bin/env ruby
 
-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 'mongrel2'
 require 'mongrel2/config'
 
@@ -25,7 +14,7 @@ require 'mongrel2/config'
 describe Mongrel2::Config::Server do
 
 	before( :all ) do
-		setup_logging( :fatal )
+		setup_logging()
 		setup_config_db()
 	end
 
@@ -47,53 +36,53 @@ describe Mongrel2::Config::Server do
 
 
 	it "is valid if its access_log, error_log, pid_file, default_host, and port are all valid" do
-		@server.should be_valid()
+		expect( @server ).to be_valid()
 	end
 
 	it "isn't valid if it doesn't have an access_log path" do
 		@server.access_log = nil
-		@server.should_not be_valid()
-		@server.errors.full_messages.first.should =~ /missing or nil/i
+		expect( @server ).to_not be_valid()
+		expect( @server.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
 	it "isn't valid if it doesn't have an error_log path" do
 		@server.error_log = nil
-		@server.should_not be_valid()
-		@server.errors.full_messages.first.should =~ /missing or nil/i
+		expect( @server ).to_not be_valid()
+		expect( @server.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
 	it "isn't valid if it doesn't have an pid_file path" do
 		@server.pid_file = nil
-		@server.should_not be_valid()
-		@server.errors.full_messages.first.should =~ /missing or nil/i
+		expect( @server ).to_not be_valid()
+		expect( @server.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
 	it "isn't valid if it doesn't have a default_host" do
 		@server.default_host = nil
-		@server.should_not be_valid()
-		@server.errors.full_messages.first.should =~ /missing or nil/i
+		expect( @server ).to_not be_valid()
+		expect( @server.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
 	it "isn't valid if it doesn't specify a port" do
 		@server.port = nil
-		@server.should_not be_valid()
-		@server.errors.full_messages.first.should =~ /missing or nil/i
+		expect( @server ).to_not be_valid()
+		expect( @server.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
 
 	it "knows where its control socket is if there's no setting for control_port" do
 		Mongrel2::Config::Setting.dataset.truncate
-		FileTest.stub( :socket? ).with( '/usr/local/www/run/control' ).
+		allow( FileTest ).to receive( :socket? ).with( '/usr/local/www/run/control' ).
 			and_return( true )
-		@server.control_socket_uri.should == 'ipc:///usr/local/www/run/control'
+		expect( @server.control_socket_uri ).to eq( 'ipc:///usr/local/www/run/control' )
 	end
 
 	it "knows where its control socket is if there is a setting for control_port" do
 		Mongrel2::Config::Setting.dataset.truncate
-		FileTest.stub( :socket? ).with( '/usr/local/www/var/run/control.sock' ).
+		allow( FileTest ).to receive( :socket? ).with( '/usr/local/www/var/run/control.sock' ).
 			and_return( true )
 		Mongrel2::Config::Setting.create( key: 'control_port', value: 'ipc://var/run/control.sock' )
-		@server.control_socket_uri.should == 'ipc:///usr/local/www/var/run/control.sock'
+		expect( @server.control_socket_uri ).to eq( 'ipc:///usr/local/www/var/run/control.sock' )
 	end
 
 	it "raises an error if the control socket path doesn't point to a UNIX socket" do
@@ -104,23 +93,23 @@ describe Mongrel2::Config::Server do
 
 	it "can create a Mongrel2::Control for its control port" do
 		Mongrel2::Config::Setting.dataset.truncate
-		FileTest.stub( :socket? ).with( '/usr/local/www/run/control' ).
+		allow( FileTest ).to receive( :socket? ).with( '/usr/local/www/run/control' ).
 			and_return( true )
 		sock = @server.control_socket
-		sock.should be_a( Mongrel2::Control )
+		expect( sock ).to be_a( Mongrel2::Control )
 		sock.close
 	end
 
 	it "knows what the Pathname of its PID file is" do
 		pidfile = @server.pid_file_path
-		pidfile.should be_a( Pathname )
-		pidfile.to_s.should == '/run/mongrel2.pid'
+		expect( pidfile ).to be_a( Pathname )
+		expect( pidfile.to_s ).to eq( '/run/mongrel2.pid' )
 	end
 
 	it "has a predicate that understands the use_ssl value" do
-		@server.use_ssl.should be_false()
+		expect( @server.use_ssl ).to be_false()
 		@server.use_ssl = true
-		@server.use_ssl.should be_true()
+		expect( @server.use_ssl ).to be_true()
 	end
 
 end