it helps if i make sure the spec suite still passes :\
This commit is contained in:
parent
69dfa5022a
commit
63337d4476
@ -64,7 +64,7 @@ module Webrat
|
|||||||
self.application_environment = :selenium
|
self.application_environment = :selenium
|
||||||
self.application_port = 3001
|
self.application_port = 3001
|
||||||
self.application_address = 'localhost'
|
self.application_address = 'localhost'
|
||||||
self.application_type = 'rails'
|
self.application_framework = 'rails'
|
||||||
self.selenium_server_port = 4444
|
self.selenium_server_port = 4444
|
||||||
self.infinite_redirect_limit = 10
|
self.infinite_redirect_limit = 10
|
||||||
self.selenium_browser_key = '*firefox'
|
self.selenium_browser_key = '*firefox'
|
||||||
|
@ -41,7 +41,7 @@ module Webrat
|
|||||||
exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-p', Webrat.configuration.application_port.to_s
|
exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-p', Webrat.configuration.application_port.to_s
|
||||||
end
|
end
|
||||||
when :merb
|
when :merb
|
||||||
system("merb -d -p #{Webrat.configuration.application_port}"
|
system("merb -d -p #{Webrat.configuration.application_port}")
|
||||||
else # rails
|
else # rails
|
||||||
system("mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &")
|
system("mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &")
|
||||||
end
|
end
|
||||||
|
@ -21,7 +21,7 @@ describe Webrat, "Selenium" do
|
|||||||
describe "merb" do
|
describe "merb" do
|
||||||
it "should start the app server with correct config options" do
|
it "should start the app server with correct config options" do
|
||||||
Webrat.configuration.application_framework = :merb
|
Webrat.configuration.application_framework = :merb
|
||||||
Webrat.should_receive(:fork)
|
Webrat.should_receive(:system).with("merb -d -p #{Webrat.configuration.application_port}")
|
||||||
# Kernel.should_receive(:exec).with(['merb', '-d', '-p', Webrat.configuration.application_port])
|
# Kernel.should_receive(:exec).with(['merb', '-d', '-p', Webrat.configuration.application_port])
|
||||||
TCPSocket.should_receive(:wait_for_service).with(:host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i)
|
TCPSocket.should_receive(:wait_for_service).with(:host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i)
|
||||||
Webrat.start_app_server
|
Webrat.start_app_server
|
||||||
|
Loading…
Reference in New Issue
Block a user