scoutui 2.0.3.44.pre → 2.0.3.45.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91a8993f5c845bd67a31b1781ffe9c9d8638974a
-  data.tar.gz: 7d40b45a17bf991aa6732305534356ebe944ef03
+  metadata.gz: cf2a6c8f7fed5394754a56afa37bee22ff74ba1a
+  data.tar.gz: 66c65e7645d09382c04df78cd9cbb40cef269401
 SHA512:
-  metadata.gz: 3fb9559720831f36e8b8d583e6c98c2d80ce8670a7c2c32612802ef78a4ef1e0327c1670d7bcd42e270a3cf68d25a6810773f7f0ce417ace73a3978d47e7b862
-  data.tar.gz: 1f332172c1af3ce2f00d046b01f655619a0832b447323bd0761f8f27c2ed8112c385a69497bf8dc5a8d1a8d3408308caf9978ac2391d2d48c3b1a549adc92ec8
+  metadata.gz: 0f4e0e6068158b6de68193d22a09ce266a47db99aa715722c98907b731d687f287c5b78f45bd94eb4f31ff3cc2dc031b3dbe0fa763d6f13c3de65283e36f3658
+  data.tar.gz: 276d5a3c852bde0b4bcbfeeec33a5a3802b0c5432ca7fad57fa57be4541d867b7c3b14b04f71b7992edcf57a4ed502e1e4c494c3c7bc0c9bf00240e6c5235625

data/examples/cmdshell/commands/cmd.yml

@@ -0,0 +1,92 @@
+page:
+  name: Define ls command
+  description: Define a command and assign it an identifier
+  action: defineCommand
+  id: LS
+  commands: "/tmp/hello.sh"
+---
+page:
+  name: Exeucte a defined command
+  description: Execute a command(s) by referencing its id.
+  comment: yml[n]['page']['commands'][n]['id']
+  action: executeCommands
+  commands:
+    - id: LS
+      asserts:
+         - /Peter/
+         - /ScoutUI
+---
+page:
+  name: GetExit
+  description: GetExit
+  action: getExitStatus
+  id: LS
+---
+page:
+  name: Retrieve results for LS
+  getResults:
+    id: LS
+---
+page:
+  name: Extract specific values from results
+  getResults:
+    id: LS
+    capture: /(World)/
+    assignto: myHit
+---
+page:
+  name: Type
+  action: type(//*[@id='uh-search-box'], ${myHit})
+---
+page:
+  name: Pause after LS
+  action: pause
+  skip: false
+---
+page:
+  name: Load command with action
+  action: defineCommand
+  id: findTmp
+  commands: whoami
+---
+page:
+  name: Define command with multiple cmds
+  action: defineCommand
+  id: MultiLs
+  commands:
+   - ls
+   - echo "ScoutUI"
+---
+page:
+  name: Execute cmd with multple commands
+  command:
+    id: MultiLs
+---
+page:
+  name: Retrieve results
+  getResults:
+    id: MultiLs
+---
+page:
+  name: Execute
+  command:
+   id: findTmp
+---
+page:
+  name: Retrieve findTmp
+  getResults:
+   id: findTmp
+---
+page:
+  name: Pause after findTmp
+  action: pause
+  skip: false
+---
+page:
+  name: Retrieve
+  getResults:
+    id: LS
+---
+page:
+  action: pause
+  skip: false

data/examples/shell/run_shell.rb

@@ -0,0 +1,45 @@
+
+
+class RunShell
+
+  attr_accessor :cmd
+  attr_accessor :results
+  attr_accessor :exitStatus
+
+  def initialize(_c=nil)
+    @exitStatus=nil
+    @cmd=_c
+  end
+
+
+  def execute(opts=nil)
+    @results=nil
+
+    if @cmd.match(/.*\.(sh|ksh|csh)\s*$/i)
+      puts " execute script  #{@cmd} #{opts.to_s}"
+      @results = %x[ #{@cmd} #{opts.to_s} ]
+    else
+      @results = %x[ #{@cmd} #{opts.to_s} ]
+    end
+    @exitStatus = $?.exitstatus
+
+    puts "results => #{@results}"
+    puts "exist   => #{@exitStatus}"
+  end
+
+  def results
+    @results
+  end
+
+end
+
+
+
+
+shell = RunShell.new("./runit.sh")
+shell.execute("Hello World")
+
+cmd2 = RunShell.new("ls -lta")
+cmd2.execute("/tmpxxx")
+
+puts "Results => #{cmd2.results}"

data/examples/shell/runit.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+echo "Running from a shell"
+

data/lib/scoutui/base/visual_test_framework.rb

@@ -1,4 +1,5 @@
 #require 'testmgr'
+require 'CmdShellMgr'
 
 module Scoutui::Base
 
@@ -1019,6 +1020,39 @@ module Scoutui::Base
           next
         end
 
+        if e[STEP_KEY].has_key?('load') && e[STEP_KEY]['load'].has_key?('command')
+          _id = e[STEP_KEY]['load']['id'].to_s
+          _c = e[STEP_KEY]['load']['command'].to_s
+          CmdShellMgr::DSL.instance.cmd(:cmd => "command(#{_id}, #{_c})")
+          next
+        end
+
+        if e[STEP_KEY].has_key?('command')
+          _id = e[STEP_KEY]['command']['id'].to_s
+          _rc=CmdShellMgr::DSL.instance.cmd(:cmd => "execute(#{_id})")
+          puts __FILE__ + (__LINE__).to_s + " rc => #{_rc}"
+          next
+        end
+
+        if e[STEP_KEY].has_key?('getResults')
+          _id = e[STEP_KEY]['getResults']['id'].to_s
+          _rc = CmdShellMgr::DSL.instance.cmd(:cmd => "getResults(#{_id})")
+          puts __FILE__ + (__LINE__).to_s + " rc => #{_rc}"
+
+          if e[STEP_KEY]['getResults'].has_key?('capture')
+            m2=CmdShellMgr::DSL.instance.cmd(:cmd => "getResult(#{_id}).capture(#{e[STEP_KEY]['getResults']['capture'].to_s})")
+            puts __FILE__ + (__LINE__).to_s + " Capture => #{m2}"
+
+
+            if e[STEP_KEY]['getResults'].has_key?('assignto')
+              Scoutui::Base::UserVars.instance.setVar(e[STEP_KEY]['getResults']['assignto'], m2)
+            end
+          end
+
+
+          next
+        end
+
 
         if !isRun(e).nil?
 

data/lib/scoutui/commands/commands.rb

@@ -51,6 +51,16 @@ module Scoutui::Commands
         _c = Scoutui::Commands::Pause.new(nil)
         _c.execute(e);
 
+      elsif Scoutui::Commands::Utils.instance.isExecuteCommands?(_action)
+        _cmd='executecommands'
+        _c = Scoutui::Commands::ExecuteCommands.new(e)
+        _c.run(driver: my_driver, dut: e)
+
+      elsif Scoutui::Commands::Utils.instance.isDefineCommands?(_action)
+        _cmd='definecommands'
+        _c = Scoutui::Commands::DefineCommands.new(e)
+        _c.run(driver: my_driver, dut: e)
+
       elsif Scoutui::Commands::Utils.instance.isLoadDB?(_action)
         _cmd='loaddb'
         _c = Scoutui::Commands::LoadDB.new(e)

data/lib/scoutui/commands/define_commands.rb

@@ -0,0 +1,73 @@
+require_relative './commands'
+
+module Scoutui::Commands
+
+  class DefineCommands < Command
+
+
+    def execute(drv, e=nil)
+      @drv=drv if !drv.nil?
+
+      rc=false
+      obj=nil
+      _locator=nil
+
+      _req = Scoutui::Utils::TestUtils.instance.getReq()
+
+      begin
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " DefineCommand()"
+
+        if e['page'].has_key?('id') && e['page'].has_key?('commands')
+
+          id=e['page']['id'].to_s
+          commands = e['page']['commands']
+          puts __FILE__ + (__LINE__).to_s + " id, commands => #{id}, #{commands}"
+
+
+          c=nil
+
+          if e['page']['commands'].is_a?(String)
+            c=CmdShellMgr::DSL.instance.cmd(:cmd => "command(#{e['page']['id'].to_s}, #{e['page']['commands'].to_s})")
+          elsif e['page']['commands'].is_a?(Array)
+
+            _cmd=""
+            e['page']['commands'].each do |r|
+              _cmd = _cmd + r.to_s + ";"
+            end
+
+            puts __FILE__ + (__LINE__).to_s + " command(#{e['page']['id'].to_s}, #{_cmd})"
+            c=CmdShellMgr::DSL.instance.cmd(:cmd => "command(#{e['page']['id'].to_s}, #{_cmd})")
+
+
+          else
+            puts __FILE__ + (__LINE__).to_s + " Unknown DSL cmd"
+
+          end
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " c => #{c.class}"
+
+
+          rc=true
+
+        end
+
+
+      rescue => ex
+        Scoutui::Logger::LogMgr.instance.warn "Error during processing: #{ex}"
+        Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+      end
+
+      if rc
+        Scoutui::Logger::LogMgr.instance.asserts.info "Verify loadCommands passed - #{rc}"
+        Testmgr::TestReport.instance.getReq(_req).testcase('click').add(rc, "Verify loadCommands command passed")
+      end
+
+      setResult(rc)
+    end
+
+  end
+
+
+
+end

data/lib/scoutui/commands/execute_commands.rb

@@ -0,0 +1,74 @@
+require_relative './commands'
+
+module Scoutui::Commands
+
+  class ExecuteCommands < Command
+
+
+    def execute(drv, e=nil)
+      @drv=drv if !drv.nil?
+
+      rc=false
+      _locator=nil
+
+      _req = Scoutui::Utils::TestUtils.instance.getReq()
+
+      begin
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ExecuteCommands(#{e})"
+
+        if e['page'].has_key?('commands')
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " [commands] => #{e['page']['commands'].class}"
+
+          c=nil
+
+          if e['page']['commands'].is_a?(String)
+            c=CmdShellMgr::DSL.instance.cmd(:cmd => "execute(#{e['page']['commands'].to_s})")
+          elsif e['page']['commands'].is_a?(Array)
+
+            e['page']['commands'].each do |_cmd|
+
+              if !_cmd.nil?
+                _id = _cmd['id'].to_s
+                Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " execute(#{_id})"
+                c=CmdShellMgr::DSL.instance.cmd(:cmd => "execute(#{_id})")
+
+                if c.is_a?(CmdShellMgr::Command) && _cmd.has_key?('asserts')
+                  _cmd['asserts'].each do |_a|
+                    Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " assert => #{_a}"
+                  end
+                end
+
+              end
+
+            end
+
+
+          else
+            puts __FILE__ + (__LINE__).to_s + " Unknown DSL cmd"
+          end
+
+          rc=c.is_a?(CmdShellMgr::Command)
+
+        end
+
+
+      rescue => ex
+        Scoutui::Logger::LogMgr.instance.warn "Error during processing: #{ex}"
+        Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+      end
+
+      if rc
+        Scoutui::Logger::LogMgr.instance.asserts.info "Verify executeCommands passed - #{rc}"
+        Testmgr::TestReport.instance.getReq(_req).testcase('click').add(rc, "Verify loadCommands command passed")
+      end
+
+      setResult(rc)
+    end
+
+  end
+
+
+
+end

data/lib/scoutui/commands/utils.rb

@@ -27,6 +27,8 @@ module Scoutui::Commands
                      'loaddata',
                      'connect',
                      'loaddb',
+                     'executecommands',
+                     'definecommands',
                      'loadrequirements',
                      'mouseover',
                      'navigate',
@@ -271,6 +273,14 @@ module Scoutui::Commands
       !_action.match(/^\s*loaddb\s*$/i).nil?
     end
 
+    def isExecuteCommands?(_action)
+      !_action.match(/^\s*executecommand[s]*\s*$/i).nil?
+    end
+
+    def isDefineCommands?(_action)
+      !_action.match(/^\s*definecommand[s]*\s*$/i).nil?
+    end
+
     def isLoadData?(_action)
       !_action.match(/^\s*loaddata\s*$/i).nil?
     end
@@ -350,6 +360,10 @@ module Scoutui::Commands
         @totalCommands['mouseover']+=1
       elsif isConnect?(cmd)
         @totalCommands['connect']+=1
+      elsif isExecuteCommands?(cmd)
+        @totalCommands['executecommands']+=1
+      elsif isDefineCommands?(cmd)
+        @totalCommands['definecommands']+=1
       elsif isLoadDB?(cmd)
         @totalCommands['loaddb']+=1
       elsif isLoadData?(cmd)

data/lib/scoutui/eyes/eye_factory.rb

@@ -56,7 +56,7 @@ module Scoutui::Eyes
           eyes=Applitools::Eyes.new()
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Eyes Object created #{eyes}"
           eyes.api_key = license_key
-          eyes.force_fullpage_screenshot = true
+          eyes.force_fullpage_screenshot = Scoutui::Utils::TestUtils.instance.eyesFullscreen?   #true
 
           match_level = Scoutui::Base::UserVars.instance.getVar('eyes.match_level')
 

data/lib/scoutui/eyes/eye_scout.rb

@@ -251,8 +251,8 @@ module Scoutui::Eyes
       browserType = Scoutui::Base::UserVars.instance.getBrowserType()
       viewport_size = Scoutui::Base::UserVars.instance.getViewPort()
 
-      puts __FILE__ + (__LINE__).to_s + " browserType => #{browserType}"
-      puts __FILE__ + (__LINE__).to_s + " viewport : #{viewport_size}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " browserType => #{browserType}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " viewport : #{viewport_size}"
 
 
       Testmgr::TestReport.instance.setDescription('ScoutUI Test')

data/lib/scoutui/utils/utils.rb

@@ -43,6 +43,7 @@ module Scoutui::Utils
       @options[:role]=nil
       @options[:sauce_name]='unnamed'
       @options[:enable_eyes]=false
+      @options[:enable_fullscreen]=true
       @options[:enable_sauce]=false
       @options[:log_level]=:info     # :debug, :info, :warn, :error, :fatal
       @options[:match_level]='layout'
@@ -246,6 +247,7 @@ module Scoutui::Utils
           @options[:enable_eyes]=true
         }
         opt.on('--eyes:run Bool', [:true, :false]) { |o| @options[:enable_eyes]  = !o.match(/true/i).nil? }
+        opt.on('--eyes:fullscreen Bool', [:true, :false]) { |o| @options[:enable_fullscreen] = !o.match(/true/i).nil? }
         opt.on('--eyes:app AppName') { |o| @options[:app] = o }
         opt.on('--eyes:title Title') { |o| @options[:title] = o }
         opt.on('--eyes:viewport [resolution]') { |o| @options[:viewport] = o }
@@ -356,6 +358,10 @@ module Scoutui::Utils
       @options[:enable_eyes]
     end
 
+    def eyesFullscreen?
+      @options[:enable_fullscreen]
+    end
+
     def sauceEnabled?
       @options[:enable_sauce]
     end

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.44.pre"
+  VERSION = "2.0.3.45.pre"
 end

data/scoutui.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "testmgr", "0.3.2.pre"
   spec.add_development_dependency "tiny_tds"
   spec.add_development_dependency "DataMgr", ">= 0.1.1.1.pre"
+  spec.add_development_dependency "CmdShellMgr", ">= 0.1.1.0.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.44.pre
+  version: 2.0.3.45.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1.1.pre
+- !ruby/object:Gem::Dependency
+  name: CmdShellMgr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1.0.pre
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1.0.pre
 description: Leverage a fully functional e2e framework that's integrated with Applitool's
   Eyes and Sauce Labs!
 email:
@@ -219,6 +233,7 @@ files:
 - examples/carmax/commands/commands.yml
 - examples/carmax/tests/test-carmax.sh
 - examples/ci_reporter/ci_example.rb
+- examples/cmdshell/commands/cmd.yml
 - examples/converters/jsonupdate.rb
 - examples/converters/jsony.rb
 - examples/data_driven/data/queries.yml
@@ -260,6 +275,8 @@ files:
 - examples/eyes/diff.rb
 - examples/eyes/ex2.rb
 - examples/eyes_results/response.json
+- examples/shell/run_shell.rb
+- examples/shell/runit.sh
 - examples/yaml/dut.yml
 - examples/yaml/ex_yaml.rb
 - lib/scoutui.rb
@@ -280,6 +297,8 @@ files:
 - lib/scoutui/commands/command.rb
 - lib/scoutui/commands/commands.rb
 - lib/scoutui/commands/connect.rb
+- lib/scoutui/commands/define_commands.rb
+- lib/scoutui/commands/execute_commands.rb
 - lib/scoutui/commands/exists_alert.rb
 - lib/scoutui/commands/fill_form.rb
 - lib/scoutui/commands/highlight.rb