soda 0.0.6 → 0.0.7

data/lib/Soda.rb

@@ -192,11 +192,30 @@ class Soda
       @vars['currentdate'] = getDate()
    end
 
+###############################################################################
+# RestartGlobalTime -- Method
+#		This method reset the global time, for the watchdog timer.
+#
+# Input:
+#		None.
+#
+# Output:
+#		None.
+#
+###############################################################################
+	def RestartGlobalTime()
+		$mutex.synchronize {
+			$global_time = Time.now()
+		}
+	end
+
 ###############################################################################
 ###############################################################################
    def NewBrowser()
       err = 0
 
+		RestartGlobalTime()
+
       if ( @current_os =~ /WINDOWS/i && 
          @params['browser'] =~ /ie|firefox/i ) 
          require 'win32ole'
@@ -800,6 +819,8 @@ class Soda
          @browser.close()
          sleep(1)
 
+			RestartGlobalTime()
+
          err = NewBrowser()
          if (err != 0)
             @rep.ReportFailure("Failed to restart browser!\n")
@@ -1894,6 +1915,8 @@ JSCode
    def eventWait(event)
       result = false
 
+		RestartGlobalTime()
+
       if ( event.key?('condition') && 
            getStringBool(event['condition']) && 
            event.key?('children') )
@@ -1916,6 +1939,8 @@ JSCode
          result = true
       end
 
+		RestartGlobalTime()
+
       return result
    end
 
@@ -2365,11 +2390,7 @@ JSCode
             fieldType = nil
     
             event = SodaUtils.ConvertOldAssert(event, @rep, @currentTestFile)
-
-            $mutex.synchronize {
-               $global_time = Time.new()
-            }
-
+				RestartGlobalTime()
             crazyEvilIETabHack() 
 
             if (event.key?('set') && event['set'].is_a?(String) && 
@@ -2675,7 +2696,7 @@ JSCode
 							image_file = shooter.GetOutputFile()
 							@rep.log("ScreenShot taken: #{image_file}\n")
 						rescue Excaption => e
-            			@rep.ReportException(e, false, false)
+							@rep.ReportException(e, false, false)
 						ensure
 						end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soda
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Trampus Richmond
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 -08:00
+date: 2010-11-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency