scoutui 2.0.3.1.pre → 2.0.3.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 764e1580582a3613eaa5cb19302e18e3edcdcd43
-  data.tar.gz: 9812b2dd2de1cd15a3c4e47f580b21e3f603fafe
+  metadata.gz: 581f39c253c65fff0b56a14aeba3aadfc08e787a
+  data.tar.gz: 491f1a5fa80b9d7fd09a91ff4f4f226ce4ad99df
 SHA512:
-  metadata.gz: 666acd132a36a8b3051ab881d17fcd388f4c5c04bd25cc94b82c086d3c234bbb15d96232ba228a4bae1849042cb429a09a0da67b8790c1cc2d26f36dd4a71dcc
-  data.tar.gz: b9fbdcce34acdde5f67cb921111288101cfc9c200a262c0c4f0ef4fdc909915333e7a983eba9797a5b9cab7bb87594b30af2ab1294942aca56aeca4714c12aa4
+  metadata.gz: e7b691217037929862031144decdc1cc042392a6fbb0b84c80bc5659b02c74a381050f35cd9a8eef8885658150cb471012bc68a3f200bde0ab6349a45741652e
+  data.tar.gz: e8b76ed7ddd9fc00004211cd9961e5af3b8406ba1c14d3919b12db93b2f4bd4b35ce8ba72137fad57f4319b2be195dcea12af8482cad394fda978677923c4941

data/README.md

@@ -13,6 +13,17 @@ This project is still in beta, but working - the version '1.0.0' will be the fir
        b. Functional Testing
     
     
+## Development Notes
+    
+    1. Adding a new command
+       a. commands/utils.rb
+          - add in '''initialize()'''
+          - create new functon '''is<CMD>'''
+       b. commands/commands.rb
+          - add '''if stmt''' checking for the command
+          - create then call the new command objects' fcn
+       
+    
 ## Helpful Links
     YouTube
 

data/lib/scoutui/base/q_browser.rb

@@ -93,7 +93,7 @@ module Scoutui::Base
 
 
     # e : Hash : Command stanza from YML
-    def self.swtich_frame(drv, e)
+    def self.switch_frame(drv, e)
       if e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('frames')
         puts __FILE__ + (__LINE__).to_s + " frames => #{e['page']['frames']}";
 
@@ -117,7 +117,16 @@ module Scoutui::Base
 
     def self.findElement(drv, _locator, _frames, _timeout=nil)
 
-      if Scoutui::Commands::Utils.instance.isFrameSearch?
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " findElement(#{_locator}, #{Scoutui::Commands::Utils.instance.getFrameSearch})"
+
+      if Scoutui::Commands::Utils.instance.isSwitchFrame?()
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " FrameSwitch"
+        e={ 'page' => { 'frames' => Scoutui::Commands::Utils.instance.getFrameSearch() } }
+        switch_frame(drv, e)
+        obj = Scoutui::Base::QBrowser.getObject(drv, _locator, _timeout)
+
+      elsif Scoutui::Commands::Utils.instance.isFrameSearch?
         hits = Scoutui::Base::QBrowser.frame_getObject(drv, _locator, _timeout)
 
         puts __FILE__ + (__LINE__).to_s + " hits => #{hits.class} : #{hits}"

data/lib/scoutui/base/user_vars.rb

@@ -7,8 +7,10 @@ module Scoutui::Base
     include Singleton
 
     attr_accessor :globals
+    attr_accessor :userVars
 
     def initialize
+      @userVars={}
       @globals={
           :accounts => '/tmp/qa/accounts.yaml',
           :browser => 'chrome',
@@ -113,6 +115,26 @@ module Scoutui::Base
       v
     end
 
+    def assignUserVar(_k, _v)
+      @userVars[_k] = _v
+    end
+
+    def getUserVar(_k)
+      rc=nil
+      if @userVars.has_key?(_k)
+        rc=@userVars[_k]
+      end
+
+      rc
+    end
+
+    def removeUserVar(_k)
+      if @userVars.has_key?(_k)
+        @userVars.delete(_k)
+      end
+    end
+
+
     def set(k, v)
       setVar(k, v)
       v
@@ -122,6 +144,8 @@ module Scoutui::Base
       @globals[k].to_s
     end
 
+
+
     def setVar(k, v)
       @globals[k]=v
       v

data/lib/scoutui/commands/commands.rb

@@ -45,6 +45,10 @@ module Scoutui::Commands
         _cmd='pause'
         _c = Scoutui::Commands::Pause.new(nil)
         _c.execute(e);
+      elsif Scoutui::Commands::Utils.instance.isAssignVar?(_action)
+        _cmd='assignvar'
+        _c = Scoutui::Commands::AssignVar.new(_action)
+        _c.execute(my_driver, e)
       elsif Scoutui::Commands::Utils.instance.isSelectWindow?(_action)
         _cmd='SelectWindow'
         _c = Scoutui::Commands::SelectWindow.new(_action)

data/lib/scoutui/commands/utils.rb

@@ -14,6 +14,7 @@ module Scoutui::Commands
 
     def initialize
       @command_list=['pause',
+                     'assignvar',
                      'existsAlert',
                      'clickJsAlert',
                      'fillform',
@@ -47,7 +48,8 @@ module Scoutui::Commands
       if stanza.is_a?(Hash) && stanza.has_key?('page') && stanza['page'].has_key?('frames')
         puts __FILE__ + (__LINE__).to_s + " frames => #{stanza['page']['frames']}";
 
-        setEnableFrameSearch(!stanza['page']['frames'].to_s.match(/true/i).nil?)
+        setEnableFrameSearch(stanza['page']['frames'])
+#        setEnableFrameSearch(!stanza['page']['frames'].to_s.match(/true/i).nil?)
       end
     end
 
@@ -64,13 +66,17 @@ module Scoutui::Commands
       @userFrameSearch
     end
 
+    def isSwitchFrame?()
+      @userFrameSearch.is_a?(String) && @userFrameSearch.match(/^\s*frame\s*\(/i)
+    end
+
     def enableFrameSearch()
       Scoutui::Logger::LogMgr.instance.debug "EnableFrameSearch(true)"
       setEnableFrameSearch(true)
     end
 
     def isFrameSearch?()
-      @userFrameSearch
+      @userFrameSearch.is_a?(TrueClass) || (@userFrameSearch.is_a?(String) && @userFrameSearch.match(/true/i))
     end
 
     def isCSS(_locator)
@@ -108,6 +114,11 @@ module Scoutui::Commands
       @timeout.to_i
     end
 
+
+    def isAssignVar?(_action)
+      !_action.match(/assign\(([\w]+)\s*\,(.*)\)\s*$/i).nil?
+    end
+
     def isSelectWindow?(_action)
       Scoutui::Logger::LogMgr.instance.debug  __FILE__ + (__LINE__).to_s + " isSelectWindow?(#{_action})"
       !_action.match(/select_window/i).nil?
@@ -171,6 +182,8 @@ module Scoutui::Commands
 
       if isPause?(cmd)
         @totalCommands['pause']+=1
+      elsif isAssignVar?(cmd)
+        @totalCommands['assignvar']+=1
       elsif isExistsAlert?(cmd)
         @totalCommands['existsAlert']+=1
       elsif isFrame?(cmd)

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.1.pre"
+  VERSION = "2.0.3.2.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.1.pre
+  version: 2.0.3.2.pre
 platform: ruby
 authors:
 - Peter Kim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler