watir 1.5.4 → 1.5.5

data/unittests/div_xpath_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Divs, Spans and P's
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Divs_XPath < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "div.html")
+    goto_page "div.html"
   end
   
   def test_divs

data/unittests/errorchecker_test.rb

@@ -1,16 +1,11 @@
 # feature tests for Goto
-# revision: $Revision: 958 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
-class TC_error_checker< Test::Unit::TestCase
-  include Watir
-  
-  def goto_page(page)
-    $ie.goto($htmlRoot + page)
-  end
-  
+class TC_error_checker < Test::Unit::TestCase
+    
   def test_simple_checker
     button_checker = Proc.new{
       |ie|  raise RuntimeError, "text 'buttons' was missing"  if !ie.pageContainsText(/buttons/)

data/unittests/filefield_test.rb

@@ -1,5 +1,5 @@
 # feature tests for file Fields
-# revision: $Revision: 1138 $
+# revision: $Revision: 1349 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
@@ -7,13 +7,11 @@ require 'unittests/setup'
 class TC_FileField < Test::Unit::TestCase
   include Watir
   
-  def goto_page
-    $ie.goto($htmlRoot + "fileupload.html")
+  def setup
+    goto_page "fileupload.html"
   end
   
   def test_file_field_Exists
-    goto_page
-
     # test for existance of 4 file area
     assert($ie.file_field(:name,"file1").exists?)
     assert($ie.file_field(:id,"file2").exists?)
@@ -24,7 +22,7 @@ class TC_FileField < Test::Unit::TestCase
 
     # pop one open and put something in it.
     file = $htmlRoot + "fileupload.html"
-    file.gsub! 'file://', ''
+    file.gsub! 'file:///', ''
     file.gsub! '/', '\\'
     $ie.file_field(:name,"file1").set(file)	
     assert_equal file, $ie.file_field(:name,"file1").value
@@ -35,7 +33,6 @@ class TC_FileField < Test::Unit::TestCase
   end
   
   def test_iterator
-    goto_page
     assert_equal(6, $ie.file_fields.length)
   end
   

data/unittests/filefield_xpath_test.rb

@@ -1,5 +1,5 @@
 # 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'
@@ -7,12 +7,11 @@ require 'unittests/setup'
 class TC_FileField_XPath < Test::Unit::TestCase
   include Watir
   
-  def goto_page
-    $ie.goto($htmlRoot + "fileupload.html")
+  def setup
+    goto_page "fileupload.html"
   end
   
   def test_file_field_Exists
-    goto_page
     #test for existance of 4 file area
     assert($ie.file_field(:xpath, "//input[@name='file1']/").exists?)
     assert($ie.file_field(:xpath, "//input[@id='file2']/").exists?)
@@ -28,7 +27,6 @@ class TC_FileField_XPath < Test::Unit::TestCase
   end
   
   def test_iterator
-    goto_page
     assert_equal(6, $ie.file_fields.length)
   end
   

data/unittests/form_test.rb

@@ -1,12 +1,12 @@
 # feature tests for Forms
-# revision: $Revision: 1294 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Forms2 < Test::Unit::TestCase # Note: there is no TC_Forms1
   def setup
-    $ie.goto($htmlRoot + "forms2.html")
+    goto_page "forms2.html"
   end
   
   def test_Form_Exists
@@ -50,7 +50,7 @@ require 'unittests/iostring'
 class TC_Form_Display < Test::Unit::TestCase
   include MockStdoutTestCase                
   def test_showforms
-    $ie.goto($htmlRoot + "forms2.html")
+    goto_page "forms2.html"
     $stdout = @mockout
     $ie.showForms
     assert_equal(<<END_OF_MESSAGE, @mockout)
@@ -77,7 +77,7 @@ end
 
 class TC_Forms3 < Test::Unit::TestCase
   def setup
-    $ie.goto($htmlRoot + "forms3.html")
+    goto_page "forms3.html"
   end
   
   # The following tests from bug 2261 
@@ -181,7 +181,7 @@ end
 class TC_Forms3_Display < Test::Unit::TestCase
   include MockStdoutTestCase # BUG in test: output not verified!                
   def test_show_stuff
-    $ie.goto($htmlRoot + "forms3.html")
+    goto_page "forms3.html"
     $stdout = @mockout
     $ie.showAllObjects
     puts $ie.getText
@@ -191,7 +191,7 @@ end
 
 class TC_Forms4 < Test::Unit::TestCase
   def setup
-    $ie.goto($htmlRoot + "forms4.html")
+    goto_page "forms4.html"
   end
   
   def test_find_text_field_ignoring_form
@@ -221,7 +221,7 @@ end
 
 class TC_Hidden_Fields < Test::Unit::TestCase
   def setup
-    $ie.goto($htmlRoot + "forms3.html")
+    goto_page "forms3.html"
   end
   
   def test_hidden

data/unittests/form_xpath_test.rb

@@ -1,12 +1,12 @@
 # feature tests for Forms
-# revision: $Revision: 1201 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Forms2_XPath < Test::Unit::TestCase
   def setup
-    $ie.goto($htmlRoot + "forms2.html")
+    goto_page "forms2.html"
   end
   
   def test_Form_Exists
@@ -29,7 +29,7 @@ require 'unittests/iostring'
 class TC_Form_Display < Test::Unit::TestCase
   include MockStdoutTestCase                
   def test_showforms
-    $ie.goto($htmlRoot + "forms2.html")
+    goto_page "forms2.html"
     $stdout = @mockout
     $ie.show_forms
     assert_equal(<<END_OF_MESSAGE, @mockout)
@@ -56,7 +56,7 @@ end
 
 class TC_Forms3 < Test::Unit::TestCase
   def setup
-    $ie.goto($htmlRoot + "forms3.html")
+    goto_page "forms3.html"
   end
   
   def test_Form_Exists
@@ -149,7 +149,7 @@ end
 
 class TC_Forms4 < Test::Unit::TestCase
   def setup
-    $ie.goto($htmlRoot + "forms4.html")
+    goto_page "forms4.html"
   end
   
   def test_find_text_field_ignoring_form
@@ -174,7 +174,7 @@ end
 
 class TC_Hidden_Fields < Test::Unit::TestCase
   def setup
-    $ie.goto($htmlRoot + "forms3.html")
+    goto_page "forms3.html"
   end
   
   def test_hidden

data/unittests/frame_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Frames
-# revision: $Revision: 1204 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Frames < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "frame_buttons.html")
+    goto_page "frame_buttons.html"
   end
   
   def test_frame_no_what
@@ -54,10 +54,10 @@ class TC_Frames < Test::Unit::TestCase
 end
 
 class TC_Frames2 < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "frame_multi.html")
+    goto_page "frame_multi.html"
   end
   
   def test_frame_with_no_name
@@ -76,10 +76,10 @@ class TC_Frames2 < Test::Unit::TestCase
 end
 
 class TC_NestedFrames < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "nestedFrames.html")
+    goto_page "nestedFrames.html"
   end
   
   def test_frame
@@ -95,10 +95,9 @@ class TC_NestedFrames < Test::Unit::TestCase
 end
 
 class TC_IFrames < Test::Unit::TestCase
-  include Watir
   
   def setup
-    $ie.goto($htmlRoot + "iframeTest.html")
+    goto_page "iframeTest.html"
   end
   
   def test_Iframe

data/unittests/google_form_test.rb

@@ -5,10 +5,9 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_GoogleForm < Test::Unit::TestCase
-  include Watir
   
   def setup
-    $ie.goto($htmlRoot + "google_india.html")
+    goto_page "google_india.html"
   end
   
   def test_it

data/unittests/html/div.html

@@ -8,7 +8,7 @@
 
 </head>
 <body>
-CVS Revision: "$Revision: 1086 $"
+CVS Revision: "$Revision: 1352 $"
 <br>
 <br>
 <div id = div1 title = "Test1" >This text is in a div with an id of div1 and title of test1</div>
@@ -34,6 +34,12 @@ This input field gets its value from div3. Its name is text1<input type = text n
    Text1: <input type=textarea name=div_text1 >&nbsp;&nbsp;&nbsp;&nbsp;   Text2: <input type=text name=div_text2 >&nbsp;&nbsp;&nbsp;&nbsp;   Text3: <input type=text name=div_text3>
 </div>
 
+<div id=hasImages>
+<img src = images/triangle.jpg id=img1>
+<img src = images/square.jpg id=img2>
+<img src = images/circle.jpg id=circle>
+</div>
+
 
 
 

data/unittests/html/lists.html

@@ -10,7 +10,7 @@
 
 <h4>An Ordered List:</h4>
 <ol>
-  <li id='ordered1' name='l1'>Phil</li>
+  <li id='ordered1' name='x1'>Phil</li>
   <li id='ordered2'>Bob</li>
   <li id='ordered3'>Joe</li>
 </ol>

data/unittests/ie_mock.rb

@@ -35,11 +35,13 @@ class FakeDoc
       @links << value
     end
   end
-  
+  def location
+    self
+  end
   def url
     return "file://fake"
   end
-  
+  alias :href :url  
 end
 
 class StubExplorer

data/unittests/ie_test.rb

@@ -1,5 +1,5 @@
 # Unit Test for Internet Explorer
-# revision: $Revision: 1141 $
+# revision: $Revision: 1318 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'watir/win32ole'
@@ -7,7 +7,7 @@ require 'unittests/ie_mock'
 require 'test/unit'
 
 class TC_ie < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
     @faked_ie = TestIE.new

data/unittests/images_test.rb

@@ -1,5 +1,5 @@
 # feature tests for Images
-# revision: $Revision: 958 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
@@ -11,7 +11,7 @@ class TC_Images < Test::Unit::TestCase
   include Watir
   
   def setup
-    $ie.goto($htmlRoot + "images1.html")
+    goto_page "images1.html"
     @saved_img_path = build_path("sample.img.dat");
     clean_saved_image
   end

data/unittests/images_xpath_test.rb

@@ -1,5 +1,5 @@
 # feature tests for Images
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
@@ -15,7 +15,7 @@ class TC_Images_XPath < Test::Unit::TestCase
   end
   
   def gotoImagePage
-    $ie.goto($htmlRoot + "images1.html")
+    goto_page "images1.html"
   end
   
   def test_imageExists

data/unittests/links_multi_test.rb

@@ -5,32 +5,46 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Links_Multi < Test::Unit::TestCase
-  include Watir
   
   def setup
-    $ie.goto $htmlRoot + 'links_multi.html'
+    browser.goto $htmlRoot + 'links_multi.html'
   end
   
   def test_existing
-    assert_match(/not.html/, $ie.link(:class_name, 'Papa').href)
-    assert_match(/mama.html/, $ie.link(:text, 'click').href)
+    assert_match(/not.html/, browser.link(:class_name, 'Papa').href)
+    assert_match(/mama.html/, browser.link(:text, 'click').href)
   end
   
   def test_class_alias
-    assert_match(/not.html/, $ie.link(:class, 'Papa').href)
+    assert_match(/not.html/, browser.link(:class, 'Papa').href)
   end
 
   def test_hash_syntax
-    assert_match(/not.html/, $ie.link(:class_name => 'Papa').href)
-    assert_match(/mama.html/, $ie.link(:text => 'click').href)
+    assert_match(/not.html/, browser.link(:class_name => 'Papa').href)
+    assert_match(/mama.html/, browser.link(:text => 'click').href)
   end
   
   def test_class_and_text
-    assert_match(/papa.html/, $ie.link(:class => 'Papa', :text => 'click').href)
+    assert_match(/papa.html/, browser.link(:class => 'Papa', :text => 'click').href)
   end
   
   def test_class_and_index
-    assert_match(/papa.html/, $ie.link(:class => 'Papa', :index => 2).href)
+    assert_match(/papa.html/, browser.link(:class => 'Papa', :index => 2).href)
   end  
+
+  include Watir::Exception
+  def test_not_found_single
+    exception = assert_raise(UnknownObjectException) do
+      browser.link(:id, 'Missing').href
+    end
+    assert_equal('Unable to locate element, using :id, "Missing"', exception.message)
+  end
+  
+  def test_not_found_with_multi
+    exception = assert_raise(UnknownObjectException) do
+      browser.link(:class => 'Missing', :index => 2).href
+    end
+    assert_equal('Unable to locate element, using {:class=>"Missing", :index=>2}', exception.message)
+  end
   
 end

data/unittests/links_test.rb

@@ -1,15 +1,15 @@
 # feature tests for Links
-# revision: $Revision: 1277 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 require 'cgi'
 
 class TC_Links < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "links1.html")
+    goto_page "links1.html"
   end
   
   def test_bad_attribute
@@ -119,16 +119,16 @@ class TC_Links < Test::Unit::TestCase
   end
   
   def test_div_xml_bug
-    $ie.goto($htmlRoot + "div_xml.html")
+    goto_page "div_xml.html"
     assert_nothing_raised {$ie.link(:text, 'Create').exists? }   
   end
 end
 
 class TC_Frame_Links < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "frame_links.html")
+    goto_page "frame_links.html"
   end
   
   def test_links_in_frames
@@ -152,7 +152,7 @@ class TC_showlinks < Test::Unit::TestCase
   include MockStdoutTestCase
   
   def test_showLinks
-    $ie.goto($htmlRoot + "links1.html")
+    goto_page "links1.html"
     $stdout = @mockout
     $ie.showLinks
     expected = [/^index name +id +href + text\/src$/,