links_multi_test.rb in watir-1.6.2

- old
+ new

@@ -1,28 +1,28 @@
 # feature tests for Links with multiple attributes
 # revision: $Revision: 1009 $
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
 class TC_Links_Multi < Test::Unit::TestCase
   
   def setup
-    browser.goto $htmlRoot + 'links_multi.html'
+    goto_page 'links_multi.html'
   end
   
   def test_existing
-    assert_match(/not.html/, browser.link(:class_name, 'Papa').href)
+    assert_match(/not.html/, browser.link(:class, 'Papa').href)
     assert_match(/mama.html/, browser.link(:text, 'click').href)
   end
-  
+
   def test_class_alias
-    assert_match(/not.html/, browser.link(:class, 'Papa').href)
+    assert_match(/not.html/, browser.link(:class_name, 'Papa').href)
   end
-
+  
   def test_hash_syntax
-    assert_match(/not.html/, browser.link(:class_name => 'Papa').href)
+    assert_match(/not.html/, browser.link(:class => 'Papa').href)
     assert_match(/mama.html/, browser.link(:text => 'click').href)
   end
   
   def test_class_and_text
     assert_match(/papa.html/, browser.link(:class => 'Papa', :text => 'click').href)
@@ -30,10 +30,9 @@
   
   def test_class_and_index
     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)
\ No newline at end of file