watir 1.6.5 → 1.6.6.rc1

data/unittests/windows/close_window_test.rb

@@ -1,21 +1,21 @@
-# feature tests for closed windows
-# revision: $Revision: 958 $
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
-require 'unittests/setup'
-
-class TC_CloseWindow < Watir::TestCase
-  execute :sequentially
-  
-  def setup
-    goto_page "new_browser.html"
-  end
-  
-  # reproduces defect http://jira.openqa.org/browse/WTR-16
-  def test_close_window_with_button
-    browser.link(:text, 'New Window').click
-    ie_new = Watir::IE.attach(:title, 'Pass Page')
-    assert(ie_new.text.include?('PASS'))
-    assert_nothing_raised {ie_new.close}
-  end
+# feature tests for closed windows
+# revision: $Revision: 958 $
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_CloseWindow < Watir::TestCase
+  execute :sequentially
+  
+  def setup
+    goto_page "new_browser.html"
+  end
+  
+  # reproduces defect http://jira.openqa.org/browse/WTR-16
+  def test_close_window_with_button
+    browser.link(:text, 'New Window').click
+    ie_new = Watir::IE.attach(:title, 'Pass Page')
+    assert(ie_new.text.include?('PASS'))
+    assert_nothing_raised {ie_new.close}
+  end
 end

data/unittests/windows/frame_links_test.rb

@@ -1,25 +1,25 @@
-# tests of click_no_wait for links in frames
-# revision: $Revision: 1078 $
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
-require 'unittests/setup'
-
-class TC_Frame_Links < Test::Unit::TestCase
-  include Watir
-  
-  def setup
-    goto_page "frame_links.html"
-  end
-  
-  def test_click_in_a_frame
-    browser.frame('linkFrame').link(:text, 'test1').click
-    assert(browser.frame('linkFrame').text.include?('Links2-Pass'))
-  end
-  
-  def test_click_no_wait_in_a_frame
-    browser.frame('linkFrame').link(:text, 'test1').click_no_wait
-    wait_until(10){browser.frame('linkFrame').text.include?('Links2-Pass')}
-    assert(browser.frame('linkFrame').text.include?('Links2-Pass'))
-  end  
-  
-end
+# tests of click_no_wait for links in frames
+# revision: $Revision: 1078 $
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_Frame_Links < Test::Unit::TestCase
+  include Watir
+  
+  def setup
+    goto_page "frame_links.html"
+  end
+  
+  def test_click_in_a_frame
+    browser.frame('linkFrame').link(:text, 'test1').click
+    assert(browser.frame('linkFrame').text.include?('Links2-Pass'))
+  end
+  
+  def test_click_no_wait_in_a_frame
+    browser.frame('linkFrame').link(:text, 'test1').click_no_wait
+    wait_until(10){browser.frame('linkFrame').text.include?('Links2-Pass')}
+    assert(browser.frame('linkFrame').text.include?('Links2-Pass'))
+  end  
+  
+end

data/unittests/windows/ie-each_test.rb

@@ -1,48 +1,48 @@
-# Not intended to be run as part of a larger suite.
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
-require 'test/unit'
-require 'watir'
-require 'watir/process'
-require 'watir/waiter'
-
-class TC_IE_Each < Test::Unit::TestCase  
-  def setup
-    assert_equal 0, Watir::IE.process_count
-    @hits = 0
-    @ie = []
-  end
-  
-  def hit_me
-    @hits += 1
-  end
-
-  def test_zero_windows
-    Watir::IE.each {hit_me}    
-    assert_equal 0, @hits
-  end
-  
-  def test_one_window
-    @ie << Watir::IE.new_process
-    Watir::IE.each {hit_me}    
-    assert_equal 1, @hits
-  end
-  
-  def test_two_windows
-    @ie << Watir::IE.new_process
-    @ie << Watir::IE.new_process
-    Watir::IE.each {hit_me}    
-    assert_equal 2, @hits
-  end
-  
-  def test_return_type
-    @ie << Watir::IE.new_process
-    Watir::IE.each {|ie| assert_equal(Watir::IE, ie.class)}    
-  end
-  
-  include Watir
-  def teardown
-    @ie.each {|ie| ie.close }
-    wait_until {Watir::IE.process_count == 0}
-  end
+# Not intended to be run as part of a larger suite.
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+require 'test/unit'
+require 'watir'
+require 'watir/process'
+require 'watir/waiter'
+
+class TC_IE_Each < Test::Unit::TestCase  
+  def setup
+    assert_equal 0, Watir::IE.process_count
+    @hits = 0
+    @ie = []
+  end
+  
+  def hit_me
+    @hits += 1
+  end
+
+  def test_zero_windows
+    Watir::IE.each {hit_me}    
+    assert_equal 0, @hits
+  end
+  
+  def test_one_window
+    @ie << Watir::IE.new_process
+    Watir::IE.each {hit_me}    
+    assert_equal 1, @hits
+  end
+  
+  def test_two_windows
+    @ie << Watir::IE.new_process
+    @ie << Watir::IE.new_process
+    Watir::IE.each {hit_me}    
+    assert_equal 2, @hits
+  end
+  
+  def test_return_type
+    @ie << Watir::IE.new_process
+    Watir::IE.each {|ie| assert_equal(Watir::IE, ie.class)}    
+  end
+  
+  include Watir
+  def teardown
+    @ie.each {|ie| ie.close }
+    wait_until {Watir::IE.process_count == 0}
+  end
 end

data/unittests/windows/iedialog_test.rb

@@ -1,54 +1,54 @@
-# unit tests for iedialog.dll and customized win32ole.so
-# revision: $Revision$
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
-require 'unittests/setup'
-require 'Win32API'
-
-class TC_IEDialog < Test::Unit::TestCase
-  include Watir 
-
-  # this will find the IEDialog.dll file in its build location
-  @@iedialog_file = (File.expand_path(File.dirname(__FILE__)) + "/../../lib/watir/IEDialog/Release/IEDialog.dll").gsub('/', '\\')
-  
-  # commented out because it currently requires a manual click
-  # a better idea would be to automate the click...
-  def xtest_connect_to_iedialog 
-    # make sure we can connect to the IEDialog.dll
-    fnShowString = Win32API.new(@@iedialog_file, 'ShowString', ['p'], 'v')
-    fnShowString.call("from ruby!") # blocks
-  end
-
-  def test_find_window   
-    goto_page "pass.html"
-    fnFindWindow = Win32API.new('user32.dll', 'FindWindow', ['p', 'p'], 'l')
-    hwnd = fnFindWindow.call(nil, "Pass Page - Microsoft Internet Explorer")
-    assert(hwnd != 0)
-  end
-
-  def test_all    
-    goto_page "pass.html"
-
-    fnFindWindow = Win32API.new('user32.dll', 'FindWindow', ['p', 'p'], 'l')
-    hwnd = fnFindWindow.call(nil, "Pass Page - Microsoft Internet Explorer")
-
-    fnGetUnknown = Win32API.new(@@iedialog_file, 'GetUnknown', ['l', 'p'], 'v')
-    intPointer = " " * 4 # will contain the int value of the IUnknown*
-    fnGetUnknown.call(hwnd, intPointer)
-    
-    intArray = intPointer.unpack('L')
-    intUnknown = intArray.first
-
-    assert(intUnknown > 0)
-    
-    htmlDoc = nil
-    assert_nothing_raised{htmlDoc = WIN32OLE.connect_unknown(intUnknown)}
-    scriptEngine = htmlDoc.Script
-    
-    # now we get the HTML DOM object!
-    doc2 = scriptEngine.document
-    body = doc2.body
-    assert_match(/^PASS/, body.innerHTML.strip)    
-  end
-end
-
+# unit tests for iedialog.dll and customized win32ole.so
+# revision: $Revision$
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+require 'unittests/setup'
+require 'Win32API'
+
+class TC_IEDialog < Test::Unit::TestCase
+  include Watir 
+
+  # this will find the IEDialog.dll file in its build location
+  @@iedialog_file = (File.expand_path(File.dirname(__FILE__)) + "/../../lib/watir/IEDialog/Release/IEDialog.dll").gsub('/', '\\')
+  
+  # commented out because it currently requires a manual click
+  # a better idea would be to automate the click...
+  def xtest_connect_to_iedialog 
+    # make sure we can connect to the IEDialog.dll
+    fnShowString = Win32API.new(@@iedialog_file, 'ShowString', ['p'], 'v')
+    fnShowString.call("from ruby!") # blocks
+  end
+
+  def test_find_window   
+    goto_page "pass.html"
+    fnFindWindow = Win32API.new('user32.dll', 'FindWindow', ['p', 'p'], 'l')
+    hwnd = fnFindWindow.call(nil, "Pass Page - Microsoft Internet Explorer")
+    assert(hwnd != 0)
+  end
+
+  def test_all    
+    goto_page "pass.html"
+
+    fnFindWindow = Win32API.new('user32.dll', 'FindWindow', ['p', 'p'], 'l')
+    hwnd = fnFindWindow.call(nil, "Pass Page - Microsoft Internet Explorer")
+
+    fnGetUnknown = Win32API.new(@@iedialog_file, 'GetUnknown', ['l', 'p'], 'v')
+    intPointer = " " * 4 # will contain the int value of the IUnknown*
+    fnGetUnknown.call(hwnd, intPointer)
+    
+    intArray = intPointer.unpack('L')
+    intUnknown = intArray.first
+
+    assert(intUnknown > 0)
+    
+    htmlDoc = nil
+    assert_nothing_raised{htmlDoc = WIN32OLE.connect_unknown(intUnknown)}
+    scriptEngine = htmlDoc.Script
+    
+    # now we get the HTML DOM object!
+    doc2 = scriptEngine.document
+    body = doc2.body
+    assert_match(/^PASS/, body.innerHTML.strip)    
+  end
+end
+

data/unittests/windows/js_events_test.rb

@@ -1,55 +1,42 @@
-# feature tests for JavaScript events
-# revision: $Revision$
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
-require 'unittests/setup'
-
-class TC_JSEvents < Test::Unit::TestCase
-  def setup
-    goto_page "javascriptevents.html"
-  end
-  
-  def test_Button_disabled
-    assert_false( browser.button(:caption, "Button 1").enabled?) 
-  end
-  
-  def test_Button_Enabled
-    browser.text_field(:name, "entertext").fire_event("onkeyup")
-    assert(browser.button(:caption, "Button 1").enabled?)   
-  end
-  
-  def test_Button_click
-    # Firing event to make button enabled
-    browser.text_field(:name, "entertext").fire_event("onKeyUp")
-    # Clicking the button
-    browser.button(:caption, "Button 1").click
-    assert(browser.text.include?("PASS") )
-  end
-  
-  #onMouseOver tests
-  #window status
-  
-  def test_no_status_bar_exception
-    browser.link(:text, "New Window No Status Bar").click
-    status_bar_test_win = nil
-    # Note: this test will fail if the Google toolbar popup blocker is turned on
-    assert_nothing_raised { status_bar_test_win = Watir::IE.attach(:title, "Pass Page") }
-    assert_raises( Watir::NoStatusBarException ) { status_bar_test_win.status }
-    status_bar_test_win.close
-    status_bar_test_win = nil
-  end
-  
-  def test_page_nostatus
-    assert_equal("Done", browser.status) 
-  end
-  
-  def test_set_page_status
-    browser.link(:text, "Check the Status").fire_event("onMouseOver")
-    assert_equal("It worked", browser.status) 
-  end
-  
-  def test_clear_page_status
-    browser.link(:text, "Clear the Status").fire_event("onMouseOver")
-    assert_equal("Done", browser.status) 
-  end
-end
+# feature tests for JavaScript events
+# revision: $Revision$
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_JSEvents < Test::Unit::TestCase
+  def setup
+    goto_page "javascriptevents.html"
+  end
+  
+  def test_Button_disabled
+    assert_false( browser.button(:caption, "Button 1").enabled?) 
+  end
+  
+  def test_Button_Enabled
+    browser.text_field(:name, "entertext").fire_event("onkeyup")
+    assert(browser.button(:caption, "Button 1").enabled?)   
+  end
+  
+  def test_Button_click
+    # Firing event to make button enabled
+    browser.text_field(:name, "entertext").fire_event("onKeyUp")
+    # Clicking the button
+    browser.button(:caption, "Button 1").click
+    assert(browser.text.include?("PASS") )
+  end
+  
+  def test_page_nostatus
+    assert_equal("Done", browser.status) 
+  end
+  
+  def test_set_page_status
+    browser.link(:text, "Check the Status").fire_event("onMouseOver")
+    assert_equal("It worked", browser.status) 
+  end
+  
+  def test_clear_page_status
+    browser.link(:text, "Clear the Status").fire_event("onMouseOver")
+    assert_equal("Done", browser.status) 
+  end
+end

data/unittests/windows/modal_dialog_test.rb

@@ -1,128 +1,128 @@
-# feature tests for modal web dialog support
-# revision: $Revision$
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
-require 'unittests/setup'
-require 'watir/close_all'
-
-class TC_ModalDialog < Watir::TestCase
-  include Watir
-  
-  def setup
-    @original_timeout = IE.attach_timeout
-    goto_page 'modal_dialog_launcher.html'
-    IE.attach_timeout = 10.0
-  end
-
-  def teardown 
-    if browser 
-      while browser.close_modal do; end
-    end
-    sleep 0.1
-    IE.attach_timeout = @original_timeout
-  end
-
-  def assert_no_modals
-    IE.attach_timeout = 0.2 
-    begin
-      assert_raises(NoMatchingWindowFoundException) do
-        browser.modal_dialog
-      end
-    ensure
-      IE.attach_timeout = @original_timeout
-    end
-  end 
-     
-  def test_modal_simple_use_case
-    browser.button(:value, 'Launch Dialog').click_no_wait
-    modal = browser.modal_dialog(:title, 'Modal Dialog')
-
-    assert(modal.text.include?('Enter some text:'))
-    modal.text_field(:name, 'modal_text').set('hello')
-    modal.button(:value, 'Close').click
-    assert_equal('hello', browser.text_field(:name, 'modaloutput').value)
-  end
-
-  def test_wait_should_not_block
-    browser.button(:value, 'Launch Dialog').click_no_wait
-    modal = browser.modal_dialog(:title, 'Modal Dialog')
-
-    modal.text_field(:name, 'modal_text').set('hello')
-    modal.wait
-
-    modal.button(:value, 'Close').click
-  end
-
-  def test_modal_dialog_use_case_default
-    browser.button(:value, 'Launch Dialog').click_no_wait
-
-    modal = browser.modal_dialog
-    assert_not_nil modal
-
-    # Make sure that we have attached to modal and that the hwnd method
-    # is working properly to show the HWND of our parent.
-    assert_not_equal(browser.hwnd, modal.hwnd)
-
-    # Once attached just treat the modal_dialog like any IE or Frame
-    # object.
-    assert(modal.text.include?('Enter some text:'))
-    modal.text_field(:name, 'modal_text').set('hello')
-    modal.button(:value, 'Close').click
-
-    assert_no_modals
-    assert_equal('hello', browser.text_field(:name, 'modaloutput').value)
-  end
-
-  # Now explicitly supply the :title parameter.
-  def test_modal_dialog_use_case_title
-    browser.button(:value, 'Launch Dialog').click_no_wait
-
-    modal = browser.modal_dialog(:title, 'Modal Dialog')
-    assert_not_equal(browser.hwnd, modal.hwnd)
-
-    assert_equal('Modal Dialog', modal.title)
-
-    assert(modal.text.include?('Enter some text:'))
-    modal.button(:value, 'Close').click
-  end
-
-  # Now explicitly supply the :title parameter with regexp match
-  def test_modal_dialog_use_case_title_regexp
-    assert_raises(ArgumentError){browser.modal_dialog(:title, /dal Dia/)}
-  end
-
-  # Now explicitly supply an invalid "how" value
-  def test_modal_dialog_use_case_invalid
-    assert_raise(ArgumentError) { browser.modal_dialog(:esp) }
-  end
-
-  def test_double_modal
-    browser.button(:value, 'Launch Dialog').click_no_wait
-    modal1 = browser.modal_dialog
-    modal1.button(:text, 'Another Modal').click_no_wait
-    modal2 = modal1.modal_dialog
-    assert_equal modal2.title, 'Pass Page'
-    modal2.close
-    modal1.close
-  end
-  
-  def xtest_modal_with_frames
-    browser.button(:value, 'Launch Dialog').click_no_wait
-    modal1 = browser.modal_dialog
-    modal1.button(:value, 'Modal with Frames').click_no_wait
-    modal2 = browser.modal_dialog
-    modal2.frame('buttonFrame').button(:value, 'Click Me').click
-    assert(modal2.frame('buttonFrame').text.include?('PASS'))    
-    modal2.frame('buttonFrame').button(:value, 'Close Window').click
-    modal1.close
-  end
-  
-  def test_modal_exists
-    browser.button(:value, 'Launch Dialog').click_no_wait
-    modal = browser.modal_dialog(:title, 'Modal Dialog')
-    assert(modal.exists?)
-    modal.button(:value, 'Close').click
-    assert_false(modal.exists?)
-  end
-        
-end
+# feature tests for modal web dialog support
+# revision: $Revision$
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+require 'unittests/setup'
+require 'watir/close_all'
+
+class TC_ModalDialog < Watir::TestCase
+  include Watir
+  
+  def setup
+    @original_timeout = IE.attach_timeout
+    goto_page 'modal_dialog_launcher.html'
+    IE.attach_timeout = 10.0
+  end
+
+  def teardown 
+    if browser 
+      while browser.close_modal do; end
+    end
+    sleep 0.1
+    IE.attach_timeout = @original_timeout
+  end
+
+  def assert_no_modals
+    IE.attach_timeout = 0.2 
+    begin
+      assert_raises(NoMatchingWindowFoundException) do
+        browser.modal_dialog
+      end
+    ensure
+      IE.attach_timeout = @original_timeout
+    end
+  end 
+     
+  def test_modal_simple_use_case
+    browser.button(:value, 'Launch Dialog').click_no_wait
+    modal = browser.modal_dialog(:title, 'Modal Dialog')
+
+    assert(modal.text.include?('Enter some text:'))
+    modal.text_field(:name, 'modal_text').set('hello')
+    modal.button(:value, 'Close').click
+    assert_equal('hello', browser.text_field(:name, 'modaloutput').value)
+  end
+
+  def test_wait_should_not_block
+    browser.button(:value, 'Launch Dialog').click_no_wait
+    modal = browser.modal_dialog(:title, 'Modal Dialog')
+
+    modal.text_field(:name, 'modal_text').set('hello')
+    modal.wait
+
+    modal.button(:value, 'Close').click
+  end
+
+  def test_modal_dialog_use_case_default
+    browser.button(:value, 'Launch Dialog').click_no_wait
+
+    modal = browser.modal_dialog
+    assert_not_nil modal
+
+    # Make sure that we have attached to modal and that the hwnd method
+    # is working properly to show the HWND of our parent.
+    assert_not_equal(browser.hwnd, modal.hwnd)
+
+    # Once attached just treat the modal_dialog like any IE or Frame
+    # object.
+    assert(modal.text.include?('Enter some text:'))
+    modal.text_field(:name, 'modal_text').set('hello')
+    modal.button(:value, 'Close').click
+
+    assert_no_modals
+    assert_equal('hello', browser.text_field(:name, 'modaloutput').value)
+  end
+
+  # Now explicitly supply the :title parameter.
+  def test_modal_dialog_use_case_title
+    browser.button(:value, 'Launch Dialog').click_no_wait
+
+    modal = browser.modal_dialog(:title, 'Modal Dialog')
+    assert_not_equal(browser.hwnd, modal.hwnd)
+
+    assert_equal('Modal Dialog', modal.title)
+
+    assert(modal.text.include?('Enter some text:'))
+    modal.button(:value, 'Close').click
+  end
+
+  # Now explicitly supply the :title parameter with regexp match
+  def test_modal_dialog_use_case_title_regexp
+    assert_raises(ArgumentError){browser.modal_dialog(:title, /dal Dia/)}
+  end
+
+  # Now explicitly supply an invalid "how" value
+  def test_modal_dialog_use_case_invalid
+    assert_raise(ArgumentError) { browser.modal_dialog(:esp) }
+  end
+
+  def test_double_modal
+    browser.button(:value, 'Launch Dialog').click_no_wait
+    modal1 = browser.modal_dialog
+    modal1.button(:text, 'Another Modal').click_no_wait
+    modal2 = modal1.modal_dialog
+    assert_equal modal2.title, 'Pass Page'
+    modal2.close
+    modal1.close
+  end
+  
+  def xtest_modal_with_frames
+    browser.button(:value, 'Launch Dialog').click_no_wait
+    modal1 = browser.modal_dialog
+    modal1.button(:value, 'Modal with Frames').click_no_wait
+    modal2 = browser.modal_dialog
+    modal2.frame('buttonFrame').button(:value, 'Click Me').click
+    assert(modal2.frame('buttonFrame').text.include?('PASS'))    
+    modal2.frame('buttonFrame').button(:value, 'Close Window').click
+    modal1.close
+  end
+  
+  def test_modal_exists
+    browser.button(:value, 'Launch Dialog').click_no_wait
+    modal = browser.modal_dialog(:title, 'Modal Dialog')
+    assert(modal.exists?)
+    modal.button(:value, 'Close').click
+    assert_false(modal.exists?)
+  end
+        
+end