scoutui 2.0.3.23.pre → 2.0.3.24.pre

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fe85fac93b46b9a34eb4d49056c29d341f4f1433
4
- data.tar.gz: 1eee5efac7e933568c91f1210349187c92d1a8f4
3
+ metadata.gz: c55b2a4b345d1aa79dc5d04766d2d280ce4c7b07
4
+ data.tar.gz: 8f67dcd666962bb28e42abf885ad6125f3d67b30
5
5
  SHA512:
6
- metadata.gz: a4b460f3f6e5c42a41204b651c7a41dc1a8cd1d040473fc71ed036605cc48def58771c588953d17870e558b374a8492278d67403eec041c9cf81677bef39aa94
7
- data.tar.gz: 4de0b676a2ad569aad0bb73900b0c3deece6fd9a4824fae5ff6d6448162edfa659ead42e3600f62740fac3ed5f367730c73249feb48987b0e50f3ee62c20ccaa
6
+ metadata.gz: 27a262f79300605d16d7b3d03dcad96e65e2a83155dc8035ade133a1b8ceec2aead811bd7227798388d0809ca763e7095b00b034cfc01c75da902755727a39ec
7
+ data.tar.gz: 27dec24457a1defbdb8f8d452112d562acf612df31ec2a39129fe64cfa626f47637238ed588a30ed26da8399a9a17a0ecbd471c9761fe17f16aec414d83b37a8
@@ -12,8 +12,8 @@ module Scoutui::Commands
12
12
 
13
13
  _req = Scoutui::Utils::TestUtils.instance.getReq()
14
14
 
15
- _uservar = @cmd.match(/assign\(([\w]+)\s*\,(.*)\)\s*$/)[1].to_s.strip
16
- _condition = @cmd.match(/assign\(([\w]+)\s*\,(.*)\)\s*$/)[2].to_s.strip
15
+ _uservar = @cmd.match(/^\s*assign\(([\w]+)\s*\,(.*)\)\s*$/)[1].to_s.strip
16
+ _condition = @cmd.match(/^\s*assign\(([\w]+)\s*\,(.*)\)\s*$/)[2].to_s.strip
17
17
 
18
18
  Scoutui::Logger::LogMgr.instance.command.info __FILE__ + (__LINE__).to_s + " assignVar => #{_uservar} : #{_condition}"
19
19
 
@@ -25,7 +25,7 @@ module Scoutui::Commands
25
25
  Scoutui::Logger::LogMgr.instance.command.info __FILE__ + (__LINE__).to_s + " | translate : #{_locator}" if Scoutui::Utils::TestUtils.instance.isDebug?
26
26
  obj = Scoutui::Base::QBrowser.findElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(), Scoutui::Commands::Utils.instance.getTimeout)
27
27
  else
28
- Scoutui::Base::UserVars.instance.setVar(_uservar, _condition)
28
+ Scoutui::Base::UserVars.instance.setVar(_uservar, Scoutui::Commands::Utils.instance.expandMacro(_condition))
29
29
  rc=_condition
30
30
  end
31
31
 
@@ -126,61 +126,7 @@ module Scoutui::Commands
126
126
  _text_to_type = Scoutui::Base::UserVars.instance.get(_v2)
127
127
 
128
128
  puts __FILE__ + (__LINE__).to_s + " rawText : #{_text_to_type}"
129
-
130
-
131
- transList={
132
- '__CHAR10__' => lambda { },
133
- '__CITY__' => lambda { Faker::Address.city.to_s },
134
- '__COMPANY.NAME__' => lambda { Faker::Company.name.to_s },
135
- '__COMPANY.EIN__' => lambda { Faker::Company.ein.to_s },
136
- '__COUNTRY__' => lambda { Faker::Address.country.to_s },
137
- '__DATE__' => lambda { Time.now().to_s },
138
- '__EMAIL__' => lambda { Faker::Internet.email.to_s},
139
- '__DDMMYY__' => lambda { Date.parse(Time.now.to_s).strftime("%d%m%Y") },
140
- '__PARAGRAPH__' => lambda { Faker::Lorem.paragraph.to_s },
141
- '__PASSWORD__' => lambda { Faker::Internet.password.to_s },
142
- '__PHONENUMBER__' => lambda { Faker::PhoneNumber.phone_number.to_s },
143
- '__PHONENUMBER.AREACODE__' => lambda { Faker::Config.locale = 'en-US'; Faker::PhoneNumber.area_code.to_s },
144
- '__PHONENUMBER.EXCHANGE__' => lambda { Faker::Config.locale = 'en-US'; Faker::PhoneNumber.exchange_code.to_s },
145
- '__PHONENUMBER.SUBSCRIBER__' => lambda { Faker::PhoneNumber.subscriber_number.to_s },
146
- '__PHONENUMBER.EXT__' => lambda { Faker::PhoneNumber.extension.to_s },
147
- '__NUMBER__' => lambda { Faker::Number.number(5).to_s},
148
- '__NUMBER(1)__' => lambda { Faker::Number.number(1).to_s},
149
- '__NUMBER(2)__' => lambda { Faker::Number.number(2).to_s},
150
- '__NUMBER(5)__' => lambda { Faker::Number.number(5).to_s},
151
- '__NUMBER(8)__' => lambda { Faker::Number.number(8).to_s},
152
- '__NUMBER(10)__' => lambda { Faker::Number.number(10).to_s},
153
- '__NUMBER(1,28)__' => lambda { Faker::Number.between(1, 28).to_s },
154
- '__NUMBER(1, 28)__' => lambda { Faker::Number.between(1, 28).to_s },
155
- '__NUMBER(1,29)__' => lambda { Faker::Number.between(1, 29).to_s },
156
- '__NUMBER(1, 29)__' => lambda { Faker::Number.between(1, 29).to_s },
157
- '__NUMBER(1,30)__' => lambda { Faker::Number.between(1, 30).to_s },
158
- '__NUMBER(1, 30)__' => lambda { Faker::Number.between(1, 30).to_s },
159
- '__NUMBER(1,31)__' => lambda { Faker::Number.between(1, 31).to_s },
160
- '__NUMBER(1, 31)__' => lambda { Faker::Number.between(1, 31).to_s },
161
- '__SENTENCE__' => lambda { Faker::Lorem.sentence.to_s },
162
- '__STREET__' => lambda { Faker::Address.street_address.to_s},
163
- '__STATE__' => lambda { Faker::Address.state.to_s },
164
- '__TIME__' => lambda { Time.now.to_s },
165
- '__TIME.MMDDYY__' => lambda { Time.now.strftime "%m%d%y" },
166
- '__TIME.MMDDYY.HM__' => lambda { Time.now.strftime "%m%d%y.%H%M" },
167
- '__TIME.MMDDYY.HMS__' => lambda { Time.now.strftime "%m%d%y.%H%M%S" },
168
- '__USERNAME__' => lambda { Faker::Internet.user_name.to_s },
169
- '__ZIP__' => lambda { Faker::Address.zip_code.to_s },
170
- }
171
-
172
- transList.each_pair do |_k, _v|
173
-
174
- if _text_to_type.include?(_k.to_s)
175
- _dynamicStr = _v.call.to_s
176
- puts __FILE__ + (__LINE__).to_s + " Dyanmic: #{_dynamicStr}"
177
- _text_to_type.gsub!(_k.to_s, _dynamicStr)
178
- else
179
- puts __FILE__ + (__LINE__).to_s + " **** #{_k.to_s} not found"
180
- end
181
- end
182
-
183
-
129
+ _text_to_type = Scoutui::Commands::Utils.instance.expandMacro(_text_to_type)
184
130
  puts __FILE__ + (__LINE__).to_s + " Text to type : #{_text_to_type}"
185
131
  obj.send_keys(_text_to_type)
186
132
 
@@ -38,10 +38,72 @@ module Scoutui::Commands
38
38
 
39
39
  @useFrameSearch = false
40
40
 
41
+
42
+ @transList={
43
+ '__CHAR10__' => lambda { },
44
+ '__CITY__' => lambda { Faker::Address.city.to_s },
45
+ '__COMPANY.NAME__' => lambda { Faker::Company.name.to_s },
46
+ '__COMPANY.EIN__' => lambda { Faker::Company.ein.to_s },
47
+ '__COUNTRY__' => lambda { Faker::Address.country.to_s },
48
+ '__DATE__' => lambda { Time.now().to_s },
49
+ '__EMAIL__' => lambda { Faker::Internet.email.to_s},
50
+ '__DDMMYY__' => lambda { Date.parse(Time.now.to_s).strftime("%d%m%Y") },
51
+ '__PARAGRAPH__' => lambda { Faker::Lorem.paragraph.to_s },
52
+ '__PASSWORD__' => lambda { Faker::Internet.password.to_s },
53
+ '__PHONENUMBER__' => lambda { Faker::PhoneNumber.phone_number.to_s },
54
+ '__PHONENUMBER.AREACODE__' => lambda { Faker::Config.locale = 'en-US'; Faker::PhoneNumber.area_code.to_s },
55
+ '__PHONENUMBER.EXCHANGE__' => lambda { Faker::Config.locale = 'en-US'; Faker::PhoneNumber.exchange_code.to_s },
56
+ '__PHONENUMBER.SUBSCRIBER__' => lambda { Faker::PhoneNumber.subscriber_number.to_s },
57
+ '__PHONENUMBER.EXT__' => lambda { Faker::PhoneNumber.extension.to_s },
58
+ '__NUMBER__' => lambda { Faker::Number.number(5).to_s},
59
+ '__NUMBER(1)__' => lambda { Faker::Number.number(1).to_s},
60
+ '__NUMBER(2)__' => lambda { Faker::Number.number(2).to_s},
61
+ '__NUMBER(5)__' => lambda { Faker::Number.number(5).to_s},
62
+ '__NUMBER(8)__' => lambda { Faker::Number.number(8).to_s},
63
+ '__NUMBER(10)__' => lambda { Faker::Number.number(10).to_s},
64
+ '__NUMBER(1,28)__' => lambda { Faker::Number.between(1, 28).to_s },
65
+ '__NUMBER(1, 28)__' => lambda { Faker::Number.between(1, 28).to_s },
66
+ '__NUMBER(1,29)__' => lambda { Faker::Number.between(1, 29).to_s },
67
+ '__NUMBER(1, 29)__' => lambda { Faker::Number.between(1, 29).to_s },
68
+ '__NUMBER(1,30)__' => lambda { Faker::Number.between(1, 30).to_s },
69
+ '__NUMBER(1, 30)__' => lambda { Faker::Number.between(1, 30).to_s },
70
+ '__NUMBER(1,31)__' => lambda { Faker::Number.between(1, 31).to_s },
71
+ '__NUMBER(1, 31)__' => lambda { Faker::Number.between(1, 31).to_s },
72
+ '__SENTENCE__' => lambda { Faker::Lorem.sentence.to_s },
73
+ '__STREET__' => lambda { Faker::Address.street_address.to_s},
74
+ '__STATE__' => lambda { Faker::Address.state.to_s },
75
+ '__TIME__' => lambda { Time.now.to_s },
76
+ '__TIME.MMDDYY__' => lambda { Time.now.strftime "%m%d%y" },
77
+ '__TIME.MMDDYY.HM__' => lambda { Time.now.strftime "%m%d%y.%H%M" },
78
+ '__TIME.MMDDYY.HMS__' => lambda { Time.now.strftime "%m%d%y.%H%M%S" },
79
+ '__USERNAME__' => lambda { Faker::Internet.user_name.to_s },
80
+ '__ZIP__' => lambda { Faker::Address.zip_code.to_s },
81
+ }
82
+
41
83
  @hwnds = { :current => nil, :previous => nil, :handles => [] }
42
84
  end
43
85
 
44
86
 
87
+ def expandMacro(_text_to_type)
88
+
89
+ Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " expandMacro(#{_text_to_type})"
90
+
91
+
92
+ @transList.each_pair do |_k, _v|
93
+
94
+ if _text_to_type.include?(_k.to_s)
95
+ _dynamicStr = _v.call.to_s
96
+ _text_to_type.gsub!(_k.to_s, _dynamicStr)
97
+ end
98
+ end
99
+
100
+ puts __FILE__ + (__LINE__).to_s + " Text to type : #{_text_to_type}"
101
+
102
+ _text_to_type.to_s
103
+
104
+ end
105
+
106
+
45
107
  def reset(stanza=nil)
46
108
 
47
109
  setEnableFrameSearch(false)
@@ -1,3 +1,3 @@
1
1
  module Scoutui
2
- VERSION = "2.0.3.23.pre"
2
+ VERSION = "2.0.3.24.pre"
3
3
  end
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.23.pre
4
+ version: 2.0.3.24.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-13 00:00:00.000000000 Z
11
+ date: 2016-07-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler