Added wait_for_visible to extensions

lib/selenium/client/extensions.rb

@@ -4,7 +4,7 @@ module Client
     # Convenience methods not explicitely part of the protocol
     module Extensions
 
-	    # These for all Ajax request to finish (Only works if you are using prototype, the wait in happenning browser side)
+	    # These for all Ajax request to finish (Only works if you are using prototype, the wait happens in the browser)
 	    #
 	    # See http://davidvollbracht.com/2008/6/4/30-days-of-tech-day-3-waitforajax for
 	    # more background.
@@ -14,7 +14,7 @@ def wait_for_ajax(options={})
 	                         options[:timeout_in_seconds]
       end
 
-	    # Wait for all Prototype effects to be processed (the wait in happenning browser side).
+	    # Wait for all Prototype effects to be processed (the wait happens in the browser).
 	    #
 	    # Credits to http://github.com/brynary/webrat/tree/master
 			def wait_for_effects(options={})
@@ -23,14 +23,14 @@ def wait_for_effects(options={})
 			                     options[:timeout_in_seconds]
 			end
 
-			# Wait for an element to be present (the wait in happenning browser side).
+			# Wait for an element to be present (the wait happens in the browser).
 		  def wait_for_element(locator, options={})
 		    builder = JavascriptExpressionBuilder.new 
 		    builder.find_element(locator).append("element != null;")
 		    wait_for_condition builder.script, options[:timeout_in_seconds]
 		  end
 
-			# Wait for an element to NOT be present (the wait in happenning browser side).
+			# Wait for an element to NOT be present (the wait happens in the browser).
 		  def wait_for_no_element(locator, options={})
 		    builder = JavascriptExpressionBuilder.new 
 		    builder.find_element(locator).append("element == null;")
@@ -73,7 +73,7 @@ def wait_for_text(pattern, options={})
         wait_for_condition builder.script, options[:timeout_in_seconds]
       end
 
-      # Wait for some text to NOT be present (the wait in happenning browser side).
+      # Wait for some text to NOT be present (the wait happens in the browser).
       #
       # See wait_for_text for usage details.
       def wait_for_no_text(pattern, options={})
@@ -82,7 +82,7 @@ def wait_for_no_text(pattern, options={})
         wait_for_condition builder.script, options[:timeout_in_seconds]
       end
 
-			# Wait for a field to get a specific value (the wait in happenning browser side).
+			# Wait for a field to get a specific value (the wait happens in the browser).
       def wait_for_field_value(locator, expected_value, options={})
         builder = JavascriptExpressionBuilder.new 
         builder.find_element(locator).element_value_is(expected_value)
@@ -95,6 +95,12 @@ def wait_for_no_field_value(locator, expected_value, options={})
         wait_for_condition builder.script, options[:timeout_in_seconds]
       end
 
+      # Wait for something to be visible (the wait happens in the browser).
+      def wait_for_visible(locator, options={})
+        builder = JavascriptExpressionBuilder.new 
+        wait_for_condition builder.visible(locator).script, options[:timeout_in_seconds]
+      end
+
       def active_javascript_framework(options)
         options[:javascript_framework] || default_javascript_framework
       end

lib/selenium/client/javascript_expression_builder.rb

@@ -22,6 +22,10 @@ def no_pending_effects
 			  append window_script("Effect.Queue.size() == 0")
 			end
 
+      def visible(locator)
+        append "selenium.isVisible('#{quote_escaped(locator)}')"
+      end
+
       def find_element(locator)
         append  <<-EOS
           var element;

test/unit/selenium/client/extensions_tests.rb

@@ -154,4 +154,15 @@
     client.wait_for_no_field_value "a_locator", "a value", :timeout_in_seconds => :the_timeout
   end
 
+  test "wait_for_visible uses provided locator" do
+    client = Class.new { include Selenium::Client::Extensions }.new
+    client.expects(:wait_for_visible).with(regexp_matches(/selenium.isVisible('a_locator')/), anything)
+    client.wait_for_visible "a_locator"
+  end
+
+  test "wait_for_visible uses explicit timeout when provided" do
+    client = Class.new { include Selenium::Client::Extensions }.new
+    client.expects(:wait_for_visible).with(anything, :the_timeout)
+    client.wait_for_visible "a_locator", :timeout_in_seconds => :the_timeout
+  end
 end