soda 1.4.2 → 1.4.3

data/lib/Soda.rb

@@ -1873,39 +1873,15 @@ class Soda
       result = nil
 
       if (event['content'].length > 0)
-        if (Watir::Browser.default == 'firefox')
-         # Executing javascript from within the firefox window context 
-         # (injection) requires firebug, for now.
-          toExec = "";
-          if (event.key?('addUtils') && (getStringBool(event['addUtils'])))
-            event['content'] = SodaUtils::getSodaJS() + event['content'];
-          end
-          
-          escapedContent = event['content'].gsub(/\\/, '\\').gsub(/"/, '\"');
-          
-          toExec = <<JSCode
-if (typeof window.Firebug != "undefined") { 
-   window.TabWatcher.watchBrowser(window.FirebugChrome.getCurrentBrowser());
-   window.Firebug.minimizeBar();
-   window.Firebug.CommandLine.evaluateInWebPage("#{escapedContent}", browser.contentDocument.defaultView);
-   window.Firebug.closeFirebug();
-}
-JSCode
-      
-          result = @browser.execute_script(toExec)
-        else
-          escapedContent = event['content'].gsub(/\\/, '\\').gsub(/"/, '\"')
-          toExec = 'browser.document.parentWindow.execScript("' + escapedContent + '")'
-          result = @browser.execute_script(event['content'])
-        end
-         result = result.to_s()
-         PrintDebug("JavaScript Results: \"#{result}\"\n")
+          addUtils = event.key?('addUtils') && (getStringBool(event['addUtils']))
+          result = SodaUtils.execute_script(event['content'], addUtils, @browser, @rep)
       else
          @rep.log("No javascript source content found!", SodaUtils::ERROR)
          return -1
       end
       
       CheckJavaScriptErrors()
+      return result;
    end
 
 ############################################################################### 
@@ -2638,7 +2614,7 @@ JSCode
                      e_dump = SodaUtils.DumpEvent(event)
                      @rep.log("No Element found for event!\n", 
                         SodaUtils::ERROR)
-                     @rep.log("Event Dump for unfound element: #{e_dump}!\n", 
+                     @rep.log("Event Dump for unfound element: #{e_dump}!\n",
                         SodaUtils::EVENT)
                   end
                else
@@ -2950,7 +2926,7 @@ JSCode
       result = {}
       tests = []
       suite_name = File.basename(suitefile, ".xml")
-     
+
       print "Running Suite: #{suitefile}\n"
 
       begin
@@ -2982,7 +2958,7 @@ JSCode
                end
             end
          end
-         
+
          fd.close()
       rescue Exception => e
          SodaUtils.PrintSoda(e.message, SodaUtils::ERROR)

data/lib/SodaElements.xml

@@ -1,4 +1,4 @@
-<soda>
+<soda>
 <!--
 Copyright (c) 2010, SugarCRM, Inc.
 All rights reserved.
@@ -59,6 +59,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </accessor_attributes>
    </wait>
 
+   <sugarwait>
+       <accessor_attributes>
+         <accessor type="integer">timeout</accessor>
+         <accessor type="string">condition</accessor>
+      </accessor_attributes>
+   </sugarwait>
+
    <puts>
       <accessor_attributes>
          <accessor type="string">text</accessor>

data/lib/SodaUtils.rb

@@ -748,65 +748,26 @@ def SodaUtils.IEConvertHref(event, url)
 end
 
 ###############################################################################
-# WaitSugarAjaxDone -- function
-#     This function waits to make sure that sugar has finished all ajax
-#     actions.
+# execute_script -- function
+#     Executes given javascript in the browser
 #
 # Input:
+#     script: javascript string to be executed
 #     browser: This is a watir browser object.
 #     reportobj: This is an active SodaReporter object.
 #
 # Returns:
-#     -1 on error else 0.
-#
-# Notes:
-#     I had to split up how Windows OS finds the windows, because Watir's 
-#     browser.url() method returns '' every time if there are more then
-#     one window open.  This is not the cause it Linux, as linux seems to 
-#     know what the current active browser is and returns the expected url.
+#     -1 on error else the javascript result.
 #
 ###############################################################################
-def SodaUtils.WaitSugarAjaxDone(browser, reportobj)
-   done = false
-   result = 0
-   undef_count = 0
-   url = browser.url()
-   os = ""
-   str_res = ""
-   t1 = nil
-   t2 = nil
-
-   os = GetOsType()
-
-   linux_js = <<JAVA
-var windows = getWindows();
-var win_count = windows.length -1;
-var current_browser_id = -1;
-var result = "undefined";
-
-for (var i = 0; i <= win_count; i++) {
-   var tmp_win = windows[i];
-   var tmp_url = tmp_win.getBrowser().contentDocument.URL;
-
-   if (tmp_url == "#{url}") {
-      current_browser_id = i;
-      break;
-   }
-}
-JAVA
-
-   other_js = <<JAVA
-var current_browser_id = 0;
-JAVA
-
-   if (os =~ /linux/i)
-      js = "#{linux_js}\n"
-   else
-      js = "#{other_js}\n"
-   end
-
-   js += <<JAVA
-   current_browser_id = 0;
+def SodaUtils.execute_script(script, addUtils, browser, rep)
+    result = nil
+
+      if (script.length > 0)
+        script = script.gsub(/[\n\r]/, "")
+        escapedContent = script.gsub(/\\/, '\\').gsub(/"/, '\"')
+        js = <<JSCode
+current_browser_id = 0;
 if (current_browser_id > -1) {
    var target = getWindows()[current_browser_id];
    var browser = target.getBrowser();
@@ -819,31 +780,67 @@ if (current_browser_id > -1) {
    if (tmp != null) {
       doc.body.removeChild(tmp);
    }
-   
-   d.setAttribute("id", "Sodahack");
-   var src = "if (typeof SUGAR == 'undefined') {\n";
-   src += "   document.soda_sugar_done = 'undefined';\n";
-   src += "} else {\n";
-   src += "   document.soda_sugar_done = SUGAR.util.ajaxCallInProgress();\n";
-   src += "}";
 
+   d.setAttribute("id", "Sodahack");
+   var src = "document.soda_js_result = (function(){#{escapedContent}})()";
    d.innerHTML = src;
    doc.body.appendChild(d);
-   print(doc.soda_sugar_done);
-   result = doc.soda_sugar_done;
+   print(doc.soda_js_result);
+   result = doc.soda_js_result;
 } else {
-   result = "undefined";
+   result = "No Browser to use";
 }
-
 print(result);
-JAVA
+JSCode
+
+        #Now actually execute the js in the browser
+        result = browser.js_eval(js)
+        result = result.chomp()
+    else
+        result = "No script passed"
+    end
+
+    return result
+end
+
+
+
+
+###############################################################################
+# WaitSugarAjaxDone -- function
+#     This function waits to make sure that sugar has finished all ajax
+#     actions.
+#
+# Input:
+#     browser: This is a watir browser object.
+#     reportobj: This is an active SodaReporter object.
+#
+# Returns:
+#     -1 on error else 0.
+#
+# Notes:
+#     I had to split up how Windows OS finds the windows, because Watir's
+#     browser.url() method returns '' every time if there are more then
+#     one window open.  This is not the cause it Linux, as linux seems to
+#     know what the current active browser is and returns the expected url.
+#
+###############################################################################
+def SodaUtils.WaitSugarAjaxDone(browser, reportobj)
+   done = false
+   result = 0
+   undef_count = 0
+   url = browser.url()
+   os = ""
+   str_res = ""
+   t1 = nil
+   t2 = nil
 
+   js = "if(SUGAR && SUGAR.util && !SUGAR.util.ajaxCallInProgress()) return 'true'; else return 'false';"
    reportobj.log("Calling: SugarWait.\n")
    t1 = Time.now()
 
-   for i in 0..300
-      tmp = browser.js_eval(js)
-      tmp = tmp.chomp()
+   for i in 0..60
+      tmp = SodaUtils.execute_script(js, false, browser, reportobj)
 
       case (tmp)
          when /false/i
@@ -861,7 +858,7 @@ JAVA
                SodaUtils::WARN)
       end
 
-      if (tmp == false)
+      if (tmp == true)
          done = true
          break
       end

data/lib/sodainfo.rb

@@ -1,4 +1,4 @@
 require 'Soda'
 
-SODA_GEM_VERSION = "1.4.2"
+SODA_GEM_VERSION = "1.4.3"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soda
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Trampus Richmond
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 Z
+date: 2011-05-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: firewatir