scoutui 2.0.3.38.pre → 2.0.3.39.pre
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/scoutui/base/assertions.rb +5 -2
- data/lib/scoutui/base/user_vars.rb +18 -11
- data/lib/scoutui/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 70659ad4a781a8562a58c296d27846c8de09f62f
|
|
4
|
+
data.tar.gz: c868a849e7d2051695c51995bd3e7039db7a897c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: acaf7c63f6c423d3425f014c31190ceedc60f0238a3733c1f7c45bb8f2f9d3a856b3ca3e818333d68167c9958685037aacef15f15c04ce5e0559d6c51ecad1e7
|
|
7
|
+
data.tar.gz: 68e3b810a1249bdaccc62c3f87232a9949db9b35076db61cc92640400454ded772f5fe447ccd57d71086359409806558cdcbe4a8172fb6c5aa75317e8f3f031f
|
|
@@ -433,10 +433,13 @@ module Scoutui::Base
|
|
|
433
433
|
_t = isVisibleFrameCmd?(_execute_when)
|
|
434
434
|
|
|
435
435
|
if !_t.nil?
|
|
436
|
-
|
|
436
|
+
_locator = _t['locator']
|
|
437
437
|
_locator = Scoutui::Base::UserVars.instance.normalize(_locator)
|
|
438
438
|
|
|
439
|
-
|
|
439
|
+
if _t.has_key?('frame') && !_t['frame'].nil?
|
|
440
|
+
Scoutui::Commands::Utils.instance.setEnableFrameSearch(_t['frame'])
|
|
441
|
+
end
|
|
442
|
+
|
|
440
443
|
elsif isVisibleCmd?(_execute_when)
|
|
441
444
|
_locator = _execute_when.match(/^\s*[!]*visible\((.*)\)\s*$/i)[1].to_s
|
|
442
445
|
else
|
|
@@ -72,26 +72,33 @@ module Scoutui::Base
|
|
|
72
72
|
|
|
73
73
|
def normalize(s)
|
|
74
74
|
|
|
75
|
-
|
|
75
|
+
begin
|
|
76
|
+
if Scoutui::Base::UserVars.instance.isTestData?(s)
|
|
76
77
|
|
|
77
|
-
|
|
78
|
-
|
|
78
|
+
_dataID=s.match(/^\s*TestData\((.*)\)\.getData\(.*\)\s*$/)[1].to_s
|
|
79
|
+
_getter=s.match(/^\s*TestData\((.*)\)\.(getData\(.*\))\s*$/)[2].to_s
|
|
79
80
|
|
|
80
|
-
|
|
81
|
-
|
|
81
|
+
return Scoutui::Base::TestData.instance.get(_dataID, _getter)
|
|
82
|
+
end
|
|
82
83
|
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
84
|
+
_vars = s.scan(/(\$\{.*?\})/)
|
|
85
|
+
_vars.each do | _v|
|
|
86
|
+
if _v.length==1
|
|
86
87
|
|
|
87
|
-
|
|
88
|
-
|
|
88
|
+
_u = Scoutui::Base::UserVars.instance.get(_v[0].to_s)
|
|
89
|
+
puts __FILE__ + (__LINE__).to_s + " Normalize(#{_v}) => #{_u}"
|
|
90
|
+
|
|
91
|
+
s.gsub!(_v[0].to_s, _u)
|
|
92
|
+
end
|
|
89
93
|
|
|
90
|
-
s.gsub!(_v[0].to_s, _u)
|
|
91
94
|
end
|
|
92
95
|
|
|
96
|
+
rescue => ex
|
|
97
|
+
puts __FILE__ + (__LINE__).to_s + " #{ex.class}"
|
|
98
|
+
puts ex.backtrace
|
|
93
99
|
end
|
|
94
100
|
|
|
101
|
+
|
|
95
102
|
s
|
|
96
103
|
end
|
|
97
104
|
|
data/lib/scoutui/version.rb
CHANGED