safariwatir 0.2.2 → 0.2.3

data/safariwatir.rb

@@ -133,9 +133,19 @@ module Watir
       end      
     end
     
-    class Button < InputElement
+    class Image < HtmlElement
+      def tag; "IMG"; end
+      
+      protected
+      
+      def operate_by_src(&block)
+        @scripter.operate_by(self, 'src', &block)
+      end
     end
     
+    class Button < InputElement
+    end
+        
     class Checkbox < InputElement
       def_init :scripter, :how, :what, :value
       def by_value
@@ -154,7 +164,7 @@ module Watir
       protected
       
       def operate_by_text(&block)
-        @scripter.operate_on_label(self, &block)
+        @scripter.operate_by(self, 'innerText', &block)
       end
     end
 
@@ -339,7 +349,7 @@ module Watir
     end
     
     def image(how, what)
-      Button.new(scripter, how, what)
+      Image.new(scripter, how, what)
     end
 
     def label(how, what)

data/safariwatir/scripter.rb

@@ -301,8 +301,8 @@ for (var i = 0; i < document.links.length; i++) {
     end
     private :find_link
 
-    def handle_match(element)
-      how = {:text => "text", :url => "href"}[element.how]
+    def handle_match(element, how = nil)
+      how = {:text => "text", :url => "href"}[element.how] unless how
       case element.what
         when Regexp:
           %|#{how}.match(/#{element.what.source}/#{element.what.casefold? ? "i":nil})|          
@@ -357,11 +357,11 @@ for (var i = 0; i < elements.length; i++) {
       js.operate(%|var element = document.getElementsByTagName('#{element.tag}')[#{element.what-1}];|, yield)
     end
 
-    def operate_on_label(element)
-      js.operate(%|var elements = document.getElementsByTagName('LABEL');
+    def operate_by(element, attribute)
+      js.operate(%|var elements = document.getElementsByTagName('#{element.tag}');
 var element = undefined;
 for (var i = 0; i < elements.length; i++) {
-  if (elements[i].innerText == '#{element.what}') {
+  if (elements[i].#{handle_match(element, attribute)}) {
     element = elements[i];
     break;
   }

data/safariwatir_script.rb

@@ -42,10 +42,10 @@ end
 def safari.amazon
   goto("http://amazon.com")
   select_list(:name, "url").select("VHS")
-  select_list(:name, "url").select_value("search-alias=software")
-  text_field(:name, "field-keywords").set("Orion")
-  image(:name, "Go").click
-  puts "FAILURE amazon" unless contains_text("Master of Orion")
+  select_list(:name, "url").select_value("search-alias=stripbooks")
+  text_field(:name, "field-keywords").set("potter")
+  button(:name, "Go").click
+  puts "FAILURE amazon" unless contains_text("Deathly Hallows")
 end
 
 def safari.google_advanced
@@ -127,6 +127,12 @@ def safari.onchange
   select_list(:name, "model").select_value("Z4 ROADSTER")
 end
 
+def safari.ruby_sponsor_images
+  goto("http://mtnwestruby.org/")
+  puts "FAILURE image obtiva" unless image(:src, "http://mtnwestruby.org/images/sponsors/obtiva_logo.png").exists?
+  puts "FAILURE image thoughtworks" unless image(:src, /thoughtworks/).exists?
+end
+
 begin
   safari.google_to_prag
   safari.ala
@@ -138,6 +144,7 @@ begin
   safari.weinberg
   safari.tables
   safari.onchange
+  safari.ruby_sponsor_images
 ensure
   safari.close
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: safariwatir
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2007-01-20 00:00:00 -06:00
+  version: 0.2.3
+date: 2007-03-26 00:00:00 -05:00
 summary: Automated testing tool for web applications.
 require_paths: 
 - .
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Dave Hoover
 files: