scoutui 2.0.3.26.pre → 2.0.3.27.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c6783826768bc5977a384aa09b0e27983ad1288
-  data.tar.gz: 42feaae713b7d18c646bb03ae2a69a2486426868
+  metadata.gz: 37b1175369a59e9350230640e61d16c8e4b07157
+  data.tar.gz: 61c8e5e6f3881bd7e9ead889462350c9daefee7d
 SHA512:
-  metadata.gz: 981d41edbbe8bc9d4b2139653eb30cdbb0b32adebe99962b41fff99cfaa99ba9a5149bd6ff8d12e68205f7c252dbde42cc33c925369cd6cf1ce32312f2f343f7
-  data.tar.gz: faeb7c953e1eb6cfd5b83d12f2bcc5e12a14cb7749f213e0e31bbb54ee562eaa65c01f5685471a334208b4ce1415124f3662a93ac8c1ce61d27cad66085466bb
+  metadata.gz: f4eae3d81fe52c0dca46b80b4cb5fe7fae9327cf0347cf71bffbfd9909942355e7dd07cbf09de1fe19ab60ca044c3c09e60d084004be6b7405ba048fbb6dfecf
+  data.tar.gz: 27c90d5181e08d5cb8551ec3c962d26e0b6061a82d2ddf3e6520ef2c9af88af49e8d1d686a39a0ae7a350f687c3a7427d8ad87b602b11e156e923b43e4f44046

data/lib/scoutui/base/assertions.rb

@@ -15,6 +15,26 @@ module Scoutui::Base
       @drv=_drv
     end
 
+    def isEnabledCmd?(_a)
+      _a.is_a?(String) && _a.match(/^\s*[!]*isEnabled\((.*)\)\s*$/i)
+    end
+
+    def isRoleCmd?(_a)
+      _a.is_a?(String) && _a.match(/^\s*(isrole|role)\(.*\)\s*/i)
+    end
+
+    def isSelectedCmd?(_a)
+      _a.is_a?(String) && _a.match(/^\s*[!]*(isSelected|selected)\((.*)\)\s*$/i)
+    end
+
+    def isValueCmd?(_a)
+      _a.is_a?(String) && _a.match(/^\s*(value|text)\s*\(.*\)\s*\=\s*(.*)/i)
+    end
+
+    def isVisibleCmd?(_a)
+      _a.is_a?(String) && _a.match(/^\s*[!]*visible\((.*)\)\s*$/i)
+    end
+
     def isValue?(my_driver, page_elt)
 
       rc = false

data/lib/scoutui/base/visual_test_framework.rb

@@ -847,35 +847,35 @@ module Scoutui::Base
             _execute_when.each do |_a|
               Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " exeucute_when => #{_a}"
 
-              if _a.is_a?(String) && _a.match(/^\s*[!]*isEnabled\((.*)\)\s*$/i)
+              if Scoutui::Base::Assertions.instance.isEnabledCmd?(_a)
                 if !Scoutui::Base::Assertions.instance.isEnabled?(my_driver, _a)
                   Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEnabled #{_e} : failed"
                   _executeIt=false
                 end
 
 
-              elsif _a.is_a?(String) && _a.match(/^\s*(isrole|role)\(.*\)\s*/i)
+              elsif Scoutui::Base::Assertions.instance.isRoleCmd?(_a)
 
                 if !Scoutui::Base::Assertions.instance.isRole?(_a)
                   Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isRole #{_a} : failed"
                   _executeIt = false
                 end
 
-              elsif _a.is_a?(String) && _a.match(/^\s*[!]*visible\((.*)\)\s*$/i)
+              elsif Scoutui::Base::Assertions.instance.isVisibleCmd?(_a)
 
                 if !Scoutui::Base::Assertions.instance.isVisible?(my_driver, _a)
                   Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " visible #{_a} : failed"
                   _executeIt = false
                 end
 
-              elsif _a.is_a?(String) && _a.match(/^\s*[!]*(isSelected|selected)\((.*)\)\s*$/i)
+              elsif Scoutui::Base::Assertions.instance.isSelectedCmd?(_a)
 
                 if !Scoutui::Base::Assertions.instance.isSelected?(my_driver, _a)
                   Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isSelected => false"
                   _executeIt=false
                 end
 
-              elsif _a.is_a?(String) && _a.match(/(value|text)\s*\(.*\)\s*\=\s*(.*)/i)
+              elsif Scoutui::Base::Assertions.instance.isValueCmd?(_a)
 
                 if !Scoutui::Base::Assertions.instance.isValue?(my_driver, _a)
                   Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " value doesnt match"
@@ -964,13 +964,23 @@ module Scoutui::Base
                 Scoutui::Utils::TestUtils.instance.setState(:abort)
                 return
               end
-              Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Command #{_action} was already executed"
+              Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Command #{_action} was already executed in Strategy"
             end
 
             processExpected(my_driver, e)
 
             processAssertions(my_driver, e)
 
+            if e[STEP_KEY].has_key?('saveas')
+              # processSaveAs(e)
+
+              puts __FILE__ + (__LINE__).to_s + " == Process SaveAs =="
+              _saveAs = e[STEP_KEY]['saveas']['file'].to_s
+              _f=File.open(_saveAs, 'w')
+              _f.puts e[STEP_KEY]['saveas']['data'].to_json
+              _f.close
+            end
+
 
             if isSnapIt(e)
 

data/lib/scoutui/commands/click_object.rb

@@ -92,6 +92,7 @@ module Scoutui::Commands
             @drv.action.move_to(obj).perform
 
             bm=Benchmark.measure { obj.click }
+            setBenchmark(bm)
 
             _clicked=true
 
@@ -123,7 +124,7 @@ module Scoutui::Commands
       Testmgr::TestReport.instance.getReq(_req).testcase('click').add(!obj.nil?, "Verify object to click exists #{_locator} : #{obj.class.to_s}")
       Testmgr::TestReport.instance.getReq(_req).testcase('click').add(_clicked, "Verify clicked #{_locator}")
 
-      setBenchmark(bm)
+
       setResult(_clicked)
     end
 

data/lib/scoutui/commands/command.rb

@@ -53,6 +53,10 @@ module Scoutui::Commands
       @locator
     end
 
+    def setBenchmark(b)
+      @bm=b
+    end
+
     def passed?
       !@executed_result.nil? && @executed_result
     end

data/lib/scoutui/commands/utils.rb

@@ -48,6 +48,15 @@ module Scoutui::Commands
           '__DATE__' => lambda { Time.now().to_s },
           '__EMAIL__' => lambda { Faker::Internet.email.to_s},
           '__DDMMYY__' => lambda { Date.parse(Time.now.to_s).strftime("%d%m%Y") },
+          '__MMDDYY__' => lambda { Date.parse(Time.now.to_s).strftime("%m%d%y") },
+          '__MMDDYY\+\d+__' => lambda { |s|
+            puts __FILE__ + (__LINE__).to_s + " Process s => #{s}"
+            d=s.match(/__MMDDYY\+(\d+)__/)[1]
+            d=(Date.today + d.to_i).strftime("%m%d%y")
+            puts __FILE__ + (__LINE__).to_s + "    new date: #{d}"
+            d
+          },
+          '__MMDDYYYY__' => lambda { Date.parse(Time.now.to_s).strftime("%m%d%Y") },
           '__PARAGRAPH__' => lambda { Faker::Lorem.paragraph.to_s },
           '__PASSWORD__' => lambda { Faker::Internet.password.to_s },
           '__PHONENUMBER__' => lambda { Faker::PhoneNumber.phone_number.to_s },
@@ -94,6 +103,9 @@ module Scoutui::Commands
         if _text_to_type.include?(_k.to_s)
           _dynamicStr = _v.call.to_s
           _text_to_type.gsub!(_k.to_s, _dynamicStr)
+        elsif _text_to_type.match(/#{_k.to_s}/)
+          _dynamicStr = _v.call(_text_to_type.to_s)
+          _text_to_type.gsub!(/#{_k.to_s}/, _dynamicStr)
         end
       end
 

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.26.pre"
+  VERSION = "2.0.3.27.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.26.pre
+  version: 2.0.3.27.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler