add the ability for selenium mode to create pids dirs

This commit is contained in:
Amos King 2009-01-23 15:34:51 -06:00
parent 2c9b546a83
commit da59584cdf
4 changed files with 1 additions and 2 deletions

View File

@ -26,6 +26,7 @@ module Webrat
end end
def self.start_app_server #:nodoc: def self.start_app_server #:nodoc:
FileUtils.mkdir_p File.expand_path(RAILS_ROOT + "/tmp/pids")
pid_file = File.expand_path(RAILS_ROOT + "/tmp/pids/mongrel_selenium.pid") pid_file = File.expand_path(RAILS_ROOT + "/tmp/pids/mongrel_selenium.pid")
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} &")
TCPSocket.wait_for_service :host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i TCPSocket.wait_for_service :host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i
@ -89,7 +90,6 @@ module ActionController #:nodoc:
IntegrationTest.class_eval do IntegrationTest.class_eval do
include Webrat::Methods include Webrat::Methods
include Webrat::Selenium::Methods include Webrat::Selenium::Methods
# include Webrat::Matchers
include Webrat::Selenium::Matchers include Webrat::Selenium::Matchers
end end
end end

View File

@ -1,7 +1,6 @@
ENV["RAILS_ENV"] = "test" ENV["RAILS_ENV"] = "test"
require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
require 'test_help' require 'test_help'
require "redgreen"
require File.dirname(__FILE__) + "/../../../../lib/webrat" require File.dirname(__FILE__) + "/../../../../lib/webrat"