scoutui 2.0.3.46.pre → 2.0.3.47.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c691428857271925fb5fea46cba6f9509b6f081b
-  data.tar.gz: c65ec3009234e04180a5990ab163c8c17d00ce23
+  metadata.gz: 7f2e05e8583a2bb3f7ab2f96933910804573ff57
+  data.tar.gz: 2d4ffd9211c59b61ceb550f468365d8c4483b8f7
 SHA512:
-  metadata.gz: 4fcf246e1cc2986cd76eb1a1364a14879b6058049a9bcf75db1f81565b7c9091df97f8dbd3afe09dc3a21d822b3968b0858311f91c17f33afd4ad7b766dc4056
-  data.tar.gz: 07aaa24292db0d6eb3d33a6bbeadaa678cf999a812cd0ca7e2f2a154dbf7f586838820322cc64a26e48ccf66875fb34c08818c3e74b58608f951dcdf31511bdf
+  metadata.gz: 775220693e34d5c5c1b7ccd2e0ad9fec7fe77065e5cd6f721bdd39d2462cd8cc649d18e18515f58797d621b4d2e316d4bcb6763758ad3d2b2ca9e6d8c18ebeab
+  data.tar.gz: 95b89eb656deb793fbfe5bddba0687b8121cffa35c2fd594d8a14bc72cdab51d7d09a35bc72b8bec700685d6a7d6600114690e29da780f2b27cb8b5862fc06c0

data/lib/scoutui/base/test_context.rb

@@ -0,0 +1,41 @@
+
+
+require 'singleton'
+
+
+module Scoutui::Base
+
+  class TestContext
+    include Singleton
+
+    attr_accessor :settings
+
+    def initialize
+      @settings={}
+    end
+
+    def add(_id, _v)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " add(#{_id}, #{_v})"
+      @settings[_id]=_v
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => #{@settings[_id]}"
+    end
+
+
+    def set(_id, _v)
+      if @settings.has_key?(_id)
+        @settings[_id]=_v
+      else
+        add(_id, _v)
+      end
+
+      get(_id)
+    end
+
+    def get(_id)
+      @settings[_id]
+    end
+
+  end
+
+
+end

data/lib/scoutui/commands/clauses/then_clause.rb

@@ -0,0 +1,82 @@
+
+module Scoutui::Commands
+
+  class ThenClause
+
+    attr_accessor :drv
+
+    def initialize(driver)
+      @drv=driver
+      @pageElt=nil
+    end
+
+
+    def execute(pageElt)
+      return if pageElt.nil?
+
+      @pageElt=pageElt
+
+      if !pageElt.nil? && pageElt.has_key?('page') && pageElt['page'].has_key?('then')
+        pageElt['page']['then'].each do |_subcmd|
+
+          if _subcmd.is_a?(String)
+
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | then => #{_subcmd}"
+
+            if _subcmd.match(/^\s*press\(__TAB__\)$/)
+              @drv.action.send_keys(:tab).perform
+
+            elsif _subcmd.match(/^\s*press\(__HOLD_SHIFT__\)\s*$/)
+              @drv.action.key_down(:shift).perform
+              Scoutui::Base::TestContext.instance.set(:shift_down, true)
+
+            elsif _subcmd.match(/^\s*press\(__RELEASE_SHIFT__\)\s*$/)
+              @drv.action.key_up(:shift).perform
+              Scoutui::Base::TestContext.instance.set(:shift_down, false)
+
+            elsif _subcmd.match(/^\s*press\(__HOLD_COMMAND__\)$/)
+              @drv.action.key_down(:command).perform
+              Scoutui::Base::TestContext.instance.set(:command_down, true)
+
+            elsif _subcmd.match(/^\s*press\(__RELEASE_COMMAND__\)$/)
+              @drv.action.key_up(:command).perform
+              Scoutui::Base::TestContext.instance.set(:command_down, false)
+
+            elsif _subcmd.match(/^\s*press\(__CONTROL__\)$/)
+
+              @drv.driver.action.key_down(:control).perform
+              @drv.action.key_up(:control).perform
+
+              # Check for list of elements to click
+
+            elsif _subcmd.match(/^\s*press\(__DOWN__\)$/)
+              @drv.action.send_keys(:arrow_down).perform
+
+            elsif _subcmd.match(/^\s*press\(__UP__\)$/)
+              @drv.action.send_keys(:arrow_up).perform
+
+            elsif _subcmd.match(/^\s*press\(__ENTER__\)\s*$/)
+              @drv.action.send_keys(:enter).perform
+
+            elsif _subcmd.match(/^\s*click\((.*)\)\s*$/)
+              # Click on the locator
+
+              _c = Scoutui::Commands::ClickObject.new(_subcmd)
+              _c.run(driver: @drv)
+
+            elsif _subcmd.match(/^\s*press\((.*)\)\s*$/)
+              _locator = _subcmd.match(/^\s*press\((.*)\)\s*$/)[1].to_s
+              _locator = Scoutui::Base::UserVars.instance.normalize(_locator)
+              obj = Scoutui::Base::QBrowser.getElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
+              obj.click
+            end
+
+          end
+        end
+      end
+    end
+
+
+  end
+
+end

data/lib/scoutui/commands/click_object.rb

@@ -4,31 +4,6 @@ module Scoutui::Commands
 
   class ClickObject < Command
 
-    def _then(pageElt)
-      return if pageElt.nil?
-
-      if !pageElt.nil? && pageElt.has_key?('page') && pageElt['page'].has_key?('then')
-        pageElt['page']['then'].each do |_subcmd|
-          if _subcmd.is_a?(String)
-
-
-            puts __FILE__ + (__LINE__).to_s + " | then => #{_subcmd}"
-
-            if _subcmd.match(/^\s*press\(__TAB__\)$/)
-              @drv.action.send_keys(:tab).perform
-            elsif _subcmd.match(/^\s*press\(__DOWN__\)$/)
-              @drv.action.send_keys(:arrow_down).perform
-            elsif _subcmd.match(/^\s*press\(__UP__\)$/)
-              @drv.action.send_keys(:arrow_up).perform
-            elsif _subcmd.match(/^\s*press\(__ENTER__\)\s*$/)
-              @drv.action.send_keys(:enter).perform
-            end
-
-          end
-        end
-      end
-    end
-
     def _whenClicked(page_elt)
 
       return if page_elt.nil?
@@ -58,8 +33,6 @@ module Scoutui::Commands
             puts __FILE__ + (__LINE__).to_s + " => #{_pg}"
           end
 
-#         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " IsVisible #{isVisible} - PAUSE"; gets
-
         end
 
       end
@@ -89,24 +62,6 @@ module Scoutui::Commands
 
         obj = Scoutui::Base::QBrowser.getElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
 
-        if false
-          obj = Scoutui::Base::QBrowser.findElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
-
-          if Scoutui::Base::QBrowser.isStale?(obj) && !_locator.nil?
-
-            wait = Selenium::WebDriver::Wait.new(:timeout =>  Scoutui::Commands::Utils.instance.getTimeout)
-            isDisplayed = wait.until {
-              if Scoutui::Base::QBrowser.isStale?(obj)
-                obj = Scoutui::Base::QBrowser.findElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
-              end
-              true if obj.enabled?
-            }
-
-          end
-        end
-
-
-
         if obj
 
           # Refactor in qbrowser
@@ -143,9 +98,12 @@ module Scoutui::Commands
               _retry = true
               puts __FILE__ + (__LINE__).to_s + " #{_i} => click(#{obj})"
               begin
+
                 obj = Scoutui::Base::QBrowser.getElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
                 @drv.action.move_to(obj).perform
-                bm=Benchmark.measure { obj.click }
+                bm=Benchmark.measure {
+                  obj.click
+                }
                 setBenchmark(bm)
                 _retry = false
                 _clicked=true
@@ -162,7 +120,7 @@ module Scoutui::Commands
 
             page_elt = Scoutui::Utils::TestUtils.instance.getPageElement(_locator)
 
-            Scoutui::Logger::LogMgr.instance.debug "PageElement(#{_locator}) => #{page_elt}"
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " PageElement(#{_locator}) => #{page_elt}"
 
             if all_windows > @drv.window_handles.size
               Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " WINDOW was CLOSED.  Activate first window as our default";
@@ -171,7 +129,15 @@ module Scoutui::Commands
             end
 
             _whenClicked(page_elt)
-            _then(page_elt)
+
+            if e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('then')
+              thenClause = Scoutui::Commands::ThenClause.new(@drv)
+              Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " thenClause => #{thenClause.class}"
+              thenClause.execute(e)
+            end
+
+
+          #  _then(e)
 
           else
             Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Unable to click object that is not displayed."
@@ -181,7 +147,7 @@ module Scoutui::Commands
 
       rescue => ex
         Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " #{ex.class.to_s} : Error during processing: #{ex.message}"
-        Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+        Scoutui::Logger::LogMgr.instance.warn " Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 
       Scoutui::Logger::LogMgr.instance.asserts.info "Verify object to click exists #{_locator} : #{obj.class.to_s} - #{!obj.nil?.to_s}"

data/lib/scoutui/commands/commands.rb

@@ -119,14 +119,8 @@ module Scoutui::Commands
       elsif Scoutui::Commands::Utils.instance.isClick?(_action)
         _cmd='Click'
         _c = Scoutui::Commands::ClickObject.new(_action)
-
         _c.run(driver: my_driver, dut: e)
 
-
-        if e[STEP_KEY].has_key?('then')
-          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " then => #{e[STEP_KEY]['then]']}"
-        end
-
       elsif Scoutui::Commands::Utils.instance.isExistsAlert?(_action)
         _cmd='ExistsAlert'
         _c = Scoutui::Commands::JsAlert::ExistsAlert.new(_action)

data/lib/scoutui/commands/type.rb

@@ -197,24 +197,8 @@ module Scoutui::Commands
 
 
                 if !pageElt.nil? && pageElt['page'].has_key?('then')
-                  pageElt['page']['then'].each do |_subcmd|
-                    if _subcmd.is_a?(String)
-
-
-                      puts __FILE__ + (__LINE__).to_s + " | then => #{_subcmd}"
-
-                      if _subcmd.match(/^\s*press\(__TAB__\)$/)
-                        @drv.action.send_keys(:tab).perform
-                      elsif _subcmd.match(/^\s*press\(__DOWN__\)$/)
-                        @drv.action.send_keys(:arrow_down).perform
-                      elsif _subcmd.match(/^\s*press\(__UP__\)$/)
-                        @drv.action.send_keys(:arrow_up).perform
-                      elsif _subcmd.match(/^\s*press\(__ENTER__\)\s*$/)
-                        @drv.action.send_keys(:enter).perform
-                      end
-
-                    end
-                  end
+                  thenClause = Scoutui::Commands::ThenClause.new(@drv)
+                  thenClause.execute(pageElt)
                 end
 
                 if !obj.nil? && false

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.46.pre"
+  VERSION = "2.0.3.47.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.46.pre
+  version: 2.0.3.47.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -287,12 +287,14 @@ files:
 - lib/scoutui/base/q_browser.rb
 - lib/scoutui/base/q_form.rb
 - lib/scoutui/base/requirements.rb
+- lib/scoutui/base/test_context.rb
 - lib/scoutui/base/test_data.rb
 - lib/scoutui/base/test_scout.rb
 - lib/scoutui/base/test_settings.rb
 - lib/scoutui/base/user_vars.rb
 - lib/scoutui/base/visual_test_framework.rb
 - lib/scoutui/commands/assign_var.rb
+- lib/scoutui/commands/clauses/then_clause.rb
 - lib/scoutui/commands/click_object.rb
 - lib/scoutui/commands/command.rb
 - lib/scoutui/commands/commands.rb