unittests/no_wait_test.rb in watir-1.8.1 vs unittests/no_wait_test.rb in watir-1.9.0.rc1

@@ -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
\ No newline at end of file