safariwatir 0.2.0 → 0.2.1

data/safariwatir.rb

@@ -94,6 +94,7 @@ module Watir
       def operate_by_value(&block)
         @scripter.operate_by_input_value(self, &block)
       end
+      alias_method :operate_by_caption, :operate_by_value
     end
 
     class Form < HtmlElement
@@ -234,6 +235,8 @@ module Watir
       def column_count
         # TODO
       end
+
+      def tag; "TABLE"; end
     end
     
     class TableRow
@@ -257,6 +260,8 @@ module Watir
       def column_count
         # TODO
       end
+
+      def tag; "TR"; end
     end
     
     class TableCell < ContentElement
@@ -272,16 +277,20 @@ module Watir
       def operate(&block)
         @scripter.operate_by_table_cell(self, &block)
       end
+
+      def tag; "TD"; end
     end
 
     class TextField < InputElement
       def set(value)
+        @scripter.focus(self)
         @scripter.highlight(self) do
           clear_text_input
           value.length.times do |i|
             append_text_input(value[i, 1])
           end
         end
+        @scripter.blur(self)
       end
       
       def getContents
@@ -385,6 +394,8 @@ module Watir
     include Container
     include PageContainer
 
+    DEFAULT_TYPING_LAG = 0.08
+
     def self.start(url = nil)
       safari = new
       safari.goto(url) if url
@@ -394,8 +405,26 @@ module Watir
     def initialize
       @scripter = AppleScripter.new
       @scripter.ensure_window_ready
+      set_slow_speed
+    end
+
+    def set_fast_speed
+      @scripter.typing_lag = 0
     end
     
+    def set_slow_speed
+      @scripter.typing_lag = DEFAULT_TYPING_LAG
+    end
+    
+    def speed=(how_fast)
+      case how_fast
+      when :fast : set_fast_speed
+      when :slow : set_slow_speed
+      else
+        raise ArgumentError, "Invalid speed: #{how_fast}"
+      end
+    end    
+    
     def close
       scripter.close
     end

data/safariwatir/scripter.rb

@@ -8,9 +8,18 @@ module Watir
   NO_RESPONSE = "__safari_watir_no_response__"
   TABLE_CELL_NOT_FOUND = "__safari_watir_cell_unfound__"
 
+  JS_LIBRARY = %|
+function dispatchOnChange(element) {
+  var event = document.createEvent('HTMLEvents');
+  event.initEvent('change', true, true);  
+  element.dispatchEvent(event);
+}
+|
+
   class JavaScripter    
     def operate(locator, operation)
-%|#{locator}
+%|#{JS_LIBRARY}
+#{locator}
 if (element) {
   #{operation}
 } else {
@@ -76,10 +85,11 @@ if (element) {
     include Watir::Exception
     
     attr_reader :js
+    attr_accessor :typing_lag
     private :js
     
     TIMEOUT = 10
-  
+
     def initialize(scripter = JavaScripter.new)
       @js = scripter
       @app = AS.app("Safari")
@@ -125,11 +135,22 @@ if (element == undefined) {
     def document_text
       execute(%|document.getElementsByTagName('BODY').item(0).innerText;|)
     end
+
+    def document_html
+      execute(%|document.getElementsByTagName('BODY').item(0).outerHTML;|)
+    end
+  
+    def focus(element)
+      execute(element.operate { %|element.focus();| }, element)
+    end
+
+    def blur(element)
+      execute(element.operate { %|element.blur();| }, element)
+    end
       
     def highlight(element, &block)
       execute(element.operate do
-%|element.focus();        
-element.originalColor = element.style.backgroundColor;
+%|element.originalColor = element.style.backgroundColor;
 element.style.backgroundColor = 'yellow';|
       end, element)      
 
@@ -150,7 +171,23 @@ element.style.backgroundColor = 'yellow';|
 
     def select_option(element = @element)
       execute(element.operate do
-        handle_option(element, %|element.options[i].selected = true;|)
+%|var selected = -1;
+var previous_selection = 0;
+for (var i = 0; i < element.options.length; i++) {
+  if (element.options[i].selected) {
+    previous_selection = i;
+  }
+  if (element.options[i].#{element.how} == '#{element.what}') {
+    element.options[i].selected = true;
+    selected = i;
+  }
+}
+if (selected == -1) {
+  return '#{ELEMENT_NOT_FOUND}';
+} else if (previous_selection != selected) {        
+  dispatchOnChange(element.options[selected]);
+}
+|
       end, element)
     end
     
@@ -177,8 +214,10 @@ if (!option_found) {
     end
       
     def append_text_input(value, element = @element)
+      sleep typing_lag
       execute(element.operate do 
 %|element.value += '#{value}';
+dispatchOnChange(element);
 element.setSelectionRange(element.value.length, element.value.length);| 
       end, element)
     end
@@ -419,22 +458,22 @@ SCRIPT`
       nil
     end
     
-    def page_load
+    def page_load      
       last_location = current_location
       yield
       sleep 1
-      return if last_location == current_location
       
       tries = 0
       TIMEOUT.times do |tries|
         if "complete" == eval_js("DOCUMENT.readyState")
+          sleep 0.4          
           handle_client_redirect
           break
         else
           sleep 1
         end
       end
-      raise "Unable to load page withing #{TIMEOUT} seconds" if tries == TIMEOUT-1
+      raise "Unable to load page within #{TIMEOUT} seconds" if tries == TIMEOUT-1
     end
 
     def handle_client_redirect

data/safariwatir_script.rb

@@ -2,11 +2,13 @@ require 'rubygems'
 require 'safariwatir'
 
 # TODO 
-# Be more attached to the Safari window. Currently, if a different window is selected, the AppleScript executes against it.
+# Be more attached to the Safari window.
+#    Currently, if a different window is selected, the AppleScript executes against it.
 # Verify onclick is working for buttons and links
 # TextFields should not respond to button method, etc.
 
-# Unsupported Elements: Test that P/Div/Span/TD handle link, button, etc., Javascript confirm [OK/CANCEL], Javascript prompt, Javascript popup windows
+# Unsupported Elements: Test that P/Div/Span/TD handle link, button, etc.,
+#                       Javascript confirm [OK/CANCEL], Javascript prompt, Javascript popup windows
 
 # Need to find a better way to distinguish between a submit button and a checkbox, re: page_load
 
@@ -24,9 +26,7 @@ def safari.google_to_prag
   link(:text, "Programming Ruby, 2nd Ed.").click
   link(:url, "http://www.pragmaticprogrammer.com/titles/ruby/code/index.html").click
   link(:text, "Catalog").click
-  # site was down
   link(:text, "All Books").click
-  # goto("http://pragmaticprogrammer.com/bookshelf/") # workaround
   link(:text, /Agile Retrospectives/).click
   puts "FAILURE prag" unless contains_text("Dave Hoover")  
 end
@@ -57,7 +57,7 @@ def safari.google_advanced
   radio(:id, "ss").set
   text_field(:name, "as_q").set("obtiva")
   button(:name, "btnG").click
-  puts "FAILURE google" unless contains_text("RailsConf Facebook")
+  puts "FAILURE google" unless contains_text("Training, Coaching, and Software Development")
 end
 
 def safari.reddit
@@ -100,8 +100,9 @@ def safari.weinberg
 end
 
 def safari.tables
-  goto("http://basecamphq.com/")
-  puts "FAILURE basecamp content" unless table(:index, 1)[1][2].text =~ /What is Basecamp\?/
+  # Site Redesign, need to update test
+  # goto("http://basecamphq.com/")
+  # puts "FAILURE basecamp content" unless table(:index, 1)[1][2].text =~ /What is Basecamp\?/
   
   goto("http://www.jimthatcher.com/webcourse9.htm")
   puts "FAILURE thatcher" unless cell(:id, "c5").text == "subtotals"
@@ -119,6 +120,13 @@ def safari.tables
   puts "FAILURE dreamweaver" unless table(:id, "titletable")[1][1].text =~ /CSS/
 end
 
+def safari.onchange
+  goto("http://www.gr8cardeal.co.uk/?s=1")
+  select_list(:name, "manufacturer").select_value("BMW")
+  sleep 0.3 # There's an Ajax call here
+  select_list(:name, "model").select_value("Z4 ROADSTER")
+end
+
 begin
   safari.google_to_prag
   safari.ala
@@ -129,6 +137,7 @@ begin
   safari.redsquirrel
   safari.weinberg
   safari.tables
+  safari.onchange
 ensure
   safari.close
-end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: safariwatir
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-11-22 00:00:00 -06:00
+  version: 0.2.1
+date: 2006-12-24 00:00:00 -06:00
 summary: Automated testing tool for web applications.
 require_paths: 
 - .