soda 1.3.4 → 1.3.5

data/lib/Soda.rb

@@ -233,6 +233,8 @@ class Soda
          Watir::Browser.default = @params['browser']
       end
 
+      # sleeping here because watir has issues if a new browsers comes up
+      # after a firefox process is killed.
       sleep(10)
 
       if (@params['browser'] =~ /firefox/i)
@@ -815,32 +817,18 @@ class Soda
 ###############################################################################
    def RestartBrowserTest(suitename)
 
-#      if (!@GotWatchDog)   
-#         begin 
-#            @browser.close()
-#            sleep(1)
-#         rescue Exception => e
-#         end
-#         @GotWatchDog = false
-#      end
-
       RestartGlobalTime()
 
       if (@params['browser'] =~ /firefox/i)
-         print "Calling: SodaFireFox.KillProcesses().\n"
          SodaFireFox.KillProcesses()
-         print "Finished: Calling SodaFireFox.KillProcesses().\n"
       end
       
-      print "Calling: NewBrowser().\n"
       err = NewBrowser()
       if (err != 0)
          print "(!)Failed to restart browser!\n"
       end
-      print "Finished: Calling NewBrowser().\n"
 
       if (!@restart_test.empty?)
-         print "Starting Restart Test: #{@restart_test}.\n"
          resultdir = "#{@resultsDir}/#{suitename}"
          @rep = SodaReporter.new(@restart_test, @saveHtml, resultdir,
             0, nil, false);
@@ -849,7 +837,6 @@ class Soda
          handleEvents(restart_script)
          @rep.log("Finished: Browser restart.\n")
          @rep.EndTestReport()
-         print "Finished Restart Test.\n"
       end
 
       RestartGlobalTime()
@@ -1833,22 +1820,37 @@ class Soda
    def CheckJavaScriptErrors()
       result = nil
       data = nil
+      error_hash = {}
 
       if (Watir::Browser.default == "firefox")
          result = @browser.execute_script(
             "#{SodaUtils::FIREFOX_JS_ERROR_CHECK_SRC}")
          data = result.split(/######/)
          data.each do |line|
+            line = line.chomp()
+
             if ( (line != "") && 
                (line !~ /chrome:\/\/browser\/content\/tabbrowser\.xm/) &&
                (line !~ /SShStarter.js/i ))
-               @rep.ReportJavaScriptError("Javascript Error:#{line}\n", 
-                  $skip_css_errors)
-               
+               if (error_hash.key?(line))
+                  error_hash[line] += 1
+               else
+                  error_hash[line] = 1
+              end 
             end
          end
       end
 
+      error_hash.each do |error, count|
+         if (count > 1)
+            msg = "Javascript Error (repeated #{count} times):#{error}\n"
+         else
+            msg = "Javascript Error:#{error}\n"
+         end
+
+         @rep.ReportJavaScriptError(msg, $skip_css_errors)
+      end
+
       return 0
    end 
 
@@ -2114,7 +2116,9 @@ JSCode
          'link',
          'append',
          'disabled',
-         'jscriptevent'
+         'jscriptevent',
+         'cssprop',
+         'cssvalue'
          ]
    
       if (@SIGNAL_STOP != false)
@@ -2149,6 +2153,8 @@ JSCode
       end
 
       case (foundaction)
+         when /cssprop|cssvalue/i
+            cssInfoEvent(event)
          when "jscriptevent"
             fieldType.jsevent(@curEl, js, true)
             js_fired = true
@@ -2325,6 +2331,59 @@ JSCode
 
    end
 
+###############################################################################
+# cssInfoEvent -- method
+#     This method checks that css values for a given soda element.
+#
+# Input:
+#     event: A soda event.
+#
+# Output:
+#     returns 0 on success or -1 on error.
+#
+###############################################################################
+   def cssInfoEvent(event)
+      jssh_var = ""
+      jssh_data = nil
+      css_data = nil
+
+      if (!event.key?('cssprop'))
+         @rep.ReportFailure("Missing attribte: 'cssprop' on line: "+
+         "#{event[line_number]}!\n")
+         return -1  
+      elsif (!event.key?('cssvalue'))
+         @rep.ReportFailure("Missing attribte: 'cssvalue' on line: "+
+            "#{event['line_number']}!\n")  
+         return -1
+      end
+     
+      event['cssprop'] = replaceVars(event['cssprop'])
+      event['cssvalue'] = replaceVars(event['cssvalue'])
+
+      if (@params['browser'] =~ /firefox/i)
+         css_data = SodaUtils.GetFireFoxStyle(@curEl, event['cssprop'], 
+               @rep, @browser)
+      elsif (@params['browser'] =~ /ie/i)
+         css_data = SodaUtils.GetIEStyle(@curEl, event['cssprop'], @rep)
+      end
+      
+      return -1 if (css_data == nil)
+
+      if (event['cssvalue'] == "#{css_data}")
+         msg = "CSS property '#{event['cssprop']}' => "+
+            "'#{css_data}'"
+        @rep.Assert(true, msg) 
+      else
+         msg = "CSS propery '#{event['cssprop']}' => "+
+            "'#{css_data}' was expecting value: "+
+            "'#{event['cssvalue']}'!"
+         @rep.Assert(false, msg, @currentTestFile,
+            "#{event['line_number']}")
+      end
+   
+      return 0
+   end
+
 ###############################################################################
 # crazyEvilIETabHack -- Method
 #     This method make ie's tab pages act like firefox's in the since that,

data/lib/SodaElements.xml

@@ -72,6 +72,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
       </accessor_attributes>
+
+      <soda_attributes>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
+      </soda_attributes>
    </filefield>
 
    <browser>
@@ -85,7 +90,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <name>refresh</name>
             <name>forward</name>
          </action>
-
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
          <accessor type="string">assertnot</accessor>
          <accessor type="string">assert</accessor>
          <accessor type="string">url</accessor>
@@ -121,6 +127,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="boolean">jswait</accessor>
          <accessor type="boolean">disabled</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
       </soda_attributes>
    </textfield>
 
@@ -143,6 +151,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="boolean">disabled</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
       </soda_attributes>
    </textarea>
 
@@ -157,6 +167,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		</accessor_attributes>
 
 		<soda_attributes>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</h3>
 
@@ -172,6 +184,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		</accessor_attributes>
 
 		<soda_attributes>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</label>
 
@@ -198,6 +212,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="boolean">jswait</accessor>
          <accessor type="string">assertPage</accessor>
          <accessor type="boolean">disabled</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</button>
 
@@ -212,6 +228,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		</accessor_attributes>
 
 		<soda_attributes>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</h4>
 
@@ -226,6 +244,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		</accessor_attributes>
 
 		<soda_attributes>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</ul>
 
@@ -244,6 +264,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			<accessor type="string">set</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</filefield>
 
@@ -261,6 +283,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<soda_attributes>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</file_field>
 
@@ -277,6 +301,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<soda_attributes>
          <accessor type="string">assert</accessor>
          <accessor type="string">assertnot</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</h5>
 
@@ -295,6 +321,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="string">assertnot</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</cell>
 
@@ -313,6 +341,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="string">assertnot</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</td>
 
@@ -327,6 +357,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		</accessor_attributes>
 
 		<soda_attributes>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</h6>
 
@@ -351,6 +383,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="boolean">disabled</accessor>
          <accessor type="boolean">exists</accessor>
          <accessor type="string">jscriptevent</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
       </soda_attributes>
 	</select>
 
@@ -371,6 +405,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="boolean">disabled</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</select_list>
 
@@ -385,6 +421,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		</accessor_attributes>
 
 		<soda_attributes>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</pre>
 
@@ -402,6 +440,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">click</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</row>
 
@@ -418,6 +458,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<soda_attributes>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</tr>
 
@@ -437,6 +479,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">click</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</table>
 
@@ -457,6 +501,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="boolean">disabled</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</radio>
 
@@ -471,6 +517,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		</accessor_attributes>
 
 		<soda_attributes>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</p>
 
@@ -496,6 +544,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			<accessor type="boolean">assertPage</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</checkbox>
 
@@ -513,6 +563,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<soda_attributes>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</map>
 
@@ -529,6 +581,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<soda_attributes>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</frame>
 
@@ -547,6 +601,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			<accessor type="boolean">exist</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</form>
 
@@ -567,6 +623,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="string">assertnot</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</div>
 
@@ -583,6 +641,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<soda_attributes>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</area>
 
@@ -600,6 +660,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			<accessor type="boolean">click</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</li>
 
@@ -625,6 +687,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="boolean">jswait</accessor>
 			<accessor type="boolean">assertPage</accessor>
          <accessor type="boolean">disabled</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</link>
 
@@ -639,6 +703,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		</accessor_attributes>
 
 		<soda_attributes>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</h1>
 
@@ -660,6 +726,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
          <accessor type="boolean">alert</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</image>
 
@@ -675,6 +743,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 		<soda_attributes>
          <accessor type="boolean">click</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</h2>
 
@@ -693,6 +763,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="boolean">disabled</accessor>
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</text_field>
 
@@ -714,6 +786,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <accessor type="string">jscriptevent</accessor>
          <accessor type="boolean">jswait</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</span>
 
@@ -732,6 +806,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<soda_attributes>
 			<accessor type="string">var</accessor>
          <accessor type="boolean">exists</accessor>
+         <accessor type="string">cssprop</accessor>
+         <accessor type="string">cssvalue</accessor>
 		</soda_attributes>
 	</hidden>
 

data/lib/SodaFireFox.rb

@@ -70,7 +70,6 @@ def SodaFireFox.CreateFireFoxBrowser(options = nil)
       result['exception'] = e
       result['browser'] = nil
    ensure
-
    end
 
    return result
@@ -133,17 +132,12 @@ def SodaFireFox.KillProcessWindows()
    tmp = nil
    result = 0
 
-   print "Calling: Kernel.open(| tasklist /NH).\n"
    tmp = Kernel.open("| tasklist /NH")
-   print "Readling Lines...\n"
    lines = tmp.readlines()
-   print "Lines Read.\n"
    tmp.close()
-   print "Closing process IO handle.\n"
 
    lines.each do |l|
       l = l.chomp()
-      print "Process Line: '#{l}'\n"
       if (l =~ /firefox/i)
          hash = {
             'pid' => nil,
@@ -157,21 +151,22 @@ def SodaFireFox.KillProcessWindows()
    end
 
    len = firefox.length()
-   print "Processes found length: #{len}\n"
-
    if (firefox.length < 1)
       print "(*)No firefox processes to kill, browser closed clean.\n"
    end
 
    firefox.each do |hash|
       begin
+         res = false
          print "Killing Process ID: #{hash['pid']}, Name:"+
             "#{hash['name']}\n"
          cmd = "taskkill /F /T /PID #{hash['pid']}"
-         print "Calling Command: '#{cmd}'\n"
          res = Kernel.system(cmd)
-         print "Commnd Result: #{res}\n"
-         print "Console Results: #{$?}\n"
+
+         if (res =! true)
+            print "Failed calling command: #{cmd}!\n"
+            result = -1
+         end
       rescue Exception => e
          print "(!)Exception : #{e.message}\n"
          result = -1

data/lib/SodaLogReporter.rb

@@ -737,7 +737,7 @@ HTML
             row_data = FormatEventDump(line)
          when /major\sexception/i
             row_data = FormatMajorException(line)
-         when /javascript\s+error:/i
+         when /javascript\s+error:|javascript\s+error\s+\(repeated/i
             row_data = FormatJSError(line)
          when /css\s+error:/i
             row_data = FormatJSError(line)

data/lib/SodaUtils.rb

@@ -874,6 +874,225 @@ JAVA
    return result
 end
 
+###############################################################################
+# GetJsshVar -- function
+#     This function is a total hack to get an the watirobj's instance var
+#     @element_name which holds the internal jssh var names for accessing
+#     the wair object in jssh.  This is needed bcause the firewatir style
+#     merhod isn't working.  So I cause an internal class error which I
+#     then parse to get the needed var name.
+#
+# Input:
+#     watirobj: This is the watir object which you want to get the jssh var of.
+#
+# Output:
+#     Returns a string with the jssh var name.
+#
+###############################################################################
+def SodaUtils.GetJsshVar(watirobj)
+   err = ""
+   
+   err = watirobj.class_eval(%q{@element_name})
+   err = err.gsub(/^typeerror:\s+/i, "")
+   err = err.gsub(/\.\D+/, "")
+
+   return err
+end
+
+###############################################################################
+# GetJsshStyle -- function
+#     This function gets the style information from from a watir object using
+#     jssh.
+#
+# Input:
+#     jssh_var: This is the internal firewatir jssh var used to access the
+#     watir object.  This is returned from calling the GetJsshVar function.
+#
+# Output:
+#     Returns a hash with all of the style info, or an empty hash if there is
+#     no information to get.
+#
+###############################################################################
+def SodaUtils.GetJsshStyle(jssh_var, browser)
+   hash = {}
+
+   java = <<JS
+   var style = #{jssh_var}.style;
+   var data = "";
+   var len = style.length -1;
+
+   for (var i = 0; i <= len; i++) {
+      var name = style[i];
+      var value = style.getPropertyValue(name);
+      var splitter = "---";
+      
+      if (i == 0) {
+         splitter = ""
+      }
+
+      data = data + splitter + name + "=>" + value;
+   }
+
+   if (data.length < 1) {
+      data = "null";
+   }
+
+   print(data)
+JS
+
+   out = browser.execute_script(java)
+   if (out != "null")
+      data = out.split("---")
+      data.each do |item|
+         tmp = item.split("=>")
+         hash[tmp[0]] = tmp[1]
+      end
+   end
+
+   return hash
+end
+
+
+###############################################################################
+# GetIEStyle -- function
+#     This function get a style property from a watir object in IE.
+#
+# Intput:
+#     watirobj: The IE watir object.
+#     css_prop: The property name to get the info for.
+#     reportobj: The soda reporter object.
+#
+# Output:
+#     returns nil on error or a string on success.
+#
+###############################################################################
+def SodaUtils.GetIEStyle(watirobj, css_prop, reportobj)
+   err = nil
+   prop_data = nil
+   new_prop = ""
+   len = 0
+
+   # because the IE access functions do not use the same names as the
+   # standard css property names, we need con convert the names into
+   # IE's ole friendly method name.
+   prop_data = css_prop.split("-")
+   len = prop_data.length() -1
+   if (len > 0)
+      i = 1
+      for i in i..len do
+         prop_data[i].capitalize!
+      end
+
+      prop_data.each do |d|
+         new_prop << "#{d}"
+      end
+   else
+      new_prop = css_prop
+   end
+   
+   begin
+      err = eval("watirobj.style.#{new_prop}")
+   rescue Exception => e
+      err = nil
+      reportobj.ReportFailure("Failed to find any CSS data for"+
+         " property: '#{new_prop}'!\n")
+   end
+
+   return err
+end
+
+###############################################################################
+# GetFireFoxStyle -- function
+#     This function get a style property from a watir object in firefox.
+#
+# Intput:
+#     watirobj: The IE watir object.
+#     css_prop: The property name to get the info for.
+#     reportobj: The soda reporter object.
+#     browser: The currenlt Watir::Browser object.
+#
+# Output:
+#     returns nil on error or a string on success.
+#
+###############################################################################
+def SodaUtils.GetFireFoxStyle(watirobj, css_prop, reportobj, browser)
+   jssh_var = ""
+   jssh_data = nil
+   result = nil
+
+   jssh_var = SodaUtils.GetJsshVar(watirobj)
+   if (jssh_var.empty?)
+      reportobj.ReportFailure("Failed to find needed jssh var!\n")
+      e_dump = SodaUtils.DumpEvent(event)
+      reportobj.log("Event Dump for empty jssh var: #{e_dump}!\n",
+         SodaUtils::EVENT)
+      return nil
+   else
+      reportobj.log("Found internal jssh var: '#{jssh_var}'.\n")
+   end
+
+   jssh_data = SodaUtils.GetJsshStyle(jssh_var, browser)
+   
+   if (jssh_data.empty?)
+      reportobj.ReportFailure("Failed to find any CSS data for"+
+         " property: '#{css_prop}'!\n")
+      e_dump = SodaUtils.DumpEvent(event)
+      reportobj.log("Event Dump for empty CSS data: #{e_dump}!\n",
+         SodaUtils::EVENT)
+      return nil
+   end
+  
+   if (!jssh_data.key?("#{css_prop}"))
+      reportobj.ReportFailure("Failed to find CSS key: '#{css_prop}'"+
+         " for element!\n")
+      e_dump = SodaUtils.DumpEvent(event)
+      reportobj.log("Event Dump for missing CSS key: #{e_dump}!\n",
+         SodaUtils::EVENT)
+      return nil
+   else
+      result = jssh_data[css_prop]
+   end
+
+   return result
+end
+
+###############################################################################
+# cssInfoEvent -- method
+#     This method checks that css values for a given soda element.
+#
+# Input:
+#     event: A soda event.
+#     watirobj: The watir element object.
+#     browser: The watir browser object.
+#     reportobj: The current sodareporter object.
+#
+# Output:
+#     returns 0 on success or -1 on error.
+#
+###############################################################################
+def SodaUtils.GetStyleInfo(event, watirobj, browser, reportobj)
+
+   if (!event.key?('cssprop'))
+      reportobj.ReportFailure("Missing attribte: 'cssprop' on line: "+
+      "#{event[line_number]}!\n")
+      return -1  
+   elsif (!event.key?('cssvalue'))
+      reportobj.ReportFailure("Missing attribte: 'cssvalue' on line: "+
+         "#{event['line_number']}!\n")  
+      return -1
+   end
+
+   if (@params['browser'] !~ /firefox/i)
+      @reportobj.log("Currently this function is only supported on firefox!",
+         SodaUtils::WARN)
+      return -1
+   end
+  
+   event['cssprop'] = replaceVars(event['cssprop'])
+   event['cssvalue'] = replaceVars(event['cssvalue'])
+
+   return 0
+end
 
 ###############################################################################
 ###############################################################################

data/lib/sodainfo.rb

@@ -1,4 +1,4 @@
 require 'Soda'
 
-SODA_GEM_VERSION = "1.3.4"
+SODA_GEM_VERSION = "1.3.5"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soda
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 3
-  - 4
-  version: 1.3.4
+  - 5
+  version: 1.3.5
 platform: ruby
 authors: 
 - Trampus Richmond
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -07:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency