safariwatir 0.2.3 → 0.2.4

data/safariwatir/core_ext.rb

@@ -16,4 +16,16 @@ class String
   def quote_safe
     gsub(/"/, '\"')
   end
-end
+end
+
+class Object
+  def blank?
+    if respond_to?(:strip)
+      strip.empty?
+    elsif respond_to?(:empty?)
+      empty?
+    else
+      !self
+    end
+  end
+end

data/safariwatir/scripter.rb

@@ -13,13 +13,11 @@ function dispatchOnChange(element) {
   var event = document.createEvent('HTMLEvents');
   event.initEvent('change', true, true);  
   element.dispatchEvent(event);
-}
-|
+}|
 
   class JavaScripter    
     def operate(locator, operation)
-%|#{JS_LIBRARY}
-#{locator}
+%|#{locator}
 if (element) {
   #{operation}
 } else {
@@ -31,7 +29,13 @@ if (element) {
       # Needed because createEvent must be called on a document, and the JavaScripter sub-classes
       # do some transformations to lower-case "document" before we get here at runtime.
       script.gsub! "DOCUMENT", "document"
-      script
+      
+# Needed because I would like to blindly use return statements, but Safari 3 enforces
+# the ECMAScript standard that return statements are only valid within functions.
+%|#{JS_LIBRARY}
+(function() {
+  #{script}
+})()|
     end
     
     def find_cell(cell)
@@ -112,10 +116,6 @@ if (element) {
       end
     end
 
-    def current_location
-      eval_js("window.location.href")
-    end
-
     def get_text_for(element = @element)
       execute(element.operate { %|return element.innerText| }, element)
     end
@@ -133,11 +133,11 @@ if (element == undefined) {
     end
       
     def document_text
-      execute(%|document.getElementsByTagName('BODY').item(0).innerText;|)
+      execute(%|return document.getElementsByTagName('BODY').item(0).innerText;|)
     end
 
     def document_html
-      execute(%|document.getElementsByTagName('BODY').item(0).outerHTML;|)
+      execute(%|return document.getElementsByTagName('BODY').item(0).outerHTML;|)
     end
   
     def focus(element)
@@ -165,7 +165,7 @@ element.style.backgroundColor = 'yellow';|
       block ||= Proc.new {}
       execute(element.operate(&block), element)
       return true
-      rescue UnknownObjectException
+    rescue UnknownObjectException
       return false
     end
 
@@ -459,13 +459,12 @@ SCRIPT`
     end
     
     def page_load      
-      last_location = current_location
       yield
       sleep 1
       
       tries = 0
-      TIMEOUT.times do |tries|
-        if "complete" == eval_js("DOCUMENT.readyState")
+      TIMEOUT.times do |tries|        
+        if "complete" == eval_js("return DOCUMENT.readyState") && !@document.URL.get.blank?
           sleep 0.4          
           handle_client_redirect
           break

metadata

@@ -3,12 +3,12 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: safariwatir
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
-date: 2007-03-26 00:00:00 -05:00
+  version: 0.2.4
+date: 2007-06-21 00:00:00 -05:00
 summary: Automated testing tool for web applications.
 require_paths: 
 - .
-email: dave.hoover@gmail.com
+email: dave@obtiva.com
 homepage: http://safariwatir.rubyforge.org/
 rubyforge_project: safariwatir
 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.