safariwatir 0.3.8 → 0.4.0

data/History.txt

@@ -0,0 +1,21 @@
+=== 0.3.9 / ?????
+
+* Added support for H tags of various sizes (Trey Evans)
+* Better Watirpec compliance for buttons and labels (Trey Evans)
+* Make rb-appscript a runtime dependency (Ben Lavender)
+
+=== 0.3.8 / 2010-08-02
+
+* Added support for textareas (Tom Copeland)
+* Prevent things like 'element.parentNode' being replaced wrongly (Luke Hudson)
+
+=== 0.3.7 / 2009-10-21
+
+* Added support for selecting HtmlElements by the action attribute (Jacob Harris)
+* Added support for selecting image elements via the alt attribute (Tom Copeland)
+* Added support for selecting UL/LI elements (Frédéric de Villamil)
+
+=== 0.3.6 / 2009-08-17
+
+* Ruby 1.9 compatibility fixes
+

data/Manifest

@@ -0,0 +1,12 @@
+History.txt
+README.rdoc
+Rakefile
+lib/safariwatir.rb
+lib/safariwatir/core_ext.rb
+lib/safariwatir/element_attributes.rb
+lib/safariwatir/locators.rb
+lib/safariwatir/scripter.rb
+lib/watir/exceptions.rb
+safariwatir.gemspec
+safariwatir_example.rb
+Manifest

data/Rakefile

@@ -2,12 +2,13 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('safariwatir', '0.3.7') do | config |
+Echoe.new('safariwatir', '0.4.0') do | config |
   config.summary = %q{Automated testing tool for web applications.}
   config.description = %q{WATIR stands for "Web Application Testing in Ruby".  See WATIR project for more information.  This is a Safari-version of the original IE-only WATIR.}
   config.url = 'http://wiki.openqa.org/display/WTR/SafariWatir'
   config.author = 'Dave Hoover'
   config.email = 'dave@obtiva.com'
-  config.ignore_pattern = ['tmp/*', 'script/*']
+  config.ignore_pattern = ['tmp/*', 'script/*', 'spec/**/**', '*.html']
   config.development_dependencies = ["rb-appscript"]
+  config.runtime_dependencies = ["rb-appscript"]
 end

data/lib/safariwatir.rb

@@ -1,17 +1,28 @@
 require 'watir/exceptions'
 require 'safariwatir/scripter'
 require 'safariwatir/core_ext'
+require 'safariwatir/element_attributes'
+require 'safariwatir/locators'
+require 'forwardable'
 
 module Watir
   include Watir::Exception
 
+  class ElementCollection < Array
+
+    def [](idx)
+      super(idx - 1)
+    end
+
+  end
+
   module PageContainer
     def html
       @scripter.document_html
     end
     
     def text
-      @scripter.document_text
+      @scripter.document_text(self)
     end
 
     def title
@@ -84,21 +95,25 @@ module Watir
       end
     end
 
-    class Frame
-      include Container
-      include PageContainer
-      
-      attr_reader :name
-      
-      def initialize(scripter, name)
-        @name = name
-        @scripter = scripter.for_frame(self)
-      end
-    end
-
     class HtmlElement
-      def_init :scripter, :how, :what
-      attr_reader :how, :what
+      def_init :parent, :scripter, :how, :what
+      attr_reader :how, :what, :parent
+
+      include Locators
+
+      # required by watir specs
+      extend ElementAttributes
+      html_attr_reader :class_name, "class"
+      html_attr_reader :id
+      html_attr_reader :name
+      html_attr_reader :title
+      html_attr_reader :src
+      html_attr_reader :alt
+      html_method_reader :value
+
+      def type; nil; end
+
+      def is_frame?; false; end
 
       # overridden in derivitives
       def tag
@@ -111,6 +126,9 @@ module Watir
       end
 
       def exists?
+        unless [Fixnum, String, Regexp].any? { |allowed_class| what.kind_of?(allowed_class) }
+          raise TypeError.new("May not search using a 'what' value of class #{what.class.name}")
+        end
         @scripter.element_exists?(self)
       end
       alias :exist? :exists?
@@ -119,19 +137,16 @@ module Watir
         self.class.name.split("::").last
       end
 
+      def html_method name
+        @scripter.get_method_value(name, self)
+      end
+
       def attr name
         @scripter.get_attribute(name, self)
       end
 
       def operate(&block)
-        scripter_suffix = OPERATIONS[how]
-        if scripter_suffix.kind_of? Hash
-          scripter_suffix = scripter_suffix[element_name]
-        end
-        if scripter_suffix.nil?
-          raise Watir::Exception::MissingWayOfFindingObjectException, "SafariWatir does not currently support finding by #{how}"
-        end
-        @scripter.send("operate_#{scripter_suffix}", self, &block)        
+        @scripter.operate_by_locator(self, &block)
       end
 
       OPERATIONS = {
@@ -151,10 +166,44 @@ module Watir
         :title => "by_title",
         :xpath => "by_xpath",
       }
+
+    end
+
+    
+    class FrameElement < HtmlElement
+      def is_frame?; true; end
+      def tag; ["frame", "iframe"]; end
+    end
+
+    class Frame
+      include Container
+      include PageContainer
+      include Locators
+      extend Forwardable
+
+      def initialize(parent_tag, scripter_obj, find_how, find_what)
+        @parent = parent_tag
+        @scripter = scripter_obj
+        @how = find_how
+        @what = find_what
+        @frame_element = FrameElement.new(parent_tag, scripter_obj, find_how, find_what)
+      end
+
+      def tag; ["frame", "iframe"]; end
+
+      def document_locator; locator; end
+
+      def locator
+        self.send("locator_by_#{how}".to_sym).to_s + ".contentDocument"
+      end
+  
+      attr_reader :parent, :how, :what, :scripter, :frame_element
+
+      def_delegators :frame_element, :class_name, :id, :name, :title, :src, :alt, :exist?, :exists?
     end
 
     class Form < HtmlElement
-      def_init :scripter, :how, :what
+      def_init :parent, :scripter, :how, :what
 
       def submit
         @scripter.submit_form(self)
@@ -166,6 +215,8 @@ module Watir
     class InputElement < HtmlElement
       include Clickable
       
+      html_attr_reader :type
+
       def speak
         @scripter.speak_value_of(self)
       end
@@ -200,7 +251,23 @@ module Watir
         @scripter.speak_text_of(self)
       end      
     end
+
+    class Dd < ContentElement
+      def tag; "DD"; end
+    end
+
+    class Dl < ContentElement
+      def tag; "DL"; end
+    end
+
+    class Dt < ContentElement
+      def tag; "DT"; end
+    end
     
+    class Em < ContentElement
+      def tag; "EM"; end
+    end
+
     class Image < HtmlElement
       include Clickable
       
@@ -208,11 +275,17 @@ module Watir
     end
     
     class Button < InputElement
+      def tag; ["INPUT", "BUTTON"]; end
+      include ButtonLocators
     end
         
     class Checkbox < InputElement
-      def_init :scripter, :how, :what, :value
+      def_init :parent, :scripter, :how, :what, :value
       
+      include InputLocators
+
+      def input_type; "checkbox"; end
+
       def by_value
         @value
       end
@@ -229,6 +302,16 @@ module Watir
       end
     end
 
+    class Header < ContentElement
+      
+      def initialize(parent, scripter, how, what, h_size = 1)
+        super(parent, scripter, how, what)
+        @size = 1
+      end
+      
+      def tag; "H#{@size}"; end
+    end
+
     class Div < ContentElement
       def tag; "DIV"; end
     end
@@ -237,7 +320,13 @@ module Watir
       def tag; "P"; end
     end
 
+    class Pre < ContentElement
+      def tag; "PRE"; end
+    end
+
     class Label < ContentElement
+
+      html_attr_reader :for
       def tag; "LABEL"; end
     end
 
@@ -259,7 +348,7 @@ module Watir
       end
       alias :url :href
 
-      def id
+      def iotuibd
         attr('id') || ''
       end
 
@@ -283,6 +372,7 @@ module Watir
     end
 
     class Radio < Checkbox
+      def input_type; "radio"; end
     end
 
     class SelectList < InputElement
@@ -297,7 +387,7 @@ module Watir
       def option(how, what)
         Option.new(@scripter, self, how, what)
       end
-      
+
       def selected_values
         values = []
         index = 1
@@ -310,6 +400,8 @@ module Watir
         values.map {|o| o.text } #TODO?
       end
 
+      alias :selected_options :selected_values
+
       def selected_value
         selected_values.first
       end
@@ -323,26 +415,19 @@ module Watir
 
     class Option < InputElement
       def_init :scripter, :select_list, :how, :what
-      
+      def parent; @select_list; end
+
+      def selected?
+        selected_value = html_method(:selected) ? html_method(:selected) : ""
+        selected_value != ""
+      end
+
       def select
         @scripter.highlight(self) do
           select_option
         end
       end
       
-      def operate(&block)
-        @select_list.operate(&block)
-      end
-
-      def exists?
-        @scripter.option_exists?(self)
-      end
-      alias :exist? :exists?
-      
-      def selected?
-        @scripter.option_selected?(self)
-      end
-      
       def text
         @scripter.get_text_for(self)
       end
@@ -354,13 +439,17 @@ module Watir
       def tag; "SPAN"; end
     end
 
+    class Strong < ContentElement
+      def tag; "STRONG"; end
+    end
+
     class Map < InputElement
       def tag; "MAP"; end
     end
 
-    class Table
-      def_init :scripter, :how, :what
-      attr_reader :how, :what
+    class Table < ContentElement
+      def_init :parent, :scripter, :how, :what
+      attr_reader :parent, :how, :what
       
       def each
         # TODO
@@ -381,7 +470,7 @@ module Watir
       def tag; "TABLE"; end
     end
     
-    class TableRow
+    class TableRow < ContentElement
       def initialize(scripter, how, what, table = nil)
         @scripter = scripter
         @how = how
@@ -390,6 +479,8 @@ module Watir
       end
 
       attr_reader :table, :how, :what
+
+      alias :parent :table
             
       def each
         # TODO
@@ -426,6 +517,9 @@ module Watir
     end
 
     class TextField < InputElement
+      include InputLocators
+      def input_type; "text"; end
+
       def set(value)
         value = value.to_s
         @scripter.focus(self)
@@ -441,6 +535,8 @@ module Watir
       def getContents
         @scripter.get_value_for(self)
       end
+
+      alias :value :getContents
       
       def verify_contains(expected)
         actual = getContents
@@ -454,9 +550,23 @@ module Watir
     end
     
     class TextArea < TextField
+      def tag; ["input", "textarea"]; end
+    end
+
+    class FileField < TextField
+      def input_type; "file"; end
+
+      def set(value)
+        @scripter.set_file_field(self, value.to_s)
+      end
     end
 
     class Password < TextField
+      def input_type; "password"; end
+    end
+
+    class Ol < ContentElement
+      def tag; "OL"; end
     end
 
     class Ul < ContentElement
@@ -474,91 +584,315 @@ module Watir
     # Elements
 
     def area(how, what)
-      Area.new(scripter, how, what)
+      Area.new(self, scripter, how, what)
     end
     
+    def areas
+      child_tag_list do |idx|
+        Area.new(self, scripter, :index, idx)
+      end
+    end
+
     def button(how, what)
-      Button.new(scripter, how, what)
+      Button.new(self, scripter, how, what)
+    end
+
+    def buttons
+      child_tag_list do |idx|
+        Button.new(self, scripter, :index, idx)
+      end
     end
 
     def cell(how, what)
-      TableCell.new(scripter, how, what)
+      TableCell.new(self, scripter, how, what)
     end
 
     def checkbox(how, what, value = nil)
-      Checkbox.new(scripter, how, what, value)
+      Checkbox.new(self, scripter, how, what, value)
+    end
+
+    def checkboxes
+      child_tag_list do |idx|
+        Checkbox.new(self, scripter, :index, idx, nil)
+      end
+    end
+
+    def dd(how, what)
+      Dd.new(self, scripter, how, what)
+    end
+
+    def dds
+      child_tag_list do |idx|
+        Dd.new(self, scripter, :index, idx)
+      end
     end
 
     def div(how, what)
-      Div.new(scripter, how, what)
+      Div.new(self, scripter, how, what)
     end
     
+    def divs
+      child_tag_list do |idx|
+        Div.new(self, scripter, :index, idx)
+      end
+    end
+
+    def dl(how, what)
+      Dl.new(self, scripter, how, what)
+    end
+
+    def dls
+      child_tag_list do |idx|
+        Dl.new(self, scripter, :index, idx)
+      end
+    end
+
+    def dt(how, what)
+      Dt.new(self, scripter, how, what)
+    end
+
+    def dts
+      child_tag_list do |idx|
+        Dt.new(self, scripter, :index, idx)
+      end
+    end
+
+    def em(how, what)
+      Em.new(self, scripter, how, what)
+    end
+
+    def ems
+      child_tag_list do |idx|
+        Em.new(self, scripter, :index, idx)
+      end
+    end
+
     def p(how, what)
-      P.new(scripter, how, what)
+      P.new(self, scripter, how, what)
+    end
+
+    def ps
+      child_tag_list do |idx|
+        P.new(self, scripter, :index, idx)
+      end
+    end
+
+    def pre(how, what)
+      Pre.new(self, scripter, how, what)
+    end
+
+    def pres
+      child_tag_list do |idx|
+        Pre.new(self, scripter, :index, idx)
+      end
     end
 
     def form(how, what)
-      Form.new(scripter, how, what)
+      Form.new(self, scripter, how, what)
     end
 
-    def frame(name)
-      Frame.new(scripter, name)
+    def forms
+      child_tag_list do |idx|
+        Form.new(self, scripter, :index, idx)
+      end
+    end
+
+    def frame(how, what)
+      Frame.new(self, scripter, how, what)
     end
     
+    def h1(how, what)
+      Header.new(self, scripter, how, what, 1)
+    end
+
+    def h2(how, what)
+      Header.new(self, scripter, how, what, 2)
+    end
+
+    def h3(how, what)
+      Header.new(self, scripter, how, what, 3)
+    end
+
+    def h4(how, what)
+      Header.new(self, scripter, how, what, 4)
+    end
+
+    def h5(how, what)
+      Header.new(self, scripter, how, what, 5)
+    end
+
+    def h6(how, what)
+      Header.new(self, scripter, how, what, 6)
+    end
+
     def image(how, what)
-      Image.new(scripter, how, what)
+      Image.new(self, scripter, how, what)
+    end
+
+    def images
+      child_tag_list do |idx|
+        Image.new(self, scripter, :index, idx)
+      end
     end
 
     def label(how, what)
-      Label.new(scripter, how, what)
+      Label.new(self, scripter, how, what)
+    end
+
+    def labels
+      child_tag_list do |idx|
+        Label.new(self, scripter, :index, idx)
+      end
     end
 
     def li(how, what)
-      Li.new(scripter, how, what)
+      Li.new(self, scripter, how, what)
     end
     
+    def lis
+      child_tag_list do |idx|
+        Li.new(self, scripter, :index, idx)
+      end
+    end
+
     def link(how, what)
-      Link.new(scripter, how, what)
+      Link.new(self, scripter, how, what)
+    end
+
+    def links
+      child_tag_list do |idx|
+        Link.new(self, scripter, :index, idx)
+      end
     end
 
     def map(how, what)
-      Map.new(scripter, how, what)
+      Map.new(self, scripter, how, what)
+    end
+
+    def maps
+      child_tag_list do |idx|
+        Map.new(self, scripter, :index, idx)
+      end
     end
 
     def password(how, what)
-      Password.new(scripter, how, what)
+      Password.new(self, scripter, how, what)
+    end
+
+    def passwords
+      child_tag_list do |idx|
+        Password.new(self, scripter, :index, idx)
+      end
     end
 
     def radio(how, what, value = nil)
-      Radio.new(scripter, how, what, value)
+      Radio.new(self, scripter, how, what, value)
     end
 
     def row(how, what)
-      TableRow.new(scripter, how, what)
+      TableRow.new(self, scripter, how, what)
+    end
+
+    def rows
+      child_tag_list do |idx|
+        TableRow.new(self, scripter, :index, idx)
+      end
     end
 
     def select_list(how, what)
-      SelectList.new(scripter, how, what)
+      SelectList.new(self, scripter, how, what)
+    end
+
+    def select_lists
+      child_tag_list do |idx|
+        SelectList.new(self, scripter, :index, idx)
+      end
     end
     
     def span(how, what)
-      Span.new(scripter, how, what)
+      Span.new(self, scripter, how, what)
+    end
+
+    def spans
+      child_tag_list do |idx|
+        Span.new(self, scripter, :index, idx)
+      end
+    end
+
+    def strong(how, what)
+      Strong.new(self, scripter, how, what)
+    end
+
+    def strongs
+      child_tag_list do |idx|
+        Strong.new(self, scripter, :index, idx)
+      end
     end
 
     def table(how, what)
-      Table.new(scripter, how, what)
+      Table.new(self, scripter, how, what)
     end
     
+    def tables
+      child_tag_list do |idx|
+        Table.new(self, scripter, :index, idx)
+      end
+    end
+
     def text_field(how, what)
-      TextField.new(scripter, how, what)
+      TextField.new(self, scripter, how, what)
     end
     
+    def text_fields
+      child_tag_list do |idx|
+        TextField.new(self, scripter, :index, idx)
+      end
+    end
+
     def text_area(how, what)
-      TextArea.new(scripter, how, what)
+      TextArea.new(self, scripter, how, what)
+    end
+
+    def file_field(how, what)
+      FileField.new(self, scripter, how, what)
+    end
+
+    def file_fields
+      child_tag_list do |idx|
+        FileField.new(self, scripter, :index, idx)
+      end
+    end
+
+    def ol(how, what)
+      Ol.new(self, scripter, how, what)
+    end
+
+    def ols
+      child_tag_list do |idx|
+        Ol.new(self, scripter, :index, idx)
+      end
     end
 
     def ul(how, what)
-      Ul.new(scripter, how, what)
+      Ul.new(self, scripter, how, what)
+    end
+
+    def uls
+      child_tag_list do |idx|
+        Ul.new(self, scripter, :index, idx)
+      end
+    end
+
+    def child_tag_list(&child_tag_blk)
+        values = ElementCollection.new
+        index = 1
+        loop do
+          child_tag = child_tag_blk.call(index)
+          break unless child_tag.exists?
+          values << child_tag
+          index += 1
+        end
+        values
     end
     
     def contains_text(what)
@@ -568,7 +902,7 @@ module Watir
       when String
         text.index(what)
       else
-        raise MissingWayOfFindingObjectException
+        raise TypeError
       end
     end
   end
@@ -593,6 +927,9 @@ module Watir
     def url
       scripter.url
     end
+
+    def locator; "document"; end
+    def document_locator; "document"; end
     
     # Hide's Safari
     def hide