scoutui 2.0.3.19.pre → 2.0.3.20.pre
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/scoutui/base/user_vars.rb +7 -6
- data/lib/scoutui/base/visual_test_framework.rb +1 -1
- data/lib/scoutui/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0f8b3b89ed7280e1c3ed064613df3de9a62da11f
|
|
4
|
+
data.tar.gz: fcb03e4f72428bf31610714be073d45e779e880d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a713c6073cef5f29b5903164af1d3ce5767ae740b2c45df8b4502ecc0e5b11808b92df8f84dbf267da99e1da64afea79f574c8b2ac78de7a6cc6faec8add4afa
|
|
7
|
+
data.tar.gz: 228af1b5a32bb45d76d6c9c2acf9566611bbfd481c4b83616565ac0e0567e92f9026547cb9ec09d75038786c0a9e0713d269594bff274b168fbe882e3027165f
|
|
@@ -90,7 +90,7 @@ module Scoutui::Base
|
|
|
90
90
|
k=:password
|
|
91
91
|
elsif k=='${host}'
|
|
92
92
|
k=:host
|
|
93
|
-
elsif k=='${lang}'
|
|
93
|
+
elsif k=='${lang}' || k=='${__LOC__}' || k=='${LOC}' || '__LOC__'
|
|
94
94
|
k=:lang
|
|
95
95
|
elsif k=='${browser}'
|
|
96
96
|
k=:browser
|
|
@@ -133,11 +133,6 @@ module Scoutui::Base
|
|
|
133
133
|
def getUserVar(_k)
|
|
134
134
|
rc=nil
|
|
135
135
|
|
|
136
|
-
if _k=='${LOC}' || user_var=='${__LOC__}'
|
|
137
|
-
_k = :lang
|
|
138
|
-
end
|
|
139
|
-
|
|
140
|
-
|
|
141
136
|
if @userVars.has_key?(_k)
|
|
142
137
|
rc=@userVars[_k]
|
|
143
138
|
end
|
|
@@ -162,6 +157,12 @@ module Scoutui::Base
|
|
|
162
157
|
if @globals.has_key?(k)
|
|
163
158
|
rc=@globals[k].to_s
|
|
164
159
|
end
|
|
160
|
+
|
|
161
|
+
## TODO: refactor!
|
|
162
|
+
if rc.nil?
|
|
163
|
+
rc = get(k)
|
|
164
|
+
end
|
|
165
|
+
|
|
165
166
|
rc
|
|
166
167
|
end
|
|
167
168
|
|
|
@@ -398,7 +398,7 @@ module Scoutui::Base
|
|
|
398
398
|
puts __FILE__ + (__LINE__).to_s + " Assert user variable - #{user_var} matches #{expected_v} => #{_uservar_val.match(expected_v)}"
|
|
399
399
|
|
|
400
400
|
|
|
401
|
-
if _uservar_val.match(expected_v)
|
|
401
|
+
if _uservar_val.match(expected_v) || _uservar_val==expected_v
|
|
402
402
|
# 5150
|
|
403
403
|
|
|
404
404
|
Scoutui::Logger::LogMgr.instance.asserts.info __FILE__ + (__LINE__).to_s + "Verify conditional assertion #{_k} - #{!_obj.nil?}"
|
data/lib/scoutui/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: scoutui
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.3.
|
|
4
|
+
version: 2.0.3.20.pre
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter Kim
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-07-
|
|
11
|
+
date: 2016-07-08 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|