From 33d2cdcc53bd46baaa1bbbcdc4748a9dec6b9db4 Mon Sep 17 00:00:00 2001 From: "cornel.borcean" Date: Mon, 12 Jan 2009 12:13:22 -0600 Subject: [PATCH] changed selenium_port to application_port to reflect what the variable is used for ... --- lib/webrat/core/configuration.rb | 30 ++++----- lib/webrat/selenium.rb | 18 ++--- lib/webrat/selenium/selenium_session.rb | 88 ++++++++++++------------- spec/private/core/configuration_spec.rb | 30 +++++---- spec/private/selenium/selenium_spec.rb | 19 ++++++ 5 files changed, 105 insertions(+), 80 deletions(-) create mode 100644 spec/private/selenium/selenium_spec.rb diff --git a/lib/webrat/core/configuration.rb b/lib/webrat/core/configuration.rb index b0dcfc1..d77e809 100755 --- a/lib/webrat/core/configuration.rb +++ b/lib/webrat/core/configuration.rb @@ -1,60 +1,60 @@ module Webrat - + # Configures Webrat. If this is not done, Webrat will be created - # with all of the default settings. + # with all of the default settings. def self.configure(configuration = Webrat::Configuration.new) yield configuration if block_given? @@configuration = configuration end - + def self.configuration # :nodoc: @@configuration ||= Webrat::Configuration.new end # Webrat can be configured using the Webrat.configure method. For example: - # + # # Webrat.configure do |config| # config.parse_with_nokogiri = false # end class Configuration - + # Should XHTML be parsed with Nokogiri? Defaults to true, except on JRuby. When false, Hpricot and REXML are used attr_writer :parse_with_nokogiri - + # Webrat's mode, set automatically when requiring webrat/rails, webrat/merb, etc. attr_accessor :mode # :nodoc: - + # Save and open pages with error status codes (500-599) in a browser? Defualts to true. attr_writer :open_error_files - + # Which environment should the selenium tests be run in? Defaults to selenium. attr_accessor :selenium_environment # Which port should the selenium tests be run on? Defaults to 3001. - attr_accessor :selenium_port + attr_accessor :application_port def initialize # :nodoc: self.open_error_files = true self.parse_with_nokogiri = !Webrat.on_java? self.selenium_environment = :selenium - self.selenium_port = 3001 + self.application_port = 3001 end - + def parse_with_nokogiri? #:nodoc: @parse_with_nokogiri ? true : false end - + def open_error_files? #:nodoc: @open_error_files ? true : false end - + # Allows setting of webrat's mode, valid modes are: # :rails, :selenium, :rack, :sinatra, :mechanize, :merb def mode=(mode) @mode = mode require("webrat/#{mode}") end - + end - + end \ No newline at end of file diff --git a/lib/webrat/selenium.rb b/lib/webrat/selenium.rb index 28a9485..11357f1 100644 --- a/lib/webrat/selenium.rb +++ b/lib/webrat/selenium.rb @@ -5,41 +5,41 @@ require "webrat/selenium/selenium_session" require "webrat/selenium/matchers" module Webrat - + def self.with_selenium_server #:nodoc: start_selenium_server yield stop_selenium_server end - + def self.start_selenium_server #:nodoc: remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 4444, 5) remote_control.jar_file = File.expand_path(__FILE__ + "../../../../vendor/selenium-server.jar") remote_control.start :background => true TCPSocket.wait_for_service :host => "0.0.0.0", :port => 4444 end - + def self.stop_selenium_server #:nodoc: remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 4444, 5) remote_control.stop end - + def self.start_app_server #:nodoc: pid_file = File.expand_path(RAILS_ROOT + "/tmp/pids/mongrel_selenium.pid") - system("mongrel_rails start -d --chdir=#{RAILS_ROOT} --port=#{Webrat.configuration.selenium_port} --environment=#{Webrat.configuration.selenium_environment} --pid #{pid_file} &") - TCPSocket.wait_for_service :host => "0.0.0.0", :port => Webrat.configuration.selenium_port.to_i + system("mongrel_rails start -d --chdir=#{RAILS_ROOT} --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.selenium_environment} --pid #{pid_file} &") + TCPSocket.wait_for_service :host => "0.0.0.0", :port => Webrat.configuration.application_port.to_i end - + def self.stop_app_server #:nodoc: pid_file = File.expand_path(RAILS_ROOT + "/tmp/pids/mongrel_selenium.pid") system "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}" end - + # To use Webrat's Selenium support, you'll need the selenium-client gem installed. # Activate it with (for example, in your env.rb): # # require "webrat" - # + # # Webrat.configure do |config| # config.mode = :selenium # end diff --git a/lib/webrat/selenium/selenium_session.rb b/lib/webrat/selenium/selenium_session.rb index 460269e..c8f9e58 100644 --- a/lib/webrat/selenium/selenium_session.rb +++ b/lib/webrat/selenium/selenium_session.rb @@ -3,56 +3,56 @@ require "webrat/core/save_and_open_page" module Webrat class TimeoutError < WebratError end - + class SeleniumResponse attr_reader :body attr_reader :session - + def initialize(session, body) @session = session @body = body end - + def selenium session.selenium end end - + class SeleniumSession include Webrat::SaveAndOpenPage - + def initialize(*args) # :nodoc: end - + def simulate end - + def automate yield end - + def visit(url) selenium.open(url) end - + webrat_deprecate :visits, :visit - + def fill_in(field_identifier, options) locator = "webrat=#{Regexp.escape(field_identifier)}" selenium.wait_for_element locator, 5 selenium.type(locator, "#{options[:with]}") end - + webrat_deprecate :fills_in, :fill_in - + def response SeleniumResponse.new(self, response_body) end - + def response_body #:nodoc: selenium.get_html_source end - + def click_button(button_text_or_regexp = nil, options = {}) if button_text_or_regexp.is_a?(Hash) && options == {} pattern, options = nil, button_text_or_regexp @@ -61,11 +61,11 @@ module Webrat end pattern ||= '*' locator = "button=#{pattern}" - + selenium.wait_for_element locator, 5 selenium.click locator end - + webrat_deprecate :clicks_button, :click_button def click_link(link_text_or_regexp, options = {}) @@ -74,53 +74,53 @@ module Webrat selenium.wait_for_element locator, 5 selenium.click locator end - + webrat_deprecate :clicks_link, :click_link - + def click_link_within(selector, link_text, options = {}) locator = "webratlinkwithin=#{selector}|#{link_text}" selenium.wait_for_element locator, 5 selenium.click locator end - + webrat_deprecate :clicks_link_within, :click_link_within - + def select(option_text, options = {}) id_or_name_or_label = options[:from] - + if id_or_name_or_label select_locator = "webrat=#{id_or_name_or_label}" else select_locator = "webratselectwithoption=#{option_text}" end - + selenium.wait_for_element select_locator, 5 selenium.select(select_locator, option_text) end - + webrat_deprecate :selects, :select - + def choose(label_text) locator = "webrat=#{label_text}" selenium.wait_for_element locator, 5 selenium.click locator end - + webrat_deprecate :chooses, :choose - + def check(label_text) locator = "webrat=#{label_text}" selenium.wait_for_element locator, 5 selenium.check locator end - + webrat_deprecate :checks, :check def fire_event(field_identifier, event) locator = "webrat=#{Regexp.escape(field_identifier)}" selenium.fire_event(locator, "#{event}") end - + def key_down(field_identifier, key_code) locator = "webrat=#{Regexp.escape(field_identifier)}" selenium.key_down(locator, key_code) @@ -130,7 +130,7 @@ module Webrat locator = "webrat=#{Regexp.escape(field_identifier)}" selenium.key_up(locator, key_code) end - + def wait_for(params={}) timeout = params[:timeout] || 5 message = params[:message] || "Timeout exceeded" @@ -154,21 +154,21 @@ module Webrat raise Webrat::TimeoutError.new(message + " (after #{timeout} sec)") true end - + def selenium return $browser if $browser setup $browser end - + webrat_deprecate :browser, :selenium - - + + def save_and_open_screengrab return unless File.exist?(saved_page_dir) - + filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.png" - + if $browser.chrome_backend? $browser.capture_entire_page_screenshot(filename, '') else @@ -176,25 +176,25 @@ module Webrat end open_in_browser(filename) end - + protected - + def setup #:nodoc: silence_stream(STDOUT) do Webrat.start_selenium_server Webrat.start_app_server end - + $browser = ::Selenium::Client::Driver.new("localhost", 4444, "*firefox", "http://0.0.0.0:3001") $browser.set_speed(0) $browser.start teardown_at_exit - + extend_selenium define_location_strategies $browser.window_maximize end - + def teardown_at_exit #:nodoc: at_exit do silence_stream(STDOUT) do @@ -204,21 +204,21 @@ module Webrat end end end - + def adjust_if_regexp(text_or_regexp) #:nodoc: if text_or_regexp.is_a?(Regexp) "evalregex:#{text_or_regexp.inspect}" else "evalregex:/#{text_or_regexp}/" - end + end end - + def extend_selenium #:nodoc: extensions_file = File.join(File.dirname(__FILE__), "selenium_extensions.js") extenions_js = File.read(extensions_file) selenium.get_eval(extenions_js) end - + def define_location_strategies #:nodoc: Dir[File.join(File.dirname(__FILE__), "location_strategy_javascript", "*.js")].sort.each do |file| strategy_js = File.read(file) diff --git a/spec/private/core/configuration_spec.rb b/spec/private/core/configuration_spec.rb index b29d473..08e4ac3 100755 --- a/spec/private/core/configuration_spec.rb +++ b/spec/private/core/configuration_spec.rb @@ -7,44 +7,44 @@ describe Webrat::Configuration do it "should have a mode" do Webrat.configuration.should respond_to(:mode) end - + it "should use Nokogiri as the parser by default" do Webrat.stub!(:on_java? => false) config = Webrat::Configuration.new config.should parse_with_nokogiri end - + it "should not use Nokogiri as the parser when on JRuby" do Webrat.stub!(:on_java? => true) config = Webrat::Configuration.new config.should_not parse_with_nokogiri end - + it "should open error files by default" do config = Webrat::Configuration.new config.should open_error_files end - + it "should use 'selenium' as the selenium environment by default" do config = Webrat::Configuration.new config.selenium_environment.should == :selenium end - - it "should use 3001 as the selenium port by default" do + + it "should use 3001 as the application port by default" do config = Webrat::Configuration.new - config.selenium_port.should == 3001 + config.application_port.should == 3001 end - + it "should be configurable with a block" do Webrat.configure do |config| config.open_error_files = false end - + config = Webrat.configuration config.should_not open_error_files end - - [:rails, + + [:rails, :selenium, :rack, :sinatra, @@ -56,4 +56,10 @@ describe Webrat::Configuration do config.mode = mode end end -end \ No newline at end of file + + describe "Selenium config" do + + end + +end + diff --git a/spec/private/selenium/selenium_spec.rb b/spec/private/selenium/selenium_spec.rb new file mode 100644 index 0000000..3934af1 --- /dev/null +++ b/spec/private/selenium/selenium_spec.rb @@ -0,0 +1,19 @@ +require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') +require "action_controller" +require "action_controller/integration" +require "webrat/selenium" + +RAILS_ROOT = "/" + + +describe Webrat, "Selenium" do + + it "should start the app server with correct config options" do + pid_file = "file" + File.should_receive(:expand_path).with(RAILS_ROOT + "/tmp/pids/mongrel_selenium.pid").and_return pid_file + Webrat.should_receive(:system).with("mongrel_rails start -d --chdir=#{RAILS_ROOT} --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.selenium_environment} --pid #{pid_file} &") + TCPSocket.should_receive(:wait_for_service).with(:host => "0.0.0.0", :port => Webrat.configuration.application_port.to_i) + Webrat.start_app_server + end + +end \ No newline at end of file