test/unit/selenium/client/extensions_test.rb @@ -6,6 +6,43 @@ - Upgraded RSpec support to 1.1.12 + - Added popup support in wait_for semantics. e.g. + + click 'my_button', :wait_for => :popup, :window => 'a window id' + + - Fixed :wait_for => :text and :wait_for => :no_text semantics + Thank you Wade Catron for finding the reporting this bug! + + The new semantics are: + + If you do not provide any locator the text is searched in the entire + body of the page. e.g. + + click 'my_button', :wait_for => :text, :text => "Congratulations" + + If you provide and element locator the text search is scoped to the + innerHTML of that element. e.g. + + click 'my_button', :wait_for => :text, :element => "notification_box", :text => "Preferences Saved!" + + *** WARNING **** + + In the process I had to change the signature of the wait_for_text and + wait_for_no_text methods. Please update your code if you were using + directly any of these 2 methods: + + OLD: wait_for_text(locator, text, timeout_in_seconds=nil) + NEW: wait_for_text(text, locator=nil, timeout_in_seconds=nil) + + OLD: wait_for_no_text(locator, text, timeout_in_seconds=nil) + NEW: wait_for_no_text(text, locator=nil, timeout_in_seconds=nil) + + - More idiomatic methods to retrieves all window ids, names and titles: + .all_window_ids, .all_window_names, all_window_titles + + - RSpec Helper automatically set context when starting a new test + (lib/selenium/rspec/spec_helper) + 1.2.9 (2008-11-04) ================== ChangeLog @@ -28,7 +28,7 @@ module Selenium } catch(e) { element = null; } - element != null + element != null; EOS wait_for_condition script, timeout_in_seconds @@ -43,7 +43,7 @@ module Selenium } catch(e) { element = null; } - element == null + element == null; EOS wait_for_condition script, timeout_in_seconds @@ -66,17 +66,17 @@ module Selenium } catch(e) { text = null; } - text != null + text != null; EOS else <<-EOS var element; try { - element = selenium.browserbot.getCurrentWindow().find('#{locator}'); + element = selenium.browserbot.getCurrentWindow().findElement('#{locator}'); } catch(e) { element = null; } - element != null && element.innerHTML == '#{text}'" + element != null && element.innerHTML == '#{text}'"; EOS end @@ -90,16 +90,32 @@ module Selenium # # If a non nil locator is provided, the text will be # detected within the innerHTML of the element identified by the locator. - def wait_for_no_text(locator, original_text, timeout_in_seconds=nil) - script = "var element; - try { - element = selenium.browserbot.findElement('#{locator}'); - } catch(e) { - element = null; - } - element != null && element.innerHTML != '#{original_text}'" - - wait_for_condition script, time + def wait_for_no_text(original_text, locator=nil, timeout_in_seconds=nil) + script = case locator + when nil: + <<-EOS + var text; + try { + text = selenium.browserbot.getCurrentWindow().find('#{original_text}'); + } catch(e) { + text = false; + } + text == false; + EOS + else + <<-EOS + var element; + + try { + element = selenium.browserbot.findElement('#{locator}'); + } catch(e) { + element = null; + } + alert(element); + element != null && element.innerHTML != '#{original_text}'"; + EOS + end + wait_for_condition script, timeout_in_seconds end # Wait for a field to get a specific value (the wait in happenning browser side). @@ -110,7 +126,7 @@ module Selenium } catch(e) { element = null; } - element != null && element.value == '#{expected_value}'" + element != null && element.value == '#{expected_value}'"; wait_for_condition script, timeout_in_seconds end lib/selenium/client/extensions.rb @@ -84,7 +84,7 @@ module Selenium elsif options[:wait_for] == :text wait_for_text options[:text], options[:element], options[:timeout_in_seconds] elsif options[:wait_for] == :no_text - wait_for_no_text options[:text], options[:timeout_in_seconds] + wait_for_no_text options[:text], options[:element], options[:timeout_in_seconds] elsif options[:wait_for] == :effects wait_for_effects options[:timeout_in_seconds] elsif options[:wait_for] == :popup @@ -289,6 +289,7 @@ module Selenium # click. e.g. # # * go_back :wait_for => :page # will wait for a new page to load + # * go_back :wait_for => :popup, :window => 'a window id' # will wait for a new popup window to appear. Also selects the popup window for you provide `:select => true` # * go_back :wait_for => :ajax # will wait for all ajax requests to be completed (Prototype only) # * go_back :wait_for => :effects # will wait for all Prototype effects to be rendered # * go_back :wait_for => :element, :element => 'new_element_id' # will wait for an element to be present/appear lib/selenium/client/idiomatic.rb @@ -19,6 +19,8 @@ describe "Google Search" do page.value("q").should eql("Selenium SeleniumHQ") page.click "btnG", :wait_for => :text, :text => "Selenium SeleniumHQ" page.wait_for :wait_for => :text, :locator => 'q', :text => "Selenium SeleniumHQ" + page.wait_for :wait_for => :no_text, :locator => 'q', :text => "Mercury" + page.wait_for :wait_for => :no_text, :text => "Gre sacdas asdcasd" page.title.should eql("Selenium SeleniumHQ - Google Search") end test/integration/smoke/google_search_spec.rb @@ -144,13 +144,13 @@ unit_tests do test "wait_for waits for text to NOT be present when no_text option is provided" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:wait_for_no_text).with("some text", nil) - client.wait_for :wait_for => :no_text, :text => "some text" + client.expects(:wait_for_no_text).with("some text", "a_locator", nil) + client.wait_for :wait_for => :no_text, :element => 'a_locator', :text => "some text" end - test "wait_for waits for no text with explicit timeout when one is provided" do + test "wait_for waits for no text with explicit timeout and locator when none are provided" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:wait_for_no_text).with("some text", :the_timeout) + client.expects(:wait_for_no_text).with("some text", nil, :the_timeout) client.wait_for :wait_for => :no_text, :text => "some text", :timeout_in_seconds => :the_timeout end test/unit/selenium/client/idiomatic_test.rb ec84bc475ed40dbad46fdae2feec0c5040e1810b Philippe Hanrigou philippe.hanrigou@gmail.com http://github.com/ph7/selenium-client/commit/d351fc94dc35d6d244d27036d1d812dec78e00a8 d351fc94dc35d6d244d27036d1d812dec78e00a8 2009-02-02T19:59:08-08:00 2009-02-02T19:59:08-08:00 Fixing demantics for :wait_for => :no_text f5ae90648e8caad8996d863ae1ef3ae6e4be73bd Philippe Hanrigou philippe.hanrigou@gmail.com