scoutui 2.0.5.1.1.pre → 2.0.5.2

data/lib/scoutui/commands/strategy.rb

@@ -27,6 +27,13 @@ module Scoutui::Commands
         rc=Scoutui::Utils::TestUtils.instance.loadModel(f)
       rescue => ex
         rc=false
+        Scoutui::Logger::LogMgr.instance.fatal __FILE__ + (__LINE__).to_s + " loadModel(#{f}) => Failed"
+      end
+
+      Testmgr::TestReport.instance.getReq("ScoutUI").testcase('Setup').add(rc, "Verify load model #{f}.")
+
+      if !rc
+        Scoutui::Utils::TestUtils.instance.setState(:abort, "Failed to load model file #{f}.")
       end
 
       rc
@@ -115,8 +122,9 @@ module Scoutui::Commands
       caps
     end
 
-    def initialize()
+    def initialize(opts=nil)
 
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Scoutui::Commands.initialize(#{opts})"
       @profile=nil
       browserType = Scoutui::Base::UserVars.instance.getBrowserType()
       caps = Scoutui::Utils::TestUtils.instance.getCapabilities()
@@ -296,11 +304,22 @@ module Scoutui::Commands
 
       else
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Create WebDriver: #{browserType.to_s}"
-        @drv=Selenium::WebDriver.for browserType.to_sym, :profile => @profile
+
+        if @profile.nil?
+          @drv=Selenium::WebDriver.for browserType.to_sym
+        else
+          @drv=Selenium::WebDriver.for browserType.to_sym, :profile => @profile
+        end
+
         setViewport()
 
       end
 
+
+      if opts.is_a?(Hash) && opts.has_key?(:loadModel).nil?
+        loadModel(opts[:loadModel])
+      end
+
     end
 
   end

data/lib/scoutui/commands/type.rb

@@ -5,6 +5,7 @@ module Scoutui::Commands
   class Type < Command
 
     KEYBOARD_CMDS={
+        '__DELETE__' => { :val => :delete },
         '__DOWN__' => { :val => :arrow_down },
         '__ENTER__' => { :val => :enter },
         '__ESC__'  => { :val => :escape },
@@ -12,7 +13,13 @@ module Scoutui::Commands
         '__UP__'   => { :val => :arrow_up },
         '__LEFT__' => { :val => :arrow_left },
         '__RIGHT__' => { :val => :arrow_right },
-        '__TAB__'   => { :val => :tab }
+        '__TAB__'   => { :val => :tab },
+        '__SHIFT_TAB__' => {:val => :custom,
+                            :run => lambda { |drv|
+                                 puts __FILE__ + (__LINE__).to_s + " *** SHIFT_TAB ***"
+                                 drv.action.key_down(:shift).send_keys(:tab).perform;
+                                 drv.action.key_up(:shift).perform;
+                            }}
     }
 
     KEYBOARD_LIST={
@@ -66,6 +73,7 @@ module Scoutui::Commands
 
       _tm={:start => 0, :end => 0 }
 
+      _val=nil
       _isKb=false
       _rc=false
       _req = Scoutui::Utils::TestUtils.instance.getReq()
@@ -75,13 +83,40 @@ module Scoutui::Commands
 
       begin
 
-        if @cmd.match(/^type\((#{KEYBOARD_CMDS.keys.join('|')})\)$/)
+        if @cmd.match(/^type\(focused\s*,\s*.*\)\s*$/)
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Type into active element"
+          obj = @drv.switch_to.active_element
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | active.Tag  : " + obj.tag_name
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | active.Class: " + obj.attribute('class').to_s
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | active.ID   : " + obj.attribute('id').to_s
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | active.Name : " + obj.attribute('name').to_s
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | active.Text : " + obj.text.to_s
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | active.Value: " + obj.attribute('value').to_s
+
+          _val = @cmd.match(/^type\(focused\s*,\s*(.*)\)\s*$/)[1].to_s
+
+          if KEYBOARD_CMDS.has_key?(_val)
+            _val = KEYBOARD_CMDS[_val][:val]
+          end
+
+          _xpath="[focused]"
+
+          obj.send_keys(_val)
+          _rc=true
+
+        elsif @cmd.match(/^type\((#{KEYBOARD_CMDS.keys.join('|')})\)$/)
 
           _tm[:start]=Time.now
 
-          _keyVal=@cmd.match(/^type\((#{KEYBOARD_CMDS.keys.join('|')})\)$/)[1]
+          _keyVal=@cmd.match(/^type\((#{KEYBOARD_CMDS.keys.join('|')})\)$/)[1].to_s
 
-          @drv.action.send_keys(KEYBOARD_CMDS[_keyVal][:val]).perform
+          if KEYBOARD_CMDS[_keyVal][:val]==:custom
+            KEYBOARD_CMDS[_keyVal][:run].call(@drv)
+          else
+            @drv.action.send_keys(KEYBOARD_CMDS[_keyVal][:val]).perform
+          end
 
           thenClause = Scoutui::Commands::ThenClause.new(@drv)
           doUntil = Scoutui::Commands::DoUntil.new(@drv)
@@ -107,7 +142,7 @@ module Scoutui::Commands
             _val   = @cmd.match(/^\s*type[\!]*\((.*),\s*(.*)\s*\)\s*$/)[2]
           end
 
-          Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + "Process TYPE #{_val} into  #{_xpath}"
+          Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " Process TYPE #{_val} into  #{_xpath}"
 
           _tm[:start]=Time.now
 

data/lib/scoutui/eyes/eye_scout.rb

@@ -308,7 +308,8 @@ module Scoutui::Eyes
         end
 
       rescue => ex
-        Scoutui::Logger::LogMgr.instance.warn ex.backtrace
+#        Scoutui::Logger::LogMgr.instance.warn ex.backtrace
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s +  "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
       end
 
     end

data/lib/scoutui/utils/utils.rb

@@ -242,6 +242,15 @@ module Scoutui::Utils
           loadModel(@options[:pages])
         end
 
+        opt.on('--var [Key:Value]') { |o|
+          if o.match(/(.+?):(.*)$/)
+            _result=o.match(/(.+)?:(.*)$/)
+            Scoutui::Base::UserVars.instance.setVar(_result[1].to_s, _result[2].to_s)
+          else
+            Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Invalid --var value : #{o}, should be <key>:<value>"
+          end
+        }
+
         opt.on('--pagemodel [PageModel]') { |o|
           @options[:page_model] = o
           loadModel(@options[:page_model].to_s)

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.5.1.1.pre"
+  VERSION = "2.0.5.2"
 end

data/scoutui.gemspec

@@ -32,9 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "json", ">= 1.8.3"
   spec.add_development_dependency "faker"
   spec.add_development_dependency "logging"
-  spec.add_development_dependency "sauce_whisk"
+  spec.add_development_dependency "sauce_whisk", "0.0.21"
   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 "DataMgr", ">=0.2.0"
   spec.add_development_dependency "CmdShellMgr", ">= 0.1.1.2.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.5.1.1.pre
+  version: 2.0.5.2
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,16 +154,16 @@ dependencies:
   name: sauce_whisk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.21
 - !ruby/object:Gem::Dependency
   name: testmgr
   requirement: !ruby/object:Gem::Requirement
@@ -178,34 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2.pre
-- !ruby/object:Gem::Dependency
-  name: tiny_tds
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: DataMgr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1.1.pre
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1.1.pre
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: CmdShellMgr
   requirement: !ruby/object:Gem::Requirement
@@ -237,47 +223,16 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/scoutui_driver
 - bin/scoutui_driver.rb
 - bin/setup
-- examples/benchmark/ex.rb
-- examples/capabilities/win10.chrome46.json
-- examples/carmax/appmodel/search_results.json
-- examples/carmax/commands/commands.yml
-- examples/cmdshell/commands/hello.yml
-- examples/converters/jsonupdate.rb
 - examples/ex1/commands.holidays.yml
 - examples/ex1/commands.yml
+- examples/ex1/phantom.chrome.json
+- examples/ex1/run.sh
+- examples/ex1/simple.yml
 - examples/ex1/test-example.sh
 - examples/ex1/test.config.json
-- examples/ex2/appmodel/common.json
-- examples/ex2/appmodel/page_model.json
-- examples/ex2/appmodel/register.model.json
-- examples/ex2/commands/commands.basic.appmodel.yml
-- examples/ex2/commands/commands.yml
-- examples/ex2/commands/ex1.yml
-- examples/ex2/commands/ex1c.yml
-- examples/ex2/commands/ex1d.yml
-- examples/ex2/commands/ex2.hover.yml
-- examples/ex2/commands/ex2.yml
-- examples/ex2/data.json
-- examples/ex2/test-configs/test.config.basic.json
-- examples/ex2/test-configs/test.config.json
-- examples/ex2/tests/run-test.sh
-- examples/ex2/tests/test-basic-appmodel.sh
-- examples/ex2/tests/test-example.sh
-- examples/ex2/tests/test-example1a.sh
-- examples/ex2/tests/test-example1b.sh
-- examples/ex2/tests/test-example1c.sh
-- examples/ex2/tests/test-example1d.sh
-- examples/ex2/tests/test-example2.forms.eyes.sh
-- examples/ex2/tests/test-example2.hover.eyes.sh
-- examples/ex2/tests/test-example2.hover.sh
-- examples/ex2/tests/test-example2.sh
-- examples/ex2/tests/test-example3.sauce.sh
-- examples/ex2/tests/test-example3.sh
-- examples/headless/run.sh
-- examples/http/sendreq.rb
+- examples/ex1/win10.chromebeta.json
 - lib/scoutui.rb
 - lib/scoutui/appmodel/q_model.rb
 - lib/scoutui/base/assertions.rb
@@ -285,6 +240,7 @@ files:
 - lib/scoutui/base/q_applitools.rb
 - lib/scoutui/base/q_browser.rb
 - lib/scoutui/base/q_form.rb
+- lib/scoutui/base/q_har_mgr.rb
 - lib/scoutui/base/requirements.rb
 - lib/scoutui/base/test_context.rb
 - lib/scoutui/base/test_data.rb
@@ -347,9 +303,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.2

data/bin/scoutui_driver

@@ -1 +0,0 @@
-scoutui_driver.rb

data/examples/benchmark/ex.rb

@@ -1,16 +0,0 @@
-
-
-
-def foo(opts)
-
-  puts opts
-
-
-end
-
-
-
-
-foo(rover: 'Rover')
-
-

data/examples/capabilities/win10.chrome46.json

@@ -1,6 +0,0 @@
-{
-  "platform": "Windows 10",
-  "browser": "chrome",
-  "version": "46.0",
-  "screenResolution": "1024x768"
-}

data/examples/carmax/appmodel/search_results.json

@@ -1,27 +0,0 @@
-{
-
-
-  "search_results": {
-
-
-    "results": {
-
-       "header": {
-         "reqid": "REQ-HEADER",
-         "locator": "//span[text()='Applied filters']",
-         "visible_when": "title(Search Results)"
-       }
-
-
-    }
-
-
-
-  }
-
-
-
-
-
-
-}

data/examples/carmax/commands/commands.yml

@@ -1,63 +0,0 @@
-page:
-  name: Home
-  description: Navigate to a specified URL and wait until the expected elements are present
-  url: http://www.carmax.com
----
-page:
-  name: Highlight Example
-  action: highlight(page(main).get(nav).get(findYourCar))
----
-page:
-  timeout: 5
-  name: Click Find Your Car
-  action: click(page(main).get(nav).get(findYourCar))
-  expected:
-    wait1: //header//*[text()='Pricex']
----
-page:
-  name: Basic Search
-  timeout: 5
-  action: click(page(main).get(nav).get(basic_search))
-  expected:
-    wait:  page(basic_search).get(free_text)
-  assertions: [
-    elvis: {
-      "locator": "//button[@text()='Go']",
-      "visible_when": "visible(page(basic_search).get(free_text))"
-    },
-    better_assert: {
-      "locator": "page(basic_search)"
-    }
-  ]
----
-page:
-  name: Popup
-  timeout: 5
-  execute_when: visible(//area[@alt='no'])
-  action: click(//area[@alt='no'])
----
-page:
-  name: Enter Porsche
-  action: type(page(basic_search).get(free_text), Porsche 911)
-  expected:
-    wait: //a[contains(@href, 'Porsche%20911')]
----
-page:
-  action: highlight(//a[contains(@href, 'Porsche%20911')])
----
-page:
-  action: mouseover(//a[contains(@href, 'Porsche%20911')])
----
-page:
-  action: click(page(basic_search).get(go))
-  assertions: [
-    assert1: {
-       "locator": "page(search_results).get(results)"
-    }
-  ]
----
-page:
-  name: Pause after Nav.
-  action: pause
-  skipit: false
-

data/examples/cmdshell/commands/hello.yml

@@ -1,22 +0,0 @@
-page:
-  name: Assign my vars
-  action: assignments
-  vars:
-    - assign(MyEntity, ScoutUI)
----
-page:
-  name: Simple Cmd
-  id: MultiLs
-  action: defineCommand
-  commands: sed -e 's/domain/${MyEntity}/g' /tmp/userlist-v2.txt > /tmp/mydata.txt
----
-page:
-  name: Run Multi
-  action: executeCommands
-  commands:
-    - id: MultiLs
----
-page:
-  name: Pause afger MultiLs
-  action: pause
-  skip: false

data/examples/converters/jsonupdate.rb

@@ -1,31 +0,0 @@
-
-
-def iterate(h)
-  h.each do |k, v|
-    if v.is_a?(Hash) || v.is_a?(Array)
-      iterate(v)
-    else
-      puts("k is #{k}, value is #{v}")
-      if v.match(/peter/i)
-        h[k]='Elvis'
-      end
-    end
-  end
-end
-
-
-h={
-    'person': {
-        'first': 'Peter',
-        'last': 'Kim',
-        'address': {
-            'city': 'Manhattan peter',
-            'state': 'New York'
-        }
-    }
-}
-
-
-iterate(h)
-
-puts "h => #{h}"

data/examples/ex2/appmodel/common.json

@@ -1,51 +0,0 @@
-{
-
-  "basic_nav": {
-
-    "find_cars_for_sale": {
-      "locator": "//*[@id='header']//a[text()='Find Cars for Sale']",
-      "visible_when": "always"
-    },
-
-    "sell_us_your_car": {
-      "locator": "//*[@id='header']//a[text()='Sell Us Your Car']",
-      "visible_when": "title(Used Cars for Sale.*)"
-    },
-
-    "research": {
-      "locator": "//*[@id='header']//a[text()='Research']",
-      "when_hovered": [
-        { "RSRCH": [
-          "visible(//*[@id='header']//a[text()='Ratings and Reviews'])",
-          "visible(//*[@id='header']//a[text()='Payment Calculators'])",
-          "visible(page(submenu3).get(fuel_econ))"
-        ]
-        }
-      ]
-    }
-
-  },
-
-  "find_cars_for_sale_sm": {
-    "description": "Example of observer-like pattern, where an element registers itself to another elements action.",
-    "locator": "//*[@id='header']//a[text()='Nationwide Transfers']",
-    "visible_when": "mouseover(page(basic_nav).get(find_cars_for_sale))"
-  },
-
-  "submenu2": {
-
-    "faq": {
-      "locator": "//*[@id='header']//a[text()='FAQ']",
-      "visible_when": "mouseover(page(basic_nav).get(sell_us_your_car))"
-    }
-
-  },
-
-  "submenu3": {
-    "fuel_econ": {
-      "locator": "//*[@id='header']//a[text()='Payment Calculators']"
-    }
-  }
-
-
-}

data/examples/ex2/appmodel/page_model.json

@@ -1,106 +0,0 @@
-{
-    "home": {
-        "cars4sale": {
-            "locator": "//a[text()='Find Cars for Sale']",
-            "visible_when": "always",
-            "reqid": "REQ-Home"
-        },
-        "whyCarMax": {
-            "locator": "//*[@id='header']//a[text()='Why CarMax']",
-            "visible_when": "text(page(home).get(cars4sale))=Find Cars for Sale",
-            "reqid": "REQ-Home"
-        },
-
-        "sign_in": {
-            "locator": "//input[text()='Sign in']",
-            "visible_when": "title(/Carmax.*online/)",
-            "reqid": "REQ-Home"
-        },
-
-        "register": {
-            "locator": "//*[@id='register']",
-            "reqid": "REQ-register",
-
-
-            "when_clicked": [
-                { "req-XYZ": "page(register_pg).get(firstname)" },
-                { "req-XYZ": "visible(page(register_pg).get(firstname))"},
-                {
-                    "REGIS-002": [
-                        "title(Register for MyCarMax)",
-                        "visible(css=#signInLink)"
-                    ]
-                }
-            ],
-
-
-            "visible_when": [
-                { "visible_when": "visible(page(home).get(sign_in))=true"},
-                { "visible_when": "visible(page(home).get(cars4sale))=true"},
-                { "visible_when": "visible(page(home).get(sign_in))=false"},
-                { "visible_when": "title(Car[mM]ax.*online)"}
-            ]
-        },
-
-        "mycarmax": {
-            "locator": "//*[@id='mycarmax']",
-            "visible_when": "title(CarMax - Browse used cars and new cars online)",
-            "reqid": "REQ-Home"
-        },
-
-        "logoff": {
-          "locator": "//*[text()='Log off']",
-          "visible_when": "never",
-          "reqid": "REQ-Home"
-        }
-    },
-
-
-    "register_pg": {
-        "firstname": {
-            "locator": "css=input#FirstName",
-            "visible_when": "title(Register for MyCarMax)"
-        },
-
-        "lastname": {
-            "locator": "//input[@id='LastName']",
-            "visible_when": "always"
-        }
-    },
-
-    "research": {
-
-        "fuel_economy": {
-            "locator": ""
-        }
-
-    },
-
-    "main_nav": {
-        "search_input": {
-            "locator": "//input[@id='search']",
-            "visible_when": "always"
-        },
-        "search_btn": {
-            "locator": "//a[@id='search-btn']",
-            "visible_when": "always"
-        }
-    },
-
-    "find_cars_by": {
-        "make": {
-            "locator": "//*[@id='bantab0']/a[contains(text(), 'Make')]",
-            "visible_when": "always"
-        },
-
-        "price_list": {
-            "locator": "//*[@id='minPriceFilter']",
-            "visible_when": "text(//*[@id='minPriceFilter'])=$0"
-        }
-    },
-
-    "search": {
-        "header": "//title"
-    }
-}
-