safariwatir 0.3.7 → 0.3.8

data/README.rdoc

@@ -4,8 +4,8 @@ http://twitter.com/swombat/status/1280692921
 = SafariWatir
 
 * http://github.com/redsquirrel/safariwatir
-* http://safariwatir.rubyforge.org
-* http://rubyforge.org/mailman/listinfo/safariwatir-general
+* http://groups.google.com/group/watir-general
+* http://wiki.openqa.org/display/WTR/SafariWatir
 * http://twitter.com/SafariWatir
 
 == DESCRIPTION:
@@ -18,7 +18,6 @@ This project aims at adding Watir support for Safari on the Mac.
 
 Mac OS X running Safari. Some features require you to turn on "Enable access for assistive devices" in System Preferences > Universal Access.
 
-
 == SYNOPSIS:
 
   require 'rubygems'
@@ -38,13 +37,19 @@ Mac OS X running Safari. Some features require you to turn on "Enable access for
 
   git clone git://github.com/redsquirrel/safariwatir.git
   cd safariwatir
+  git submodule update --init
   rake install
 
-== RUNNING SAFARIWATIR AGAINST WATIR'S CORE TESTS
+== RUNNING SAFARIWATIR AGAINST WATIRSPEC
+
+  git clone git://github.com/redsquirrel/safariwatir.git
+  cd safariwatir
+  git submodule update --init
+  spec spec
+
+== CONTRIBUTING:
 
-  # First, install the SafariWatir gem (see above)
-  svn checkout https://svn.openqa.org/svn/watir/trunk
-  cd trunk/watir
-  cp unittests/options.yml.example unittests/options.yml
-  # Edit unittests/options.yml and set browser: safari
-  ruby unittests/core_tests.rb
+WatirSpec is the emergent standard for the Watir API.
+We do not currently support all of the functionality described by WatirSpec.
+A good way to contribute would be to fix a few failing specs as defined by WatirSpec.
+See "Running SafairWatir Against WatirSpec" to get started. 

data/Rakefile

@@ -2,10 +2,10 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('safariwatir', '0.3.5') do | config |
+Echoe.new('safariwatir', '0.3.7') 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://safariwatir.rubyforge.org/'
+  config.url = 'http://wiki.openqa.org/display/WTR/SafariWatir'
   config.author = 'Dave Hoover'
   config.email = 'dave@obtiva.com'
   config.ignore_pattern = ['tmp/*', 'script/*']

data/lib/safariwatir.rb

@@ -102,12 +102,12 @@ module Watir
 
       # overridden in derivitives
       def tag
-        raise RuntimeError, "tag not provided for #{name}"
+        raise RuntimeError, "tag not provided for #{element_name}"
       end
 
       # overridden in derivitives
       def speak
-        @scripter.speak("#{name}'s don't know how to speak.")
+        @scripter.speak("#{element_name}'s don't know how to speak.")
       end
 
       def exists?
@@ -115,7 +115,7 @@ module Watir
       end
       alias :exist? :exists?
       
-      def name
+      def element_name
         self.class.name.split("::").last
       end
 
@@ -126,10 +126,10 @@ module Watir
       def operate(&block)
         scripter_suffix = OPERATIONS[how]
         if scripter_suffix.kind_of? Hash
-          scripter_suffix = scripter_suffix[name]
+          scripter_suffix = scripter_suffix[element_name]
         end
         if scripter_suffix.nil?
-          raise "SafariWatir does not currently support finding by #{how}"
+          raise Watir::Exception::MissingWayOfFindingObjectException, "SafariWatir does not currently support finding by #{how}"
         end
         @scripter.send("operate_#{scripter_suffix}", self, &block)        
       end
@@ -148,6 +148,7 @@ module Watir
         :value => "by_input_value",
         :caption => "by_input_value",
         :src => "by_src",
+        :title => "by_title",
         :xpath => "by_xpath",
       }
     end
@@ -172,6 +173,10 @@ module Watir
       def enabled?
         !@scripter.element_disabled?(self)
       end
+      
+      def disabled?
+        @scripter.element_disabled?(self)
+      end
 
       def tag; "INPUT"; end
 
@@ -249,6 +254,31 @@ module Watir
         end
       end
 
+      def href
+        attr('href') || ''
+      end
+      alias :url :href
+
+      def id
+        attr('id') || ''
+      end
+
+      def title
+        attr('title') || ''
+      end
+
+      def class_name
+        attr('class') || ''
+      end
+
+      def style
+        attr('style') || ''
+      end
+
+      def name
+        attr('name') || ''
+      end
+
       def tag; "A"; end
     end
 
@@ -324,6 +354,10 @@ module Watir
       def tag; "SPAN"; end
     end
 
+    class Map < InputElement
+      def tag; "MAP"; end
+    end
+
     class Table
       def_init :scripter, :how, :what
       attr_reader :how, :what
@@ -418,6 +452,9 @@ module Watir
         end
       end
     end
+    
+    class TextArea < TextField
+    end
 
     class Password < TextField
     end
@@ -430,7 +467,15 @@ module Watir
       def tag; "LI"; end
     end
 
+    class Area < InputElement
+      def tag; "AREA"; end
+    end
+
     # Elements
+
+    def area(how, what)
+      Area.new(scripter, how, what)
+    end
     
     def button(how, what)
       Button.new(scripter, how, what)
@@ -476,6 +521,10 @@ module Watir
       Link.new(scripter, how, what)
     end
 
+    def map(how, what)
+      Map.new(scripter, how, what)
+    end
+
     def password(how, what)
       Password.new(scripter, how, what)
     end
@@ -503,6 +552,10 @@ module Watir
     def text_field(how, what)
       TextField.new(scripter, how, what)
     end
+    
+    def text_area(how, what)
+      TextArea.new(scripter, how, what)
+    end
 
     def ul(how, what)
       Ul.new(scripter, how, what)

data/lib/safariwatir/scripter.rb

@@ -71,8 +71,8 @@ if (element) {
 
     def wrap(script)
       # add in frame name when referencing parent or document
-      script.gsub! "parent", "parent.#{@page_container}"
-      script.gsub! "document", "#{@page_container}.document"
+      script.gsub! /\bparent\b/, "parent.#{@page_container}"
+      script.gsub! /\bdocument\b/, "#{@page_container}.document"
       super(script)
     end
   end
@@ -364,14 +364,14 @@ for (var i = 0; i < document.links.length; i++) {
     private :find_link
 
     def handle_match(element, how = nil)
-      how = {:text => "text", :url => "href"}[element.how] unless how
+      how = {:text => "text", :url => "href", :id => "id"}[element.how] unless how
       case element.what
         when Regexp
           %|#{how}.match(/#{element.what.source}/#{element.what.casefold? ? "i":nil})|          
         when String
           %|#{how} == '#{element.what}'|
         else
-          raise RuntimeError, "Unable to locate #{element.name} with #{element.how}"
+          raise RuntimeError, "Unable to locate #{element.element_name} with #{element.how}"
       end
     end
     private :handle_match
@@ -417,7 +417,7 @@ var element = elements[0];|, yield)
     # Checkboxes/Radios have the same name, different values    
     def handle_form_element_name_match(element)
       element_capture = %|element = elements[i];break;|
-      if element.by_value
+      if element.respond_to?(:by_value) and element.by_value
 %|if (elements[i].value == '#{element.by_value}') {
   #{element_capture}
 }|        
@@ -443,6 +443,10 @@ var element = elements[0];|, yield)
       operate_by(element, 'alt', &block)
     end
 
+    def operate_by_title(element, &block)
+      operate_by(element, 'title', &block)
+    end
+
     def operate_by_action(element, &block)
       operate_by(element, 'action', &block)
     end
@@ -452,8 +456,9 @@ var element = elements[0];|, yield)
     end
 
     def operate_by_xpath(element)
+      xpath = element.what.gsub(/"/, "\'")
       js.operate(%|
-var result = document.evaluate('#{element.what}', document.documentElement, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+var result = document.evaluate("#{xpath}", document.documentElement, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
 var element = result ? result.singleNodeValue : null;
 |, yield)
     end
@@ -502,13 +507,13 @@ end tell|, true)
       AppleScripter.new(TableJavaScripter.new(element))
     end
 
-    def for_frame(element)
+    def for_frame(frame)
       # verify the frame exists
       execute(
-%|if (parent.#{element.name} == undefined) {
+%|if (parent.#{frame.name} == undefined) {
   return '#{FRAME_NOT_FOUND}';
-}|, element)
-      AppleScripter.new(FrameJavaScripter.new(element))
+}|, frame)
+      AppleScripter.new(FrameJavaScripter.new(frame))
     end
 
     def speak_value_of(element = @element)
@@ -548,11 +553,11 @@ SCRIPT`
         when NO_RESPONSE
           nil
         when ELEMENT_NOT_FOUND
-          raise UnknownObjectException, "Unable to locate #{element.name} element with #{element.how} of #{element.what}" 
+          raise UnknownObjectException, "Unable to locate #{element.element_name} element with #{element.how} of #{element.what}"
         when TABLE_CELL_NOT_FOUND
           raise UnknownCellException, "Unable to locate a table cell with #{element.how} of #{element.what}"
         when FRAME_NOT_FOUND
-          raise UnknownFrameException, "Unable to locate a frame with name #{element.name}" 
+          raise UnknownFrameException, "Unable to locate a frame with name #{element.element_name}"
         else
           response
       end

data/safariwatir.gemspec

@@ -1,11 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
+require 'rubygems'
+
+spec = Gem::Specification.new do |s|
   s.name = %q{safariwatir}
-  s.version = "0.3.7"
+  s.version = "0.3.8"
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dave Hoover", "Tom Copeland"]
-  s.date = %q{2009-10-20}
+  s.date = Time.now.strftime("%Y-%m-%d")
   s.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.}
   s.email = %q{dave@obtiva.com}
   s.extra_rdoc_files = ["lib/safariwatir/core_ext.rb", "lib/safariwatir/scripter.rb", "lib/safariwatir.rb", "lib/watir/exceptions.rb", "README.rdoc"]
@@ -29,3 +31,5 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rb-appscript>, [">= 0"])
   end
 end
+
+Gem::Builder.new(spec).build if $0 == __FILE__

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: safariwatir
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Dave Hoover
@@ -10,19 +15,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 -04:00
+date: 2010-08-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rb-appscript
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: 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.
 email: dave@obtiva.com
 executables: []
@@ -62,18 +69,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: safariwatir
-rubygems_version: 1.3.4
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Automated testing tool for web applications.