Changeset 19602 for lang/ruby

Timestamp:

09/19/08 17:11:25 (2 months ago)

Author:

yugui

Message:

made has_xxx matcher obsolete.

Files:

• lang/ruby/selenium_rc_spec/lib/spec/selenium_rc/example/user.rb (modified) (1 diff)

lang/ruby/selenium_rc_spec/lib/spec/selenium_rc/example/user.rb

@@ -13 +13 @@
         msg = msg.to_s
 
-        if m = /\Ahas_(\w+)\??\Z/.match(msg) and selenium.respond_to?("get_#{m[1]}")
+        if m = /\Ahas_(\w+)\??\Z/.match(msg) and 
+          selenium.respond_to?("get_#{m[1]}") and !selenium.respond_to?("have_#{m[1]}?")
           # has_xxx predicates
-          if args.empty?
-            return !!selenium.__send__("get_#{m[1]}")
-          else
-            value = selenium.__send__("get_#{m[1]}")
-            return value == args.first
-          end
+          return !!selenium.__send__("get_#{m[1]}", *args)
         elsif m = /\A(\w+)=\Z/.match(msg) and selenium.respond_to?("set_#{m[1]}")
           # setters