lib/scoutui/commands/utils.rb in scoutui-2.0.5.4 vs lib/scoutui/commands/utils.rb in scoutui-2.0.5.5

@@ -59,10 +59,25 @@
           '__COMPANY.EIN__' => lambda { Faker::Company.ein.to_s },
           '__COUNTRY__' => lambda { Faker::Address.country.to_s },
           '__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") },
+          '__DD/MM/YYYY__' => lambda { Date.parse(Time.now.to_s).strftime("%d/%m/%Y") },
+          '__DD/MM/YYYY\+\d+__' => lambda { |s|
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}"
+            d=s.match(/__DD\/MM\/YYYY\+(\d+)__/)[1]
+            d=(Date.today + d.to_i).strftime("%d/%m/%Y")
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "    new date: #{d}"
+            d
+          },
+          '__DD/MM/YYYY\-\d+__' => lambda { |s|
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}"
+            d=s.match(/__DD\/MM\/YYYY\-(\d+)__/)[1]
+            d=(Date.today - d.to_i).strftime("%d/%m/%Y")
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "    new date: #{d}"
+            d
+          },
           '__MM/DD/YY__' => lambda { Date.parse(Time.now.to_s).strftime("%m/%d/%y") },
           '__MM/DD/YY\+\d+__' => lambda { |s|
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}"
             d=s.match(/__MM\/DD\/YY\+(\d+)__/)[1]
             d=(Date.today + d.to_i).strftime("%m/%d/%y")
@@ -83,10 +98,17 @@
             d=s.match(/__MM\/DD\/YYYY\+(\d+)__/)[1]
             d=(Date.today + d.to_i).strftime("%m/%d/%Y")
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "    new date: #{d}"
             d
           },
+          '__MM/DD/YYYY\-\d+__' => lambda { |s|
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}"
+            d=s.match(/__MM\/DD\/YYYY\-(\d+)__/)[1]
+            d=(Date.today - d.to_i).strftime("%m/%d/%Y")
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "    new date: #{d}"
+            d
+          },
           '__MMDDYYYY__' => lambda { Date.parse(Time.now.to_s).strftime("%m%d%Y") },
           '__MMDDYYYY\+\d+__' => lambda { |s|
             Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}"
             d=s.match(/__MMDDYYYY\+(\d+)__/)[1]
             d=(Date.today + d.to_i).strftime("%m%d%Y")
@@ -249,11 +271,11 @@
     def isSelectWindow?(_action)
       _action.is_a?(String) &&  !_action.match(/^\s*select_window/i).nil?
     end
 
     def isExistsAlert?(_action)
-      _action.is_a?(String) &&  !_action.match(/(exist[s]*_*alert|existAlert|existsAlert|existsJsAlert|existsJsConfirm|existsJsPrompt)\(/i).nil?
+      _action.is_a?(String) &&  !_action.match(/[!]*(exist[s]*_*alert|existAlert|existsAlert|existsJsAlert|existsJsConfirm|existsJsPrompt)\(/i).nil?
     end
 
     def isFrame?(_action)
       _action.is_a?(String) &&  _action.match(/^\s*(frame|switchframe|switch_frame)\s*\(/i)
     end
@@ -261,10 +283,10 @@
     def isHighlight?(_action)
       _action.is_a?(String) &&   _action.match(/^\s*(highlight)/i)
     end
 
     def isVerifyElt?(_action)
-      _action.is_a?(String) && !_action.match(/(verifyelt|verifyelement)\(/i).nil?
+      _action.is_a?(String) && !_action.match(/(verify[eE]lt|verify[eE]lement)\(/i).nil?
     end
 
     def isClick?(_action)
       _action.is_a?(String) &&  !_action.match(/click\(/i).nil?
     end