watir 1.5.4 → 1.5.5

data/unittests/table_xpath_test.rb

@@ -1,18 +1,14 @@
 # feature tests for Tables
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Tables_XPath < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    gotoTablePage
-  end
-  
-  def gotoTablePage
-    $ie.goto($htmlRoot + "table1.html")
+    goto_page "table1.html"
   end
   
   def test_Table_Exists
@@ -48,10 +44,10 @@ class TC_Tables_XPath < Test::Unit::TestCase
   end
   
   def test_table_from_element
-    $ie.goto($htmlRoot + "simple_table_buttons.html")
+    goto_page "simple_table_buttons.html"
     
     button = $ie.button(:xpath , "//input[@id='b1']/")
-    table = Table.create_from_element($ie,button)
+    table = Watir::Table.create_from_element($ie,button)
     
     table[2][1].button(:index,1).click
     assert($ie.text_field(:name,"confirmtext").verify_contains(/CLICK2/i))

data/unittests/textarea_test.rb

@@ -1,18 +1,14 @@
 # tests for textarea elements
-# revision: $Revision: 1260 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_TextArea < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
-  def use_page page
-    $ie.goto($htmlRoot + page)
-  end
-
   def setup
-    use_page 'textarea.html'
+    goto_page 'textarea.html'
   end
   
   def test_elements_exist_or_not

data/unittests/textarea_xpath_test.rb

@@ -1,18 +1,17 @@
 # feature tests for TextArea Fields
-# revision: $Revision: 963 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_TextArea_XPath < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
-  def goto_page
-    $ie.goto($htmlRoot + "textArea.html")
+  def setup
+    goto_page "textArea.html"
   end
   
   def test_textarea_field_exists
-    goto_page
     #test for existance of 4 text area
     assert($ie.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").exists?)
     assert($ie.text_field(:xpath , "//textarea[@name='txtMultiLine2']/").exists?)
@@ -28,15 +27,13 @@ class TC_TextArea_XPath < Test::Unit::TestCase
     assert(!$ie.text_field(:xpath , "//textarea[@name='txtMultiLine4']/").exists?)
   end
   
-  def test_textarea_to_s
+  def xtest_textarea_to_s
     # bug reported by Zeljko Filipin
     # assert_nothing_raised { $ie.text_field(:xpath , "//textarea[@id='txtMultiLine3']/").to_s  }
     # The above assertion fails. No property or method called maxlength
   end
   
   def test_textarea_field
-    goto_page
-    
     # test for read only method
     assert(!$ie.text_field(:xpath , "//textarea[@name='txtMultiLine1']/").readonly? )  
     assert($ie.text_field(:xpath , "//textarea[@name='txtReadOnly']/").readonly?)
@@ -76,7 +73,6 @@ class TC_TextArea_XPath < Test::Unit::TestCase
     
     $ie.text_field(:xpath , "//textarea[@name='txtMultiLine2']/").clear
     assert_equal(  "" , $ie.text_field(:xpath , "//textarea[@name='txtMultiLine2']/").value )  
-    
   end
   
 end

data/unittests/textfield_for_ch_char_test.rb

@@ -4,7 +4,7 @@ require 'unittests/setup'
 class TC_Fields_For_Chinese_Char < Test::Unit::TestCase
   
   def setup()
-    $ie.goto($htmlRoot + "textfields1.html")                 
+    goto_page "textfields1.html"                 
   end
   
   def test_chinese_char_should_be_appended_to_text_field

data/unittests/textfields_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Text Fields & Labels
-# revision: $Revision: 1295 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Fields < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "textfields1.html")
+    goto_page "textfields1.html"
   end
   
   def test_text_field_exists
@@ -210,6 +210,5 @@ class TC_Fields < Test::Unit::TestCase
 
   def test_max_length
     assert_equal(20, $ie.text_field(:name , 'text1').maxLength )
-
   end
 end

data/unittests/textfields_xpath_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Text Fields
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Fields_XPath < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "textfields1.html")
+    goto_page "textfields1.html"
   end
   
   def test_text_field_exists

data/unittests/windows/attach_to_existing_window_test.rb

@@ -1,5 +1,5 @@
 # feature tests for attaching to existing IE windows
-# revision: $Revision: 1230 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
 require 'unittests/setup'
@@ -8,7 +8,7 @@ class TC_ExistingWindow< Test::Unit::TestCase
   include Watir
 
   def setup
-    $ie.goto($htmlRoot + 'buttons1.html')
+    goto_page 'buttons1.html'
   end
   def teardown
     IE.reset_attach_timeout

data/unittests/windows/attach_to_new_window_test.rb

@@ -1,5 +1,5 @@
 # feature tests for attaching to new IE windows
-# revision: $Revision: 1230 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
 require 'unittests/setup'
@@ -9,7 +9,7 @@ class TC_NewWindow< Watir::TestCase
   include Watir
   
   def setup
-    $ie.goto($htmlRoot + "new_browser.html")
+    goto_page "new_browser.html"
   end
   def teardown
     IE.reset_attach_timeout

data/unittests/windows/close_window_test.rb

@@ -5,17 +5,16 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE
 require 'unittests/setup'
 
 class TC_CloseWindow < Watir::TestCase
-  include Watir
   execute :sequentially
   
   def setup
-    $ie.goto($htmlRoot + "new_browser.html")
+    goto_page "new_browser.html"
   end
   
   # reproduces defect http://jira.openqa.org/browse/WTR-16
   def test_close_window_with_button
     $ie.link(:text, 'New Window').click
-    ie_new = IE.attach(:title, 'Pass Page')
+    ie_new = Watir::IE.attach(:title, 'Pass Page')
     assert(ie_new.text.include?('PASS'))
     assert_nothing_raised {ie_new.close}
   end

data/unittests/windows/frame_links_test.rb

@@ -8,7 +8,7 @@ class TC_Frame_Links < Test::Unit::TestCase
   include Watir
   
   def setup
-    $ie.goto($htmlRoot + "frame_links.html")
+    goto_page "frame_links.html"
   end
   
   def test_click_in_a_frame

data/unittests/windows/iedialog_test.rb

@@ -1,5 +1,5 @@
 # unit tests for iedialog.dll and customized win32ole.so
-# revision: $Revision: 1278 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
 require 'unittests/setup'
@@ -21,14 +21,14 @@ class TC_IEDialog < Test::Unit::TestCase
   end
 
   def test_find_window   
-    $ie.goto($htmlRoot + "pass.html")
+    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    
-    $ie.goto($htmlRoot + "pass.html")
+    goto_page "pass.html"
 
     fnFindWindow = Win32API.new('user32.dll', 'FindWindow', ['p', 'p'], 'l')
     hwnd = fnFindWindow.call(nil, "Pass Page - Microsoft Internet Explorer")

data/unittests/windows/js_events_test.rb

@@ -1,14 +1,12 @@
 # feature tests for JavaScript events
-# revision: $Revision: 1177 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_JSEvents < Test::Unit::TestCase
-  include Watir
-  
   def setup
-    $ie.goto($htmlRoot + "javascriptevents.html")
+    goto_page "javascriptevents.html"
   end
   
   def test_Button_disabled

data/unittests/windows/modal_dialog_test.rb

@@ -1,5 +1,5 @@
 # feature tests for modal web dialog support
-# revision: $Revision: 1230 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
 require 'unittests/setup'
@@ -10,7 +10,7 @@ class TC_ModalDialog < Watir::TestCase
   include Watir
   
   def setup
-    $ie.goto($htmlRoot + 'modal_dialog_launcher.html')
+    goto_page 'modal_dialog_launcher.html'
   end
 
   def teardown 

data/unittests/windows/send_keys_test.rb

@@ -1,14 +1,12 @@
 # feature tests for IE#send_keys
-# revision: $Revision: 1177 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Fields < Test::Unit::TestCase
-  include Watir
-  
   def setup
-    $ie.goto($htmlRoot + "textfields1.html")
+    goto_page "textfields1.html"
   end
   
   def test_tabbing

data/watir.rb

@@ -71,20 +71,15 @@ end
 # ARGV needs to be deleted to enable the Test::Unit functionality that grabs
 # the remaining ARGV as a filter on what tests to run.
 # Note: this means that watir must be require'd BEFORE test/unit.
-def command_line_flag(switch)
-  setting = ARGV.include?(switch)
-  ARGV.delete(switch)
-  return setting
-end
 
-# Make Internet Explorer minimize. -b stands for background
-$HIDE_IE = command_line_flag('-b')
+# Make Internet Explorer invisible. -b stands for background
+$HIDE_IE = ARGV.delete('-b')
 
 # Run fast
-$FAST_SPEED = command_line_flag('-f')
+$FAST_SPEED = ARGV.delete('-f')
 
 # Eat the -s command line switch (deprecated)
-command_line_flag('-s')
+ARGV.delete('-s')
 
 require 'watir/logger'
 require 'watir/win32'
@@ -122,10 +117,7 @@ module Watir
     ATTACHER.timeout = IE.attach_timeout
     ATTACHER.wait_until { yield }
   end
-
             
-  # Move to Watir::Utils
-  
   @@autoit = nil  
 
   def self.autoit
@@ -154,4 +146,3 @@ def _code_that_copies_readonly_array(array, name)
 end
 
 require 'watir/camel_case'
-require 'watir/bonus-elements'

data/watir/assertions.rb

@@ -33,4 +33,12 @@ EOT
     
   end
 
-end
+end
+module Test::Unit::Assertions
+    def assert_false(boolean, message=nil)
+        _wrap_assertion do
+            assert_block("assert should not be called with a block.") { !block_given? }
+            assert_block(build_message(message, "<?> is not false.", boolean)) { !boolean }
+        end
+    end
+end 

data/watir/collections.rb

@@ -156,14 +156,6 @@ module Watir
     end
   end
   
-  class Map < NonControlElement
-    TAG = 'MAP'
-  end
-
-  class Area < NonControlElement
-    TAG = 'AREA'
-  end
-  
   # this class accesses the maps in the document as a collection
   # Normally a user would not need to create this object as it is returned by the Watir::Container#maps method
   class Maps < ElementCollections
@@ -181,12 +173,15 @@ module Watir
     def element_tag; 'AREA'; end
   end
   
-  # this class accesses the imnages in the document as a collection
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#images method
+  # this class collects the images in the container
+  # An instance is returned by Watir::Container#images
   class Images < ElementCollections
     def element_class; Image; end
     def length
-      @container.document.images.length
+      all = @container.document.all
+      imgs = []
+      all.each{|n| imgs << n if n.nodeName == "IMG"}
+      imgs.length
     end
     
     private

data/watir/container.rb

@@ -478,9 +478,9 @@ module Watir
     #   ie.li(:index,2)                    # access the second li on the page
     #   ie.li(:title, "A Picture")        # access a li using the tooltip text. See http://msdn.microsoft.com/workshop/author/dhtml/reference/properties/title_1.asp?frame=true
     #   
-    def li(how, what)
-      return Li.new(self, how, what)
-    end
+#    def li(how, what=nil)
+#      return Li.new(self, how, what)
+#    end
     
     # this is the main method for accessing the lis iterator.
     #
@@ -511,7 +511,7 @@ module Watir
     #   ie.map(:index,2)                    # access the second map on the page
     #   ie.map(:title, "A Picture")         # access a map using the tooltip text. See http://msdn.microsoft.com/workshop/author/dhtml/reference/properties/title_1.asp?frame=true
     #    
-    def map(how, what)
+    def map(how, what=nil)
       return Map.new(self, how, what)
     end
     
@@ -543,7 +543,7 @@ module Watir
     #   ie.area(:index,2)                    # access the second area on the page
     #   ie.area(:title, "A Picture")         # access a area using the tooltip text. See http://msdn.microsoft.com/workshop/author/dhtml/reference/properties/title_1.asp?frame=true
     #    
-    def area(how, what)
+    def area(how, what=nil)
       return Area.new(self, how, what)
     end
     
@@ -577,7 +577,7 @@ module Watir
     #   ie.image(:alt, "A Picture")         # access an image using the alt text
     #   ie.image(:xpath, "//img[@alt='A Picture']/")    # access an image using the alt text
     #
-    def image(how,what=nil)
+    def image(how, what=nil)
       Image.new(self, how, what)
     end
     
@@ -599,24 +599,6 @@ module Watir
       PopUp.new(self)
     end
     
-    # This is the main method for accessing divs. http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/div.asp?frame=true
-    #  *  how   - symbol - how we access the div
-    #  *  what  - string, integer, regular expression or xpath query - what we are looking for,
-    #
-    # Valid values for 'how' are listed in the Watir Wiki - http://wiki.openqa.org/display/WTR/Methods+supported+by+Element
-    #
-    # returns an Div object
-    #
-    # Typical Usage
-    #
-    #   ie.div(:id, /list/)                 # access the first div that matches list.
-    #   ie.div(:index,2)                    # access the second div on the page
-    #   ie.div(:title, "A Picture")         # access a div using the tooltip text. See http://msdn.microsoft.com/workshop/author/dhtml/reference/properties/title_1.asp?frame=true
-    #   ie.div(:xpath, "//div[@id='list']/")    # access the first div whose id is 'list'
-    #
-    def div(how, what=nil)
-      Div.new(self, how, what)
-    end
     
     # this is the main method for accessing the divs iterator. Returns a Divs collection
     #
@@ -629,25 +611,7 @@ module Watir
     def divs
       Divs.new(self)
     end
-    
-    # This is the main method for accessing span tags - http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/span.asp?frame=true
-    #  *  how   - symbol - how we access the span, 
-    #  *  what  - string, integer or regular expression - what we are looking for,
-    #
-    # Valid values for 'how' are listed in the Watir Wiki - http://wiki.openqa.org/display/WTR/Methods+supported+by+Element
-    #
-    # returns a Span object
-    #
-    # Typical Usage
-    #
-    #   ie.span(:id, /list/)                 # access the first span that matches list.
-    #   ie.span(:index,2)                    # access the second span on the page
-    #   ie.span(:title, "A Picture")         # access a span using the tooltip text. See http://msdn.microsoft.com/workshop/author/dhtml/reference/properties/title_1.asp?frame=true
-    #
-    def span(how, what=nil)
-      Span.new(self, how, what)
-    end
-    
+        
     # this is the main method for accessing the spans iterator.
     #
     # Returns a Spans object
@@ -662,23 +626,6 @@ module Watir
       Spans.new(self)
     end
     
-    # This is the main method for accessing p tags - http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/p.asp?frame=true
-    #  *  how   - symbol - how we access the p, 
-    #  *  what  - string, integer or regular expression - what we are looking for,
-    #
-    # Valid values for 'how' are listed in the Watir Wiki - http://wiki.openqa.org/display/WTR/Methods+supported+by+Element
-    #
-    # returns a P object
-    #
-    # Typical Usage
-    #
-    #   ie.p(:id, /list/)                 # access the first p tag  that matches list.
-    #   ie.p(:index,2)                    # access the second p tag on the page
-    #   ie.p(:title, "A Picture")         # access a p tag using the tooltip text. See http://msdn.microsoft.com/workshop/author/dhtml/reference/properties/title_1.asp?frame=true
-    #
-    def p(how, what=nil)
-      P.new(self, how, what)
-    end
     
     # this is the main method for accessing the ps iterator.
     #
@@ -693,26 +640,7 @@ module Watir
     def ps
       Ps.new(self)
     end
-    
-    # This is the main method for accessing pre tags - http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/pre.asp?frame=true
-    #  *  how   - symbol - how we access the pre, valid values are
-    #    :index      - finds the item using its index
-    #    :id         - finds the item using its id attribute
-    #    :name       - finds the item using its name attribute
-    #  *  what  - string, integer or re, what we are looking for,
-    #
-    # returns a Pre object
-    #
-    # Typical Usage
-    #
-    #   ie.pre(:id, /list/)                 # access the first pre tag  that matches list.
-    #   ie.pre(:index,2)                    # access the second pre tag on the page
-    #   ie.pre(:title, "A Picture")         # access a pre tag using the tooltip text. See http://msdn.microsoft.com/workshop/author/dhtml/reference/properties/title_1.asp?frame=true
-    #
-    def pre(how, what=nil)
-      Pre.new(self, how, what)
-    end
-    
+        
     # this is the main method for accessing the ps iterator.
     #
     # Returns a Pres object
@@ -726,25 +654,7 @@ module Watir
     def pres
       Pres.new(self)
     end
-    
-    # This is the main method for accessing labels. http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/label.asp?frame=true
-    #  *  how   - symbol - how we access the label,
-    #  *  what  - string, integer or regular expression - what we are looking for,
-    #
-    # Valid values for 'how' are listed in the Watir Wiki - http://wiki.openqa.org/display/WTR/Methods+supported+by+Element
-    #
-    # returns a Label object
-    #
-    # Typical Usage
-    #
-    #   ie.label(:id, /list/)                 # access the first span that matches list.
-    #   ie.label(:index,2)                    # access the second label on the page
-    #   ie.label(:for, "text_1")              # access a the label that is associated with the object that has an id of text_1
-    #
-    def label(how, what=nil)
-      Label.new(self, how, what)
-    end
-    
+        
     # this is the main method for accessing the labels iterator. It returns a Labels object
     #
     # Returns a Labels object