github-migration
/
webrat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use application_environment in merb also

This commit is contained in:
Corey Donohoe 2009-02-18 12:16:19 -07:00
parent 4fb9406154
commit 92565d3bc4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/webrat/selenium.rb
View File

@ -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} -e #{Webrat.configuration.application_environment}")
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

2
spec/private/selenium/selenium_spec.rb
View File

@ -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(:system).with("merb -d -p #{Webrat.configuration.application_port}") Webrat.should_receive(:system).with("merb -d -p #{Webrat.configuration.application_port} -e #{Webrat.configuration.application_environment}")
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
end end