watir 1.5.6 → 1.6.2

data/unittests/textfields_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Text Fields
-# revision: $Revision: 1348 $
+# revision: $Revision: 1544 $
 
-$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_Fields_XPath < Test::Unit::TestCase
@@ -12,48 +12,48 @@ class TC_Fields_XPath < Test::Unit::TestCase
   end
   
   def test_text_field_exists
-    assert($ie.text_field(:xpath , "//input[@name='text1']/").exists?)   
-    assert(!$ie.text_field(:xpath , "//input[@name='missing']/").exists?)   
+    assert(browser.text_field(:xpath , "//input[@name='text1']/").exists?)   
+    assert_false(browser.text_field(:xpath , "//input[@name='missing']/").exists?)   
     
-    assert($ie.text_field(:xpath , "//input[@id='text2']/").exists?)   
-    assert(!$ie.text_field(:xpath , "//input[@id='alsomissing']/").exists?)   
+    assert(browser.text_field(:xpath , "//input[@id='text2']/").exists?)   
+    assert_false(browser.text_field(:xpath , "//input[@id='alsomissing']/").exists?)   
     
-    #assert($ie.text_field(:xpath , "//input[@beforeText='This Text After']/").exists? )
-    #assert($ie.text_field(:xpath , "//input[@afterText='This Text Before']/").exists? )
+    #assert(browser.text_field(:xpath , "//input[@beforeText='This Text After']/").exists? )
+    #assert(browser.text_field(:xpath , "//input[@afterText='This Text Before']/").exists? )
   end
   
   def test_text_field_dragContentsTo
-    $ie.text_field(:xpath , "//input[@name='text1']/").dragContentsTo(:xpath , "//input[@id='text2']/")
-    assert_equal($ie.text_field(:xpath , "//input[@name='text1']/").value, "" ) 
-    assert_equal($ie.text_field(:xpath , "//input[@id='text2']/").value, "goodbye allHello World" ) 
+    browser.text_field(:xpath , "//input[@name='text1']/").dragContentsTo(:xpath , "//input[@id='text2']/")
+    assert_equal(browser.text_field(:xpath , "//input[@name='text1']/").value, "" ) 
+    assert_equal(browser.text_field(:xpath , "//input[@id='text2']/").value, "goodbye allHello World" ) 
   end
   
   def test_text_field_VerifyContents
-    assert($ie.text_field(:xpath , "//input[@name='text1']/").verify_contains("Hello World") )  
-    assert($ie.text_field(:xpath , "//input[@name='text1']/").verify_contains(/Hello\sW/ ) )  
-    assert(!$ie.text_field(:xpath , "//input[@name='text1']/").verify_contains("Ruby") )  
-    assert(!$ie.text_field(:xpath , "//input[@name='text1']/").verify_contains(/R/) )  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@name='NoName']/").verify_contains("No field to get a value of") }  
+    assert(browser.text_field(:xpath , "//input[@name='text1']/").verify_contains("Hello World") )  
+    assert(browser.text_field(:xpath , "//input[@name='text1']/").verify_contains(/Hello\sW/ ) )  
+    assert_false(browser.text_field(:xpath , "//input[@name='text1']/").verify_contains("Ruby") )  
+    assert_false(browser.text_field(:xpath , "//input[@name='text1']/").verify_contains(/R/) )  
+    assert_raises(UnknownObjectException) {   browser.text_field(:xpath , "//input[@name='NoName']/").verify_contains("No field to get a value of") }  
     
-    assert($ie.text_field(:xpath , "//input[@id='text2']/").verify_contains("goodbye all") )  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@id='noID']/").verify_contains("No field to get a value of") }  
+    assert(browser.text_field(:xpath , "//input[@id='text2']/").verify_contains("goodbye all") )  
+    assert_raises(UnknownObjectException) {   browser.text_field(:xpath , "//input[@id='noID']/").verify_contains("No field to get a value of") }  
   end
   
   def test_text_field_enabled
-    assert(!$ie.text_field(:xpath , "//input[@name='disabled']/").enabled? )  
-    assert($ie.text_field(:xpath , "//input[@name='text1']/").enabled? )  
-    assert($ie.text_field(:xpath , "//input[@id='text2']/").enabled? )  
+    assert_false(browser.text_field(:xpath , "//input[@name='disabled']/").enabled? )  
+    assert(browser.text_field(:xpath , "//input[@name='text1']/").enabled? )  
+    assert(browser.text_field(:xpath , "//input[@id='text2']/").enabled? )  
   end
   
   def test_text_field_readOnly
-    assert(!$ie.text_field(:xpath , "//input[@name='disabled']/").readonly? )  
-    assert($ie.text_field(:xpath , "//input[@name='readOnly']/").readonly? )  
-    assert($ie.text_field(:xpath , "//input[@id='readOnly2']/").readonly? )  
+    assert_false(browser.text_field(:xpath , "//input[@name='disabled']/").readonly? )  
+    assert(browser.text_field(:xpath , "//input[@name='readOnly']/").readonly? )  
+    assert(browser.text_field(:xpath , "//input[@id='readOnly2']/").readonly? )  
   end
   
   def test_text_field_value
-    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@name='missing_field']/").append("Some Text") }  
-    assert_equal(  "Hello World" , $ie.text_field(:xpath , "//input[@name='text1']/").value )  
+    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//input[@name='missing_field']/").append("Some Text") }  
+    assert_equal(  "Hello World" , browser.text_field(:xpath , "//input[@name='text1']/").value )  
   end
   
   def build_to_s_regex(lhs, rhs)
@@ -61,51 +61,51 @@ class TC_Fields_XPath < Test::Unit::TestCase
   end
   
   def test_text_field_Append
-    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@id='readOnly2']/").append("Some Text") }  
-    assert_raises(ObjectDisabledException   , "ObjectDisabledException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@name='disabled']/").append("Some Text") }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@name='missing_field']/").append("Some Text") }  
+    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//input[@id='readOnly2']/").append("Some Text") }  
+    assert_raises(ObjectDisabledException   , "ObjectDisabledException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//input[@name='disabled']/").append("Some Text") }  
+    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   browser.text_field(:xpath , "//input[@name='missing_field']/").append("Some Text") }  
     
-    $ie.text_field(:xpath , "//input[@name='text1']/").append(" Some Text")
-    assert_equal(  "Hello World Some Text" , $ie.text_field(:xpath , "//input[@name='text1']/").value )  
+    browser.text_field(:xpath , "//input[@name='text1']/").append(" Some Text")
+    assert_equal(  "Hello World Some Text" , browser.text_field(:xpath , "//input[@name='text1']/").value )  
   end
   
   
   def test_text_field_Clear
-    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@id='readOnly2']/").append("Some Text") }  
-    assert_raises(ObjectDisabledException   , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@name='disabled']/").append("Some Text") }  
-    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@name='missing_field']/").append("Some Text") }  
+    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//input[@id='readOnly2']/").append("Some Text") }  
+    assert_raises(ObjectDisabledException   , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//input[@name='disabled']/").append("Some Text") }  
+    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//input[@name='missing_field']/").append("Some Text") }  
     
-    $ie.text_field(:xpath , "//input[@name='text1']/").clear
-    assert_equal(  "" , $ie.text_field(:xpath , "//input[@name='text1']/").value )  
+    browser.text_field(:xpath , "//input[@name='text1']/").clear
+    assert_equal(  "" , browser.text_field(:xpath , "//input[@name='text1']/").value )  
   end
   
   def test_text_field_Set
-    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@id='readOnly2']/").append("Some Text") }  
-    assert_raises(ObjectDisabledException   , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@name='disabled']/").append("Some Text") }  
-    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   $ie.text_field(:xpath , "//input[@name='missing_field']/").append("Some Text") }  
+    assert_raises(ObjectReadOnlyException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//input[@id='readOnly2']/").append("Some Text") }  
+    assert_raises(ObjectDisabledException   , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//input[@name='disabled']/").append("Some Text") }  
+    assert_raises(UnknownObjectException  , "ObjectReadOnlyException   was supposed to be thrown" ) {   browser.text_field(:xpath , "//input[@name='missing_field']/").append("Some Text") }  
     
-    $ie.text_field(:xpath , "//input[@name='text1']/").set("watir IE Controller")
-    assert_equal(  "watir IE Controller" , $ie.text_field(:xpath , "//input[@name='text1']/").value )  
+    browser.text_field(:xpath , "//input[@name='text1']/").set("watir IE Controller")
+    assert_equal(  "watir IE Controller" , browser.text_field(:xpath , "//input[@name='text1']/").value )  
   end
   
   def test_JS_Events
-    $ie.text_field(:xpath , "//input[@name='events_tester']/").set('p')
+    browser.text_field(:xpath , "//input[@name='events_tester']/").set('p')
     
     # the following line has an extra keypress at the begining, as we mimic the delete key being pressed
-    assert_equal( "keypresskeydownkeypresskeyup" , $ie.text_field(:xpath , "//textarea[@name='events_text']/").value.gsub("\r\n" , "")  )
-    $ie.button(:value , "Clear Events Box").click
-    $ie.text_field(:xpath , "//input[@name='events_tester']/").set('ab')
+    assert_equal( "keypresskeydownkeypresskeyup" , browser.text_field(:xpath , "//textarea[@name='events_text']/").value.gsub("\r\n" , "")  )
+    browser.button(:value , "Clear Events Box").click
+    browser.text_field(:xpath , "//input[@name='events_tester']/").set('ab')
     
     # the following line has an extra keypress at the begining, as we mimic the delete key being pressed
-    assert_equal( "keypresskeydownkeypresskeyupkeydownkeypresskeyup" , $ie.text_field(:xpath , "//textarea[@name='events_text']/").value.gsub("\r\n" , "") )
+    assert_equal( "keypresskeydownkeypresskeyupkeydownkeypresskeyup" , browser.text_field(:xpath , "//textarea[@name='events_text']/").value.gsub("\r\n" , "") )
   end
   
   def test_password
-    $ie.text_field(:xpath , "//input[@name='password1']/").set("secret")
-    assert( 'secret' , $ie.text_field(:xpath , "//input[@name='password1']/").value )
+    browser.text_field(:xpath , "//input[@name='password1']/").set("secret")
+    assert( 'secret' , browser.text_field(:xpath , "//input[@name='password1']/").value )
     
-    $ie.text_field(:xpath , "//input[@id='password1']/").set("top_secret")
-    assert( 'top_secret' , $ie.text_field(:xpath , "//input[@id='password1']/").value )
+    browser.text_field(:xpath , "//input[@id='password1']/").set("top_secret")
+    assert( 'top_secret' , browser.text_field(:xpath , "//input[@id='password1']/").value )
   end
   
 end

data/unittests/windows/attach_to_existing_window_test.rb

@@ -1,7 +1,7 @@
 # feature tests for attaching to existing IE windows
-# revision: $Revision: 1348 $
+# revision: $Revision: 1417 $
 
-$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_ExistingWindow< Test::Unit::TestCase

data/unittests/windows/attach_to_new_window_test.rb

@@ -1,7 +1,7 @@
 # feature tests for attaching to new IE windows
-# revision: $Revision: 1348 $
+# revision: $Revision: 1544 $
 
-$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'
 require 'watir/testcase'
 
@@ -17,14 +17,14 @@ class TC_NewWindow< Watir::TestCase
   
   def test_simply_attach_to_new_window
     IE.attach_timeout = 0.2
-    $ie.link(:text, 'New Window').click
+    browser.link(:text, 'New Window').click
     ie_new = IE.attach(:title, 'Pass Page')
     assert(ie_new.text.include?('PASS'))
     ie_new.close
   end
   
   def test_attach_to_new_window_using_separate_process
-    $ie.eval_in_spawned_process "link(:text, 'New Window').click"
+    browser.eval_in_spawned_process "link(:text, 'New Window').click"
     IE.attach_timeout = 6.0
     ie_new = IE.attach(:title, 'Pass Page')
     assert(ie_new.text.include?('PASS'))
@@ -35,7 +35,7 @@ class TC_NewWindow< Watir::TestCase
     # this test is sometimes failing with a "Canvas does not allow drawing" error
     # this is with IE7. I think the problem could be with the highlighting of the
     # button from the separate process.
-    $ie.link(:text, 'New Window').click_no_wait
+    browser.link(:text, 'New Window').click_no_wait
     IE.attach_timeout = 6.0
     ie_new = IE.attach(:title, 'Pass Page')
     assert(ie_new.text.include?('PASS'))
@@ -43,7 +43,7 @@ class TC_NewWindow< Watir::TestCase
   end
   
   def test_click_no_wait_works_in_a_container
-    $ie.p(:index, 1).link(:text, 'New Window').click_no_wait
+    browser.p(:index, 1).link(:text, 'New Window').click_no_wait
     IE.attach_timeout = 6.0
     ie_new = IE.attach(:title, 'Pass Page')
     assert(ie_new.text.include?('PASS'))
@@ -51,7 +51,7 @@ class TC_NewWindow< Watir::TestCase
   end
   
   def test_attach_to_slow_window_works_with_delay
-    $ie.span(:text, 'New Window Slowly').click
+    browser.span(:text, 'New Window Slowly').click
     IE.attach_timeout = 4.0
     sleep 1.0
     ie_new = IE.attach(:title, 'Test page for buttons')
@@ -60,7 +60,7 @@ class TC_NewWindow< Watir::TestCase
   end    
   
   def test_attach_to_slow_window_works_without_waiting
-    $ie.span(:text, 'New Window Slowly').click
+    browser.span(:text, 'New Window Slowly').click
     IE.attach_timeout = 3.0
     ie_new = IE.attach(:title, 'Test page for buttons')
     assert(ie_new.text.include?('Blank page to fill in the frames'))
@@ -69,8 +69,8 @@ class TC_NewWindow< Watir::TestCase
   
   def test_attach_timesout_when_window_takes_too_long
     IE.attach_timeout = 0.2
-    $ie.text_field(:name, 'delay').set('2')
-    $ie.span(:text, 'New Window Slowly').click
+    browser.text_field(:name, 'delay').set('2')
+    browser.span(:text, 'New Window Slowly').click
     assert_raise(Watir::Exception::NoMatchingWindowFoundException) do
       IE.attach(:title, 'Test page for buttons')
     end

data/unittests/windows/close_window_test.rb

@@ -1,7 +1,7 @@
 # feature tests for closed windows
 # revision: $Revision: 958 $
 
-$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_CloseWindow < Watir::TestCase
@@ -13,7 +13,7 @@ class TC_CloseWindow < Watir::TestCase
   
   # reproduces defect http://jira.openqa.org/browse/WTR-16
   def test_close_window_with_button
-    $ie.link(:text, 'New Window').click
+    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}

data/unittests/windows/frame_links_test.rb

@@ -1,7 +1,7 @@
 # tests of click_no_wait for links in frames
 # revision: $Revision: 1078 $
 
-$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_Frame_Links < Test::Unit::TestCase
@@ -12,14 +12,14 @@ class TC_Frame_Links < Test::Unit::TestCase
   end
   
   def test_click_in_a_frame
-    $ie.frame('linkFrame').link(:text, 'test1').click
-    assert($ie.frame('linkFrame').text.include?('Links2-Pass'))
+    browser.frame('linkFrame').link(:text, 'test1').click
+    assert(browser.frame('linkFrame').text.include?('Links2-Pass'))
   end
   
   def test_click_no_wait_in_a_frame
-    $ie.frame('linkFrame').link(:text, 'test1').click_no_wait
-    wait_until(2){$ie.frame('linkFrame').text.include?('Links2-Pass')}
-    assert($ie.frame('linkFrame').text.include?('Links2-Pass'))
+    browser.frame('linkFrame').link(:text, 'test1').click_no_wait
+    wait_until(2){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,6 +1,6 @@
 # Not intended to be run as part of a larger suite.
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
 require 'test/unit'
 require 'watir'
 require 'watir/process'

data/unittests/windows/iedialog_test.rb

@@ -1,16 +1,15 @@
 # unit tests for iedialog.dll and customized win32ole.so
-# revision: $Revision: 1348 $
+# revision: $Revision: 1541 $
 
-$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'
 require 'Win32API'
 
-if VERSION == '1.8.2'
 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__)) + "/../../watir/IEDialog/Release/IEDialog.dll").gsub('/', '\\')
+  @@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...
@@ -52,4 +51,4 @@ class TC_IEDialog < Test::Unit::TestCase
     assert_match(/^PASS/, body.innerHTML.strip)    
   end
 end
-end
+

data/unittests/windows/js_events_test.rb

@@ -1,7 +1,7 @@
 # feature tests for JavaScript events
-# revision: $Revision: 1348 $
+# revision: $Revision: 1544 $
 
-$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_JSEvents < Test::Unit::TestCase
@@ -10,27 +10,27 @@ class TC_JSEvents < Test::Unit::TestCase
   end
   
   def test_Button_disabled
-    assert(! $ie.button(:caption, "Button 1").enabled?) 
+    assert_false( browser.button(:caption, "Button 1").enabled?) 
   end
   
   def test_Button_Enabled
-    $ie.text_field(:name, "entertext").fire_event("onkeyup")
-    assert($ie.button(:caption, "Button 1").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
-    $ie.text_field(:name, "entertext").fire_event("onKeyUp")
+    browser.text_field(:name, "entertext").fire_event("onKeyUp")
     # Clicking the button
-    $ie.button(:caption, "Button 1").click
-    assert($ie.text.include?("PASS") )
+    browser.button(:caption, "Button 1").click
+    assert(browser.text.include?("PASS") )
   end
   
   #onMouseOver tests
   #window status
   
   def test_no_status_bar_exception
-    $ie.link(:text, "New Window No Status Bar").click
+    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") }
@@ -40,16 +40,16 @@ class TC_JSEvents < Test::Unit::TestCase
   end
   
   def test_page_nostatus
-    assert_equal("Done", $ie.status) 
+    assert_equal("Done", browser.status) 
   end
   
   def test_set_page_status
-    $ie.link(:text, "Check the Status").fire_event("onMouseOver")
-    assert_equal("It worked", $ie.status) 
+    browser.link(:text, "Check the Status").fire_event("onMouseOver")
+    assert_equal("It worked", browser.status) 
   end
   
   def test_clear_page_status
-    $ie.link(:text, "Clear the Status").fire_event("onMouseOver")
-    assert_equal("Done", $ie.status) 
+    browser.link(:text, "Clear the Status").fire_event("onMouseOver")
+    assert_equal("Done", browser.status) 
   end
 end

data/unittests/windows/jscriptExtraAlert.rb

@@ -1,4 +1,5 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib') 
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'watir-common', 'lib') 
 
 require 'watir/WindowHelper'
 

data/unittests/windows/jscriptExtraConfirmCancel.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
 
 require 'watir/WindowHelper'
 

data/unittests/windows/jscriptExtraConfirmOk.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
 
 require 'watir/WindowHelper'
 

data/unittests/windows/jscriptPushButton.rb

@@ -1,4 +1,5 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib') 
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'watir-common', 'lib') 
 require 'watir'
 
 ie = Watir::IE.attach(:title, 'Alert Test')

data/unittests/windows/jscript_test.rb

@@ -1,7 +1,7 @@
 # feature tests for AutoIt wrapper
-# revision: $Revision: 1189 $
+# revision: $Revision: 1544 $
 
-$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'
 require 'watir/WindowHelper'
 require 'watir/process'
@@ -29,17 +29,17 @@ class TC_JavaScript_Test < Test::Unit::TestCase
   end
   
   def check_dialog(extra_file, expected_result, &block)
-    $ie.goto(@@javascript_page)
+    browser.goto(@@javascript_page)
     Thread.new { system("rubyw \"#{$mydir}\\#{extra_file}.rb\"") }
     
     block.call
-    testResult = $ie.text_field(:id, "testResult").value
+    testResult = browser.text_field(:id, "testResult").value
     assert_match( expected_result, testResult )  
   end
   
   def test_alert_button
     check_dialog('jscriptExtraAlert', /Alert button!/) do
-      $ie.button(:id, 'btnAlert').click
+      browser.button(:id, 'btnAlert').click
     end
     
   end
@@ -52,12 +52,12 @@ class TC_JavaScript_Test < Test::Unit::TestCase
   end
   def test_confirm_button_ok
     check_dialog('jscriptExtraConfirmOk', /Confirm and OK button!/) do 
-      $ie.button(:id, 'btnConfirm').click
+      browser.button(:id, 'btnConfirm').click
     end
   end
   def test_confirm_button_Cancel
     check_dialog('jscriptExtraConfirmCancel', /Confirm and Cancel button!/) do
-      $ie.button(:id, 'btnConfirm').click
+      browser.button(:id, 'btnConfirm').click
     end
   end