watir 1.8.1 → 1.9.0.rc1

data/lib/watir/modal_dialog.rb

@@ -1,3 +1,9 @@
+class WinClicker
+  def initialize
+    raise NotImplementedError, 'Watir no longer supports WinClicker. Please use click_no_wait and the javascript_dialog method.'
+  end
+end
+
 module Watir
   class ModalDialog
     include Container

data/lib/watir/module.rb

@@ -9,27 +9,4 @@ module Watir
   def self.until_with_timeout # block
     Wait.until(IE.attach_timeout) { yield }
   end
-
-  @@autoit = nil
-
-  def self.autoit
-    unless @@autoit
-      begin
-        @@autoit = WIN32OLE.new('AutoItX3.Control')
-      rescue WIN32OLERuntimeError
-        _register('AutoItX3.dll')
-        @@autoit = WIN32OLE.new('AutoItX3.Control')
-      end
-    end
-    @@autoit
-  end
-
-  def self._register(dll)
-    system("regsvr32.exe /s "    + "#{@@dir}/#{dll}".gsub('/', '\\'))
-  end
-
-  def self._unregister(dll)
-    system("regsvr32.exe /s /u " + "#{@@dir}/#{dll}".gsub('/', '\\'))
-  end
-
 end

data/lib/watir/win32.rb

@@ -1,3 +1,7 @@
+require 'dl/import'
+require 'dl/struct'
+require 'Win32API'
+
 module Watir
   module Win32
     # this will find the IEDialog.dll file in its build location

data/lib/watir/win32ole.rb

@@ -3,9 +3,12 @@
 # Use our modified win32ole library
 
 if RUBY_VERSION =~ /^1\.8/
-  $LOAD_PATH.unshift  File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir', 'win32ole'))
+  $LOAD_PATH.unshift  File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir', 'win32ole', '1.8.7'))
+# WIP
+#elsif RUBY_VERSION =~ /^1\.9/
+#  $LOAD_PATH.unshift  File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir', 'win32ole', '1.9.2'))
 else
-  # loading win32ole from stdlib on 1.9
+  # loading win32ole from stdlib
 end
 
 

data/rakefile.rb

@@ -18,7 +18,8 @@ Rake::RDocTask.new('rdoc') do |rdoc|
     rdoc.rdoc_files.include(file)
   end
   rdoc.rdoc_files.include('lib/watir/contrib/*.rb')  
-  rdoc.rdoc_files.include('lib/watir/*.rb')   
+  rdoc.rdoc_files.include('lib/watir/dialogs/*.rb')
+  rdoc.rdoc_files.include('lib/watir/*.rb')
   rdoc.rdoc_files.exclude('lib/watir/camel_case.rb')
 end
 

data/unittests/click_no_wait_test.rb

@@ -11,11 +11,13 @@ class ClickNoWait_Tests < Watir::TestCase
     message_div = browser.div(:id => 'div1')
     assert_equal("nothing", message_div.text)
     browser.link(:id => 'link1').click_no_wait
-    assert_equal("message!", message_div.text)
+    assert_nothing_raised {
+      Watir::Wait.until {message_div.text == "message!"}
+    }
   end
 
   def test_spawned_click_no_wait_command
-    assert_equal("start rubyw -e \"some command\"", browser.link(:id => 'link1').send(:__spawned_no_wait_command, "some command"))
+    assert_equal("start rubyw -e \"some command\"", browser.link(:id => 'link1').send(:spawned_no_wait_command, "some command"))
   end
 
 end

data/unittests/close_all_test.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
 class TC_CloseAllWindows < Watir::TestCase

data/unittests/dialog_test.rb

@@ -2,7 +2,6 @@
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
-require 'watir/dialog'
 
 class TC_Dialog_Test < Test::Unit::TestCase
   tags :must_be_visible
@@ -11,67 +10,52 @@ class TC_Dialog_Test < Test::Unit::TestCase
   def setup
     goto_page 'JavascriptClick.html'
   end    
-  def teardown
-    begin 
-      sleep 0.4 # XXX 
-      dialog.button('OK').click
-    rescue
-    end
-  end
-  
+
   def test_alert_without_bonus_script
     browser.button(:id, 'btnAlert').click_no_wait
-    sleep 0.4 # FIXME: need to be able to poll for window to exist
-    dialog.button("OK").click
-    assert_match(/Alert button!/, browser.text_field(:id, "testResult").value)  
+    browser.javascript_dialog.button("OK").click
+    assert_match(/Alert button!/, browser.text_field(:id, "testResult").value)
   end
-  
+
   def test_button_name_not_found
     browser.button(:id, 'btnAlert').click_no_wait
-    sleep 0.4 # FIXME replace with dialog.exists?
-    assert_raises(UnknownObjectException) { dialog.button("Yes").click }
-    dialog.button("OK").click
+    assert_raises(::RAutomation::UnknownButtonException) {browser.javascript_dialog.button("Yes").click}
+    browser.javascript_dialog.button("OK").click
   end
-  
-  def xtest_exists
-    assert_false( dialog.exists?) # known bug: finds main window instead of dialog!
-    browser.button(:id, 'btnAlert').click_no_wait
-    sleep 0.4 # FIXME: need to add polling
-    assert dialog.exists?
-    dialog.button('OK').click
-  end
-  
-  def test_leaves_dialog_open
-    # should be closed in teardown
+
+  def test_exists
+    assert_false(browser.javascript_dialog.exists?)
     browser.button(:id, 'btnAlert').click_no_wait
+    Watir::Wait.until(5) {browser.javascript_dialog.exists?}
+    browser.javascript_dialog.button("OK").click
   end
-  
+
   def test_copy_array_elements
     a = ['a', 'b', 'c']
     copy = Array.new(a)
-    c = []        
+    c = []
     code = _code_that_copies_readonly_array(a, "c")
     eval code
     assert_equal copy, c
   end
-  
+
   def test_confirm_ok
     browser.button(:value, 'confirm').click_no_wait
-    assert dialog.exists?
-    dialog.button('OK').click
+    Watir::Wait.until(5) {browser.javascript_dialog.exists?}
+    browser.javascript_dialog.button("OK").click
     assert_equal "You pressed the Confirm and OK button!", browser.text_field(:id, 'testResult').value
   end
-  
+
   def xtest_confirm_cancel
     browser.button(:value, 'confirm').click_no_wait
-    assert dialog.exists?
-    dialog.button('Cancel').click
+    assert browser.javascript_dialog.exists?
+    browser.javascript_dialog.button("Cancel").click
     assert_equal "You pressed the Confirm and Cancel button!", browser.text_field(:id, 'testResult').value
   end
-  
+
   def test_dialog_close
-    dialog.close
-    assert !dialog.exists? 
+    browser.javascript_dialog.close
+    assert !browser.javascript_dialog.exists?
   end
   
 end

data/unittests/filefield_xpath_test.rb

@@ -18,7 +18,10 @@ class TC_FileField_XPath < Test::Unit::TestCase
     assert_false(browser.file_field(:xpath, "//input[@name='missing']/").exists?)   
     assert_false(browser.file_field(:xpath, "//input[@name='totallybogus']/").exists?)
     #pop one open and put something in it.
-    browser.file_field(:xpath, "//input[@name='file1']/").set($htmlRoot + "fileupload.html")	
+    file = $htmlRoot + "fileupload.html"
+    file.gsub! 'file:///', ''
+    file.gsub! '/', '\\'
+    browser.file_field(:xpath, "//input[@name='file1']/").set(file)
     #click the upload button
     browser.button(:xpath, "//input[@name='upload']/").click
     

data/unittests/form_test.rb

@@ -46,6 +46,7 @@ class TC_Forms2 < Test::Unit::TestCase # Note: there is no TC_Forms1
   def test_form_outer_html
     expected = "\r\n<FORM id=f2 name=test2 action=pass2.html method=get><BR><INPUT type=submit value=Submit> </FORM>"
     actual = browser.form(:name, 'test2').html
+    actual.sub!('style=""','') # ie9 adds in a style tag so just strip it out
 
     # ignore attributes order by sorting them
     sorted_expected, sorted_actual = [expected, actual].map! do |html|

data/unittests/frame_test.rb

@@ -168,7 +168,9 @@ class TC_Frames_click_no_wait < Test::Unit::TestCase
     frame = browser.frame("buttonFrame")
     assert !frame.text.include?("PASS")
     frame.button(:id => "b2").click_no_wait
-    assert frame.text.include?("PASS")
+    assert_nothing_raised {
+      Watir::Wait.until {frame.text.include?("PASS")}
+    }
   end
 end
 
@@ -193,4 +195,18 @@ class TC_frames_method_for_container < Test::Unit::TestCase
     assert_equal('first_frame', frames[1].id)
     assert_equal('pass.html', frames[3].src)
   end
+end
+
+class TC_iframe_access < Test::Unit::TestCase
+  def setup
+    goto_page "iframe.html"
+  end
+
+  def test_frame_without_access_should_still_show_properties
+    frame = browser.frame(:name, 'iframe')
+    assert_nothing_raised {frame.src}
+    assert_equal('http://www.google.com', frame.src)
+    assert_raises(FrameAccessDeniedException) {frame.button(:index, 1).click}
+  end
+
 end

data/unittests/html/ie_9.html

@@ -0,0 +1,6 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" >
+This page loads with the correct document standards for IE. In IE9, without the doctype everything is run in Quirks mode
+<input type = button class="italic_button"  name = b1 id = b2 value = "Click Me" onClick="javascript:document.location='pass.html';" title = "this is button1">
+</html>

data/unittests/html/iframe.html

@@ -0,0 +1,3 @@
+This iframe gives access denied but we still should be able to get the src property
+<br><br>
+<iframe src ="http://www.google.com" name='iframe'>

data/unittests/ie9_test.rb

@@ -0,0 +1,16 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_IE9 < Test::Unit::TestCase
+  include Watir::Exception
+
+  def setup
+    goto_page "ie_9.html"
+  end
+
+  def test_clicking_button
+    browser.button(:value, "Click Me").click
+    assert(browser.text.include?("PASS") )
+  end
+
+end

data/unittests/images_test.rb

@@ -30,7 +30,7 @@ class TC_Images < Test::Unit::TestCase
     assert(    browser.image(:id , /squ/ ).exists?  )
     
     assert( !  browser.image(:src, "missingsrc.gif").exists?  )
-    
+
     assert(    browser.image(:src, "file:///#{$myDir}/html/images/triangle.jpg").exists?  )
     assert(    browser.image(:src , /triangle/ ).exists?  )
     

data/unittests/minmax_test.rb

@@ -7,24 +7,31 @@ class TC_MinMax< Test::Unit::TestCase
   tags :must_be_visible
   def setup
     goto_page 'pass.html'
-  end        
+  end
   def teardown
     browser.restore
   end
   def test_minimimum
     browser.minimize
+    assert browser.minimized?
   end
   def test_maximum
     browser.maximize
+    assert !browser.minimized?
   end
-  def test_front
-    assert browser.front?
-    ie2 = Watir::IE.start($htmlRoot + 'blankpage.html')
-    assert ie2.front?
-    assert ! browser.front?
-    browser.bring_to_front
-    assert browser.front?
-    ie2.close
+  def test_activate
+    browser.activate
+    assert browser.active?
+    begin
+      new_browser = Watir::IE.start($htmlRoot + 'blankpage.html')
+      assert new_browser.active?
+      assert !browser.active?
+      browser.activate
+      browser.activate   # bug in rautomation? It's in front just not activated
+      assert browser.active?
+    ensure
+      new_browser.close
+    end
   end
 end
 

data/unittests/no_wait_test.rb

@@ -1,22 +1,28 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
 class TC_No_Wait_Commands < Test::Unit::TestCase
   def test_fire_event_no_wait
     goto_page "javascriptevents.html"
     browser.link(:text, "Check the Status").fire_event_no_wait("onMouseOver")
-    assert_equal("It worked", browser.status) 
+    assert_nothing_raised{
+      Watir::Wait.until {browser.status == "It worked"}
+    }
   end
 
   def test_set_no_wait_text_field
     goto_page "textfields1.html"
     browser.text_field(:name, "text1").set_no_wait("watir IE Controller")
-    assert_equal("watir IE Controller", browser.text_field(:name, "text1").value)
+    assert_nothing_raised{
+      Watir::Wait.until {browser.text_field(:name, "text1").value == "watir IE Controller"}
+    }
   end
 
   def test_set_no_wait_text_select_list
     goto_page "selectboxes1.html"
     browser.select_list(:name,'sel1').set_no_wait(/Option 1/)
-    assert_equal('Option 1', browser.select_list(:name , 'sel1').selected_options.first)
+    assert_nothing_raised{
+      Watir::Wait.until {browser.select_list(:name , 'sel1').selected_options.first == 'Option 1'}
+    }
   end
 end

data/unittests/setup.rb

@@ -68,16 +68,3 @@ end
 =end
 
 $window_tests = Dir["unittests/windows/*_test.rb"] - ["unittests/windows/ie-each_test.rb"]
-
-# load development libs also in #click_no_wait processes
-Watir::Element.class_eval do
-  alias_method :__spawned_no_wait_command, :spawned_no_wait_command
-
-  def spawned_no_wait_command(command)
-    # make it actually wait in tests for easier testing
-    #
-    # please note that this implementation of click_no_wait takes considerably more time than
-    # in real situation due to the loading of setup.rb!
-    "ruby -r#{File.expand_path(File.join(File.dirname(__FILE__), "setup.rb"))} -e #{command.inspect}"
-  end
-end

data/unittests/version_test.rb

@@ -0,0 +1,15 @@
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_Version < Test::Unit::TestCase
+
+  def test_full_version
+    assert !Watir::IE.version.nil?
+  end
+
+  def test_version_part
+    assert Watir::IE.version_parts[0] =~ /^\d+$/
+  end
+
+end

data/unittests/win32ole_so_test.rb

@@ -0,0 +1,35 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..')
+require 'Win32API'
+require 'unittests/setup'
+
+# This test makes sure that the win32ole changes will return
+# the dom using GetUnknown, which is added via the win32ole patch
+class TC_Win32OLE < Test::Unit::TestCase
+
+  def setup
+    # 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('/', '\\')
+
+    @ie = Watir::IE.new
+    @ie.goto 'www.google.com'
+  end
+
+  def teardown
+    @ie.close
+  end
+
+  def test_win32ole_modifications
+    fnGetUnknown = Win32API.new(@iedialog_file, 'GetUnknown', ['p', 'p'], 'v')
+    intPointer = " " * 4 # will contain the int value of the IUnknown*
+    fnGetUnknown.call(@ie.hwnd, intPointer)
+    assert_true intPointer
+    intArray = intPointer.unpack('L')
+    intUnknown = intArray.first
+    htmlDoc = WIN32OLE.connect_unknown(intUnknown);
+    scriptEngine = htmlDoc.Script
+
+    # now we get the HTML DOM object!
+    body =  scriptEngine.document.body
+    assert(body.innerHTML =~ /html/)
+  end
+end

data/unittests/windows/send_keys_test.rb

@@ -23,10 +23,4 @@ class TC_SendKeys < Test::Unit::TestCase
     assert(browser.text.include?('PASS'))
   end
   
-  tag_method :test_autoregistration, :fails_on_ie
-  def test_autoregistration
-    Watir::_unregister('AutoItX3.dll')
-    assert_raises(WIN32OLERuntimeError) { WIN32OLE.new('AutoItX3.Control') }
-    assert_nothing_raised { browser.send_keys('{tab}') }
-  end    
 end