test/integration/api/wait_for_element_spec.rb test/integration/sample-app/public/jquery-1.3.2.js test/integration/sample-app/public/prototype-1.6.0.3.js test/integration/sample-app/public/prototype.html test/integration/sample-app/sample_app.rb vendor/rack-0.9.1/AUTHORS vendor/rack-0.9.1/COPYING vendor/rack-0.9.1/KNOWN-ISSUES vendor/rack-0.9.1/RDOX vendor/rack-0.9.1/README vendor/rack-0.9.1/Rakefile vendor/rack-0.9.1/SPEC vendor/rack-0.9.1/bin/rackup vendor/rack-0.9.1/contrib/rack_logo.svg vendor/rack-0.9.1/example/lobster.ru vendor/rack-0.9.1/example/protectedlobster.rb vendor/rack-0.9.1/example/protectedlobster.ru vendor/rack-0.9.1/lib/rack.rb vendor/rack-0.9.1/lib/rack/adapter/camping.rb vendor/rack-0.9.1/lib/rack/auth/abstract/handler.rb vendor/rack-0.9.1/lib/rack/auth/abstract/request.rb vendor/rack-0.9.1/lib/rack/auth/basic.rb vendor/rack-0.9.1/lib/rack/auth/digest/md5.rb vendor/rack-0.9.1/lib/rack/auth/digest/nonce.rb vendor/rack-0.9.1/lib/rack/auth/digest/params.rb vendor/rack-0.9.1/lib/rack/auth/digest/request.rb vendor/rack-0.9.1/lib/rack/auth/openid.rb vendor/rack-0.9.1/lib/rack/builder.rb vendor/rack-0.9.1/lib/rack/cascade.rb vendor/rack-0.9.1/lib/rack/commonlogger.rb vendor/rack-0.9.1/lib/rack/conditionalget.rb vendor/rack-0.9.1/lib/rack/content_length.rb vendor/rack-0.9.1/lib/rack/deflater.rb vendor/rack-0.9.1/lib/rack/directory.rb vendor/rack-0.9.1/lib/rack/file.rb vendor/rack-0.9.1/lib/rack/handler.rb vendor/rack-0.9.1/lib/rack/handler/cgi.rb vendor/rack-0.9.1/lib/rack/handler/evented_mongrel.rb vendor/rack-0.9.1/lib/rack/handler/fastcgi.rb vendor/rack-0.9.1/lib/rack/handler/lsws.rb vendor/rack-0.9.1/lib/rack/handler/mongrel.rb vendor/rack-0.9.1/lib/rack/handler/scgi.rb vendor/rack-0.9.1/lib/rack/handler/swiftiplied_mongrel.rb vendor/rack-0.9.1/lib/rack/handler/thin.rb vendor/rack-0.9.1/lib/rack/handler/webrick.rb vendor/rack-0.9.1/lib/rack/head.rb vendor/rack-0.9.1/lib/rack/lint.rb vendor/rack-0.9.1/lib/rack/lobster.rb vendor/rack-0.9.1/lib/rack/methodoverride.rb vendor/rack-0.9.1/lib/rack/mime.rb vendor/rack-0.9.1/lib/rack/mock.rb vendor/rack-0.9.1/lib/rack/recursive.rb vendor/rack-0.9.1/lib/rack/reloader.rb vendor/rack-0.9.1/lib/rack/request.rb vendor/rack-0.9.1/lib/rack/response.rb vendor/rack-0.9.1/lib/rack/session/abstract/id.rb vendor/rack-0.9.1/lib/rack/session/cookie.rb vendor/rack-0.9.1/lib/rack/session/memcache.rb vendor/rack-0.9.1/lib/rack/session/pool.rb vendor/rack-0.9.1/lib/rack/showexceptions.rb vendor/rack-0.9.1/lib/rack/showstatus.rb vendor/rack-0.9.1/lib/rack/static.rb vendor/rack-0.9.1/lib/rack/urlmap.rb vendor/rack-0.9.1/lib/rack/utils.rb vendor/rack-0.9.1/test/cgi/lighttpd.conf vendor/rack-0.9.1/test/cgi/test vendor/rack-0.9.1/test/cgi/test.fcgi vendor/rack-0.9.1/test/cgi/test.ru vendor/rack-0.9.1/test/spec_rack_auth_basic.rb vendor/rack-0.9.1/test/spec_rack_auth_digest.rb vendor/rack-0.9.1/test/spec_rack_auth_openid.rb vendor/rack-0.9.1/test/spec_rack_builder.rb vendor/rack-0.9.1/test/spec_rack_camping.rb vendor/rack-0.9.1/test/spec_rack_cascade.rb vendor/rack-0.9.1/test/spec_rack_cgi.rb vendor/rack-0.9.1/test/spec_rack_commonlogger.rb vendor/rack-0.9.1/test/spec_rack_conditionalget.rb vendor/rack-0.9.1/test/spec_rack_content_length.rb vendor/rack-0.9.1/test/spec_rack_deflater.rb vendor/rack-0.9.1/test/spec_rack_directory.rb vendor/rack-0.9.1/test/spec_rack_fastcgi.rb vendor/rack-0.9.1/test/spec_rack_file.rb vendor/rack-0.9.1/test/spec_rack_handler.rb vendor/rack-0.9.1/test/spec_rack_head.rb vendor/rack-0.9.1/test/spec_rack_lint.rb vendor/rack-0.9.1/test/spec_rack_lobster.rb vendor/rack-0.9.1/test/spec_rack_methodoverride.rb vendor/rack-0.9.1/test/spec_rack_mock.rb vendor/rack-0.9.1/test/spec_rack_mongrel.rb vendor/rack-0.9.1/test/spec_rack_recursive.rb vendor/rack-0.9.1/test/spec_rack_request.rb vendor/rack-0.9.1/test/spec_rack_response.rb vendor/rack-0.9.1/test/spec_rack_session_cookie.rb vendor/rack-0.9.1/test/spec_rack_session_memcache.rb vendor/rack-0.9.1/test/spec_rack_session_pool.rb vendor/rack-0.9.1/test/spec_rack_showexceptions.rb vendor/rack-0.9.1/test/spec_rack_showstatus.rb vendor/rack-0.9.1/test/spec_rack_static.rb vendor/rack-0.9.1/test/spec_rack_thin.rb vendor/rack-0.9.1/test/spec_rack_urlmap.rb vendor/rack-0.9.1/test/spec_rack_utils.rb vendor/rack-0.9.1/test/spec_rack_webrick.rb vendor/rack-0.9.1/test/testrequest.rb vendor/sinatra-0.9.0.4/AUTHORS vendor/sinatra-0.9.0.4/CHANGES vendor/sinatra-0.9.0.4/LICENSE vendor/sinatra-0.9.0.4/README.rdoc vendor/sinatra-0.9.0.4/Rakefile vendor/sinatra-0.9.0.4/compat/app_test.rb vendor/sinatra-0.9.0.4/compat/application_test.rb vendor/sinatra-0.9.0.4/compat/builder_test.rb vendor/sinatra-0.9.0.4/compat/compat_test.rb vendor/sinatra-0.9.0.4/compat/custom_error_test.rb vendor/sinatra-0.9.0.4/compat/erb_test.rb vendor/sinatra-0.9.0.4/compat/events_test.rb vendor/sinatra-0.9.0.4/compat/filter_test.rb vendor/sinatra-0.9.0.4/compat/haml_test.rb vendor/sinatra-0.9.0.4/compat/helper.rb vendor/sinatra-0.9.0.4/compat/mapped_error_test.rb vendor/sinatra-0.9.0.4/compat/pipeline_test.rb vendor/sinatra-0.9.0.4/compat/public/foo.xml vendor/sinatra-0.9.0.4/compat/sass_test.rb vendor/sinatra-0.9.0.4/compat/sessions_test.rb vendor/sinatra-0.9.0.4/compat/streaming_test.rb vendor/sinatra-0.9.0.4/compat/sym_params_test.rb vendor/sinatra-0.9.0.4/compat/template_test.rb vendor/sinatra-0.9.0.4/compat/use_in_file_templates_test.rb vendor/sinatra-0.9.0.4/compat/views/foo.builder vendor/sinatra-0.9.0.4/compat/views/foo.erb vendor/sinatra-0.9.0.4/compat/views/foo.haml vendor/sinatra-0.9.0.4/compat/views/foo.sass vendor/sinatra-0.9.0.4/compat/views/foo_layout.erb vendor/sinatra-0.9.0.4/compat/views/foo_layout.haml vendor/sinatra-0.9.0.4/compat/views/layout_test/foo.builder vendor/sinatra-0.9.0.4/compat/views/layout_test/foo.erb vendor/sinatra-0.9.0.4/compat/views/layout_test/foo.haml vendor/sinatra-0.9.0.4/compat/views/layout_test/foo.sass vendor/sinatra-0.9.0.4/compat/views/layout_test/layout.builder vendor/sinatra-0.9.0.4/compat/views/layout_test/layout.erb vendor/sinatra-0.9.0.4/compat/views/layout_test/layout.haml vendor/sinatra-0.9.0.4/compat/views/layout_test/layout.sass vendor/sinatra-0.9.0.4/compat/views/no_layout/no_layout.builder vendor/sinatra-0.9.0.4/compat/views/no_layout/no_layout.haml vendor/sinatra-0.9.0.4/lib/sinatra.rb vendor/sinatra-0.9.0.4/lib/sinatra/base.rb vendor/sinatra-0.9.0.4/lib/sinatra/compat.rb vendor/sinatra-0.9.0.4/lib/sinatra/images/404.png vendor/sinatra-0.9.0.4/lib/sinatra/images/500.png vendor/sinatra-0.9.0.4/lib/sinatra/main.rb vendor/sinatra-0.9.0.4/lib/sinatra/test.rb vendor/sinatra-0.9.0.4/lib/sinatra/test/bacon.rb vendor/sinatra-0.9.0.4/lib/sinatra/test/rspec.rb vendor/sinatra-0.9.0.4/lib/sinatra/test/spec.rb vendor/sinatra-0.9.0.4/lib/sinatra/test/unit.rb vendor/sinatra-0.9.0.4/sinatra.gemspec vendor/sinatra-0.9.0.4/test/base_test.rb vendor/sinatra-0.9.0.4/test/builder_test.rb vendor/sinatra-0.9.0.4/test/data/reload_app_file.rb vendor/sinatra-0.9.0.4/test/erb_test.rb vendor/sinatra-0.9.0.4/test/filter_test.rb vendor/sinatra-0.9.0.4/test/haml_test.rb vendor/sinatra-0.9.0.4/test/helper.rb vendor/sinatra-0.9.0.4/test/helpers_test.rb vendor/sinatra-0.9.0.4/test/mapped_error_test.rb vendor/sinatra-0.9.0.4/test/middleware_test.rb vendor/sinatra-0.9.0.4/test/options_test.rb vendor/sinatra-0.9.0.4/test/reload_test.rb vendor/sinatra-0.9.0.4/test/request_test.rb vendor/sinatra-0.9.0.4/test/result_test.rb vendor/sinatra-0.9.0.4/test/routing_test.rb vendor/sinatra-0.9.0.4/test/sass_test.rb vendor/sinatra-0.9.0.4/test/sinatra_test.rb vendor/sinatra-0.9.0.4/test/static_test.rb vendor/sinatra-0.9.0.4/test/templates_test.rb vendor/sinatra-0.9.0.4/test/views/hello.builder vendor/sinatra-0.9.0.4/test/views/hello.erb vendor/sinatra-0.9.0.4/test/views/hello.haml vendor/sinatra-0.9.0.4/test/views/hello.sass vendor/sinatra-0.9.0.4/test/views/hello.test vendor/sinatra-0.9.0.4/test/views/layout2.builder vendor/sinatra-0.9.0.4/test/views/layout2.erb vendor/sinatra-0.9.0.4/test/views/layout2.haml vendor/sinatra-0.9.0.4/test/views/layout2.test @@ -35,11 +35,13 @@ desc "Start a Selenium remote control, run all integration tests and stop the re task :'ci:integration' => [ :clean, :'test:unit' ] do Rake::Task[:"selenium:rc:stop"].execute [] rescue nil begin + Rake::Task[:"sample_app:restart"].execute [] Rake::Task[:"selenium:rc:start"].execute [] Rake::Task[:"test:integration"].execute [] Rake::Task[:"examples"].execute [] ensure Rake::Task[:"selenium:rc:stop"].execute [] + Rake::Task[:"sample_app:restart"].execute [] end end @@ -177,6 +179,25 @@ Spec::Rake::SpecTask.new("test:parallel") do |t| t.spec_opts << "--format=progress" end +desc "Launch Sample App" +task :'sample_app:start' do + Nautilus::Shell.new.run \ + "\"#{File.expand_path(File.dirname(__FILE__) + '/test/integration/sample-app/sample_app.rb')}\"", + :background => true +end + +desc "Stop Sample App" +task :'sample_app:stop' do + Net::HTTP.get("localhost", '/shutdown', 4567) +end + +desc "Restart Sample App" +task :'sample_app:restart' do + Rake::Task[:"sample_app:stop"].execute([]) rescue nil + Rake::Task[:"sample_app:start"].execute [] +end + + specification = Gem::Specification.new do |s| s.name = "selenium-client" s.summary = "Official Ruby Client for Selenium RC." Rakefile @@ -24,32 +24,14 @@ module Selenium # Wait for an element to be present (the wait in happenning browser side). def wait_for_element(locator, timeout_in_seconds=nil) - script = <<-EOS - var element; - try { - element = selenium.browserbot.findElement(#{js_string locator}); - } catch(e) { - element = null; - } - element != null; - EOS - - wait_for_condition script, timeout_in_seconds + wait_for_condition find_element_script(locator, "element != null"), + timeout_in_seconds end # Wait for an element to NOT be present (the wait in happenning browser side). def wait_for_no_element(locator, timeout_in_seconds=nil) - script = <<-EOS - var element; - try { - element = selenium.browserbot.findElement(#{js_string locator}); - } catch(e) { - element = null; - } - element == null; - EOS - - wait_for_condition script, timeout_in_seconds + wait_for_condition find_element_script(locator, "element == null"), + timeout_in_seconds end # Wait for some text to be present (the wait in happenning browser side). @@ -65,22 +47,14 @@ module Selenium <<-EOS var text; try { - text = selenium.browserbot.getCurrentWindow().find(#{js_string text}); + text = selenium.browserbot.getCurrentWindow().find('#{quote_escaped(text)}'); } catch(e) { text = null; } text != null; EOS else - <<-EOS - var element; - try { - element = selenium.browserbot.getCurrentWindow().findElement(#{js_string locator}); - } catch(e) { - element = null; - } - element != null && element.innerHTML == #{js_string text}; - EOS + find_element_script locator, "element != null && element.innerHTML == '#{quote_escaped(text)}'" end wait_for_condition script, timeout_in_seconds @@ -99,24 +73,14 @@ module Selenium <<-EOS var text; try { - text = selenium.browserbot.getCurrentWindow().find(#{js_string original_text}); + text = selenium.browserbot.getCurrentWindow().find('#{quote_escaped(original_text)}'); } catch(e) { text = false; } text == false; EOS else - <<-EOS - var element; - - try { - element = selenium.browserbot.findElement(#{js_string locator}); - } catch(e) { - element = null; - } - alert(element); - element != null && element.innerHTML != #{js_string original_text}; - EOS + find_element_script locator, "element == null || element.innerHTML != '#{quote_escaped(original_text)}'" end wait_for_condition script, timeout_in_seconds end @@ -125,11 +89,11 @@ module Selenium def wait_for_field_value(locator, expected_value, timeout_in_seconds=nil) script = "var element; try { - element = selenium.browserbot.findElement(#{js_string locator}); + element = selenium.browserbot.findElement('#{quote_escaped(locator)}'); } catch(e) { element = null; } - element != null && element.value == #{js_string expected_value};" + element != null && element.value == '#{quote_escaped(locator)}';" wait_for_condition script, timeout_in_seconds end @@ -141,18 +105,24 @@ module Selenium when :jquery JavascriptFrameworks::JQuery else - raise "Unsupported Javascript Framework: #{js_string framework_name}" + raise "Unsupported Javascript Framework: #{framework_name}" end end + def find_element_script(locator, return_value) + script = <<-EOS + var element; + try { + element = selenium.browserbot.findElement('#{quote_escaped(locator)}'); + } catch(e) { + element = null; + } + #{return_value}; + EOS + end - private - #------------------------------------------------------------------------- - - # Returns a new string for use inside javascript code, using single quotes - def js_string(ruby_string) - escaped_single_quotes = ruby_string.gsub("'", %q<\\\'>) - return "#{js_string escaped_single_quotes}" + def quote_escaped(locator) + locator.gsub(/'/, %q<\\\'>) end end lib/selenium/client/extensions.rb @@ -12,7 +12,7 @@ describe "Remote Control Logs Retrieval" do it "can retrieve logs even when no command were issued" do page.open "http://localhost:4444/selenium-server/tests/html/test_click_page1.html" logs = selenium_driver.retrieve_last_remote_control_logs - logs.should =~ %r{request: getNewBrowserSession\[\*[a-z0-9]+, http://localhost:3000, \]} + logs.should =~ %r{request: getNewBrowserSession\[\*[a-z0-9]+, http://localhost:4567, \]} logs.should =~ %r{request: open\[http://localhost:4444/selenium-server/tests/html/test_click_page1.html, \]} logs.should =~ %r{request: retrieveLastRemoteControlLogs\[, \]} logs.should =~ %r{org.openqa.selenium.server.SeleniumDriverResourceHandler - Got result: OK} @@ -22,7 +22,7 @@ describe "Remote Control Logs Retrieval" do page.open "http://localhost:4444/selenium-server/tests/html/test_click_page1.html" page.get_title logs = selenium_driver.retrieve_last_remote_control_logs - logs.should =~ %r{request: getNewBrowserSession\[\*[a-z0-9]+, http://localhost:3000, \]} + logs.should =~ %r{request: getNewBrowserSession\[\*[a-z0-9]+, http://localhost:4567, \]} logs.should =~ %r{request: open\[http://localhost:4444/selenium-server/tests/html/test_click_page1.html, \]} logs.should =~ %r{request: getTitle\[, \]} logs.should =~ %r{request: retrieveLastRemoteControlLogs\[, \]} test/integration/api/retrieve_last_remote_control_logs_spec.rb @@ -11,7 +11,11 @@ Spec::Runner.configure do |config| end config.append_after(:each) do - selenium_driver.stop + begin + selenium_driver.stop + rescue Exception => e + STDERR.puts "Could not properly close selenium session : #{e.inspect}" + end end def selenium_driver @@ -23,15 +27,14 @@ Spec::Runner.configure do |config| end def create_selenium_driver - remote_control_server = ENV['SELENIUM_RC_HOST'] || "localhost" - port = ENV['SELENIUM_RC_PORT'] || 4444 - browser = ENV['SELENIUM_BROWSER'] || "*firefox" - timeout = ENV['SELENIUM_RC_TIMEOUT'] || 60 application_host = ENV['SELENIUM_APPLICATION_HOST'] || "localhost" - application_port = ENV['SELENIUM_APPLICATION_PORT'] || "3000" - @selenium_driver = Selenium::SeleniumDriver.new( - remote_control_server, port, browser, - "http://#{application_host}:#{application_port}", timeout) + application_port = ENV['SELENIUM_APPLICATION_PORT'] || "4567" + @selenium_driver = Selenium::SeleniumDriver.new \ + :host => (ENV['SELENIUM_RC_HOST'] || "localhost"), + :port => (ENV['SELENIUM_RC_PORT'] || 4444), + :browser => (ENV['SELENIUM_BROWSER'] || "*firefox"), + :timeout_in_seconds => (ENV['SELENIUM_RC_TIMEOUT'] || 10), + :url => "http://#{application_host}:#{application_port}" end def start_new_browser_session @@ -39,5 +42,17 @@ Spec::Runner.configure do |config| selenium_driver.set_context "Starting example '#{self.description}'" end + def should_timeout + begin + yield + raise "Should have timed out" + rescue Timeout::Error => e + # All good + rescue Selenium::CommandError => e + raise unless e.message =~ /ed out after/ + # All good + end + end + end test/integration/spec_helper.rb @@ -123,4 +123,14 @@ unit_tests do client.wait_for_effects :timeout_in_seconds => :explicit_timeout end + test "quote_escaped returns a locator has is when its does not include any single quote" do + client = Class.new { include Selenium::Client::Extensions }.new + assert_equal "the_locator", client.quote_escaped("the_locator") + end + + test "quote_escaped escape single quotes" do + client = Class.new { include Selenium::Client::Extensions }.new + assert_equal "//div[@id=\\'demo-effect-appear\\']", client.quote_escaped("//div[@id='demo-effect-appear']") + end + end \ No newline at end of file test/unit/selenium/client/extensions_test.rb vendor/selenium-remote-control/selenium-server-1.0-SNAPSHOT-standalone.jar c03e11c5eafa65a7220b30bd61d834c65f53bb75 Philippe Hanrigou philippe.hanrigou@gmail.com http://github.com/ph7/selenium-client/commit/b500a68c1f572be6fc1865d16ee2eb5846304bd8 b500a68c1f572be6fc1865d16ee2eb5846304bd8 2009-02-27T16:31:12-08:00 2009-02-27T16:31:12-08:00 embedding a sample application to test wait_for_xxx semantics 8a6a7987e97acdd41da0b1da65f10684e602f9e6 Philippe Hanrigou philippe.hanrigou@gmail.com