soda 0.0.6 → 0.0.7
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/Soda.rb +27 -6
- metadata +4 -4
data/lib/Soda.rb
CHANGED
@@ -192,11 +192,30 @@ class Soda
|
|
192
192
|
@vars['currentdate'] = getDate()
|
193
193
|
end
|
194
194
|
|
195
|
+
###############################################################################
|
196
|
+
# RestartGlobalTime -- Method
|
197
|
+
# This method reset the global time, for the watchdog timer.
|
198
|
+
#
|
199
|
+
# Input:
|
200
|
+
# None.
|
201
|
+
#
|
202
|
+
# Output:
|
203
|
+
# None.
|
204
|
+
#
|
205
|
+
###############################################################################
|
206
|
+
def RestartGlobalTime()
|
207
|
+
$mutex.synchronize {
|
208
|
+
$global_time = Time.now()
|
209
|
+
}
|
210
|
+
end
|
211
|
+
|
195
212
|
###############################################################################
|
196
213
|
###############################################################################
|
197
214
|
def NewBrowser()
|
198
215
|
err = 0
|
199
216
|
|
217
|
+
RestartGlobalTime()
|
218
|
+
|
200
219
|
if ( @current_os =~ /WINDOWS/i &&
|
201
220
|
@params['browser'] =~ /ie|firefox/i )
|
202
221
|
require 'win32ole'
|
@@ -800,6 +819,8 @@ class Soda
|
|
800
819
|
@browser.close()
|
801
820
|
sleep(1)
|
802
821
|
|
822
|
+
RestartGlobalTime()
|
823
|
+
|
803
824
|
err = NewBrowser()
|
804
825
|
if (err != 0)
|
805
826
|
@rep.ReportFailure("Failed to restart browser!\n")
|
@@ -1894,6 +1915,8 @@ JSCode
|
|
1894
1915
|
def eventWait(event)
|
1895
1916
|
result = false
|
1896
1917
|
|
1918
|
+
RestartGlobalTime()
|
1919
|
+
|
1897
1920
|
if ( event.key?('condition') &&
|
1898
1921
|
getStringBool(event['condition']) &&
|
1899
1922
|
event.key?('children') )
|
@@ -1916,6 +1939,8 @@ JSCode
|
|
1916
1939
|
result = true
|
1917
1940
|
end
|
1918
1941
|
|
1942
|
+
RestartGlobalTime()
|
1943
|
+
|
1919
1944
|
return result
|
1920
1945
|
end
|
1921
1946
|
|
@@ -2365,11 +2390,7 @@ JSCode
|
|
2365
2390
|
fieldType = nil
|
2366
2391
|
|
2367
2392
|
event = SodaUtils.ConvertOldAssert(event, @rep, @currentTestFile)
|
2368
|
-
|
2369
|
-
$mutex.synchronize {
|
2370
|
-
$global_time = Time.new()
|
2371
|
-
}
|
2372
|
-
|
2393
|
+
RestartGlobalTime()
|
2373
2394
|
crazyEvilIETabHack()
|
2374
2395
|
|
2375
2396
|
if (event.key?('set') && event['set'].is_a?(String) &&
|
@@ -2675,7 +2696,7 @@ JSCode
|
|
2675
2696
|
image_file = shooter.GetOutputFile()
|
2676
2697
|
@rep.log("ScreenShot taken: #{image_file}\n")
|
2677
2698
|
rescue Excaption => e
|
2678
|
-
|
2699
|
+
@rep.ReportException(e, false, false)
|
2679
2700
|
ensure
|
2680
2701
|
end
|
2681
2702
|
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: soda
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 17
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 0
|
9
|
-
-
|
10
|
-
version: 0.0.
|
9
|
+
- 7
|
10
|
+
version: 0.0.7
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Trampus Richmond
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-11-
|
18
|
+
date: 2010-11-12 00:00:00 -08:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|