add the ability for selenium mode to create pids dirs
This commit is contained in:
parent
2c9b546a83
commit
da59584cdf
|
@ -26,6 +26,7 @@ module Webrat
|
|||
end
|
||||
|
||||
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")
|
||||
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
|
||||
|
@ -89,7 +90,6 @@ module ActionController #:nodoc:
|
|||
IntegrationTest.class_eval do
|
||||
include Webrat::Methods
|
||||
include Webrat::Selenium::Methods
|
||||
# include Webrat::Matchers
|
||||
include Webrat::Selenium::Matchers
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
ENV["RAILS_ENV"] = "test"
|
||||
require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
|
||||
require 'test_help'
|
||||
require "redgreen"
|
||||
|
||||
require File.dirname(__FILE__) + "/../../../../lib/webrat"
|
||||
|
||||
|
|
Loading…
Reference in New Issue