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

use bin/merb if it's available for appserver startup

Browse Source
This commit is contained in:
Corey Donohoe 2009-02-18 12:31:52 -07:00
parent 92565d3bc4
commit ec06c76b91
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/webrat/selenium.rb
View File

@ -41,7 +41,11 @@ 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} -e #{Webrat.configuration.application_environment}") cmd = 'merb'
if File.exist?('bin/merb')
cmd = 'bin/merb'
end
system("#{cmd} -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