scoutui 0.1.2 → 0.1.3

data/lib/scoutui/eyes/eye_factory.rb

@@ -26,23 +26,32 @@ module Scoutui::Eyes
       puts __FILE__ + (__LINE__).to_s + " create(#{use_eyes})" if Scoutui::Utils::TestUtils.instance.isDebug?
       eyes=nil
 
+
       if use_eyes
+        license_key=nil
 
         licFile=Scoutui::Utils::TestUtils.instance.getLicenseFile()
 
-        valid_json=false
-        begin
-          jFile = File.read(licFile)
-          jLicense=jsonData=JSON.parse(jFile)
-          valid_json=true
-        rescue => ex
-          ;
+        if !licFile.empty?
+
+          valid_json=false
+          begin
+            jFile = File.read(licFile)
+            jLicense=jsonData=JSON.parse(jFile)
+            license_key=jLicense['api_key'].to_s
+            valid_json=true
+          rescue => ex
+            ;
+          end
+
+        elsif ENV.has_key?('APPLITOOLS_API_KEY')
+          license_key=ENV['APPLITOOLS_API_KEY'].to_s
         end
 
 
-        if valid_json
+        if !license_key.nil?
           eyes=Applitools::Eyes.new()
-          eyes.api_key = jLicense['api_key'].to_s
+          eyes.api_key = license_key
           eyes.force_fullpage_screenshot = true
 
           match_level = Scoutui::Base::UserVars.instance.getVar('eyes.match_level')
@@ -50,6 +59,9 @@ module Scoutui::Eyes
           eyes.match_level = Applitools::Eyes::MATCH_LEVEL[match_level.to_sym]
         end
 
+        ## TBD - eyes.open()
+
+
       end
 
     #  eyes

data/lib/scoutui/eyes/eye_scout.rb

@@ -7,6 +7,7 @@ module Scoutui::Eyes
 
     attr_accessor :drv
     attr_accessor :eyes
+    attr_accessor :testResults
 
     def teardown()
       @drv.quit()
@@ -26,23 +27,43 @@ module Scoutui::Eyes
 
 
     def closeOut()
-      eyes().close(false)
+      return if !Scoutui::Utils::TestUtils.instance.eyesEnabled?
+      @testResults = eyes().close(false)
       eyes().abort_if_not_closed if !eyes().nil?
     end
 
-    def check_window(tag)
+    def check_window(tag, region=nil)
       puts __FILE__ + (__LINE__).to_s + " check_window(#{tag.to_s})"  if Scoutui::Utils::TestUtils.instance.isDebug?
 
       return if !Scoutui::Utils::TestUtils.instance.eyesEnabled?
 
-      eyes().check_window(tag.to_s)
+      if region.nil?
+        eyes().check_window(tag.to_s)
+      else
+        f = eyes().force_fullpage_screenshot
+        eyes().check_region(:xpath, region, tag)
+        eyes().force_fullpage_screenshot = f
+      end
+
+    end
+
+    def generateReport()
+      puts " TestReport => #{@testResults}"
+    end
+
+    def getResults()
+      @testResults
     end
 
     def initialize(browserType)
+      @testResults=nil
+
       browserType = Scoutui::Base::UserVars.instance.getBrowserType()
+      viewport_size = Scoutui::Base::UserVars.instance.getViewPort()
 
       if Scoutui::Utils::TestUtils.instance.isDebug?
         puts __FILE__ + (__LINE__).to_s + " setup() : #{browserType}"
+        puts __FILE__ + (__LINE__).to_s + " viewport => #{viewport_size}"
         puts __FILE__ + (__LINE__).to_s + " eyes cfg => #{@eyesRecord}"
         puts __FILE__ + (__LINE__).to_s + " title => " + Scoutui::Base::UserVars.instance.getVar('eyes.title')
         puts __FILE__ + (__LINE__).to_s + " app => " + Scoutui::Base::UserVars.instance.getVar('eyes.app')
@@ -55,12 +76,15 @@ module Scoutui::Eyes
 
         puts __FILE__ + (__LINE__).to_s + " eyes => #{eyes}" if Scoutui::Utils::TestUtils.instance.isDebug?
 
-        @driver = @eyes.open(
-            app_name:  Scoutui::Base::UserVars.instance.getVar('eyes.app'),   # @eyesRecord['app'],
-            test_name: Scoutui::Base::UserVars.instance.getVar('eyes.title'), # @eyesRecord['title'],
-            viewport_size: {width: 1024, height: 768},
-            #    viewport_size: {width: 800, height: 600},
-            driver: @drv)
+        ## TBD - move the following into eye_scout ??
+        if Scoutui::Utils::TestUtils.instance.eyesEnabled?
+          @driver = @eyes.open(
+              app_name:  Scoutui::Base::UserVars.instance.getVar('eyes.app'),   # @eyesRecord['app'],
+              test_name: Scoutui::Base::UserVars.instance.getVar('eyes.title'), # @eyesRecord['title'],
+              viewport_size: viewport_size,
+              #    viewport_size: {width: 800, height: 600},
+              driver: @drv)
+        end
 
       rescue => ex
         puts ex.backtrace

data/lib/scoutui/navigator.rb

@@ -11,6 +11,7 @@ class Scoutui::Navigator
   attr_reader :test_name
   attr_reader :viewport_size
   attr_reader :driver
+  attr_reader :test_list
 
   def initialize(opts={})
 

data/lib/scoutui/utils/utils.rb

@@ -11,21 +11,64 @@ module Scoutui::Utils
     include Singleton
 
     attr_accessor :options
+    attr_accessor :page_model
 
     def initialize
 
+      @env_list={:accounts => 'SCOUTUI_ACCOUNTS', :browser => 'SCOUTUI_BROWSER', :applitools_api_key => 'APPLITOOLS_API_KEY'}
       @options={}
 
-      [:test_file, :host, :loc, :title, :browser, :userid, :password, :json_config_file, :test_config, :debug].each do |o|
-        o=nil
+      [:accounts, :browser, :test_file, :host, :loc, :title, :viewport,
+       :userid, :password, :json_config_file, :page_model, :test_config, :debug].each do |o|
+        @options[o]=nil
       end
 
-      @options[:enable_eyes]=true
-      @options[:match_level]='strict'
+      @options[:enable_eyes]=false
+      @options[:match_level]='layout'
+      @options[:debug]=false
+
+      @page_model=nil
+
+      Scoutui::Base::UserVars.instance.set('eyes.viewport', '1024x768')
+
+    end
+
+    def loadPageModel()
+      if !@options[:page_model].nil?
+        _f = File.read(@options[:page_model].to_s)
+        @page_model = JSON.parse(_f)
+
+        puts __FILE__ + (__LINE__).to_s + " JSON-PageModel => #{@page_model}" if Scoutui::Utils::TestUtils.instance.isDebug?
+      end
+    end
+
+
+    def getPageElement(s)
+      hit=@page_model
+
+      nodes = s.split(/\./)
+
+      nodes.each { |elt|
+        getter = elt.split(/\(/)[0]
+        _obj = elt.match(/\((.*)\)/)[1]
+
+        puts __FILE__ + (__LINE__).to_s + " getter : #{getter}  obj: #{_obj}" if Scoutui::Utils::TestUtils.instance.isDebug?
+
+        if getter.downcase=='page'
+          puts __FILE__ + (__LINE__).to_s + " -- process page --"  if Scoutui::Utils::TestUtils.instance.isDebug?
+          hit=@page_model[_obj]
+        elsif getter.downcase=='get'
+          hit=hit[_obj]
+        end
+        puts __FILE__ + (__LINE__).to_s + " HIT => #{hit}" if Scoutui::Utils::TestUtils.instance.isDebug?
+      }
+
+      hit
+
     end
 
+
     def parseCommandLine()
- #     @options = {}
 
       OptionParser.new do |opt|
         opt.on('-c', '--config TESTFILE') { |o|
@@ -36,30 +79,30 @@ module Scoutui::Utils
               @options[:test_config]=jsonData=JSON.parse(jFile)
             end
         }
-        opt.on('-d', '--debug Bool')    { |o| @options[:debug] = (o.to_s.downcase=='true')}
+        opt.on('--accounts [Account]')    { |o| @options[:accounts] = o }
+        opt.on('-b', '--browser [TYPE]', [:chrome, :firefox, :ie, :safari, :phantomjs], "Select browser (chrome, ie, firefox, safari)") { |o| @options[:browser] = o }
+        opt.on('-d', '--debug', 'Enable debug')  { |o| @options[:debug] = true }
         opt.on('-h', '--host HOST')     { |o| @options[:host] = o }
         opt.on('-l', '--lang LOCAL')    { |o| @options[:loc] = o }
         opt.on('-k', '--key EyesLicense') { |o| options[:license_file] = o }
         opt.on('-a', '--app AppName')   { |o| @options[:app] = o }
-        opt.on('--match [TYPE]', [:layout2, :layout, :strict, :exact, :content], "Select match level (layout, strict, exact, content)") { |o| @options[:match_level] = o }
+        opt.on('--match [LEVEL]', [:layout2, :layout, :strict, :exact, :content], "Select match level (layout, strict, exact, content)") { |o| @options[:match_level] = o }
+
+        opt.on('--pagemodel [PageModel]') { |o|
+          @options[:page_model] = o
+          loadPageModel()
+        }
         opt.on('-t', '--title TITLE')   { |o| @options[:title] = o }
-        opt.on('-b', '--browser BROWSER') { |o| @options[:browser] = o }
+
         opt.on('-u', '--user USER_ID')  { |o|
           @options[:userid] = o
           Scoutui::Base::UserVars.instance.setVar(:user, @options[:userid].to_s)
         }
         opt.on('-p', '--password PASSWORD') { |o| @options[:password] = o }
-        opt.on('-e', '--eyes Boolean') { |o|
-          @options[:enabled_eyes]=false
-
-          if !o.nil?
-            if !o.match(/true|1/i).nil?
-              @options[:enable_eyes]=true
-            end
-
-          end
-
+        opt.on('-e', '--eyes', "Toggle eyes") {
+          @options[:enable_eyes]=true
         }
+        opt.on('--viewport [resolution]') { |o| options[:viewport] = o }
       end.parse!
 
       if Scoutui::Utils::TestUtils.instance.isDebug?
@@ -74,6 +117,10 @@ module Scoutui::Utils
         puts "Eyes      => #{@options[:enable_eyes]}"
         puts "Test Cfg  => #{@options[:json_config_file]}"
         puts "Match Level => #{@options[:match_level]}"
+        puts "Accounts    => #{@options[:accounts]}"
+        puts "Viewport    => #{@options[:viewport]}"
+        puts "Viewport (Var) => #{Scoutui::Base::UserVars.instance.getViewPort().to_s}"
+        puts "PageModel file => #{@options[:page_model].to_s}"
       end
 
       @options
@@ -109,11 +156,14 @@ module Scoutui::Utils
     # Returns JSON file contents/format
     def getTestSettings()
 
-      [:browser, :host, :userid, :password].each do |k|
+      [:accounts, :browser, :host, :userid, :password].each do |k|
 
         puts __FILE__ + (__LINE__).to_s + " opt[test_config].has_key(#{k.to_s}) => #{@options[:test_config].has_key?(k.to_s)}" if Scoutui::Utils::TestUtils.instance.isDebug?
 
-        if @options[:test_config].has_key?(k.to_s)
+        puts __FILE__ + (__LINE__).to_s + " options[#{k}] : #{@options[k].to_s}" if Scoutui::Utils::TestUtils.instance.isDebug?
+        if @options.has_key?(k) && !@options[k].nil?
+          Scoutui::Base::UserVars.instance.set(k, @options[k].to_s)
+        elsif @options[:test_config].has_key?(k.to_s)
 
           puts __FILE__ + (__LINE__).to_s + " opts[#{k}].nil => #{@options[k].nil?}" if Scoutui::Utils::TestUtils.instance.isDebug?
           # Ensure commnand line takes precedence
@@ -124,34 +174,48 @@ module Scoutui::Utils
             Scoutui::Base::UserVars.instance.set(k, @options[:test_config][k.to_s].to_s)
           end
 
+        elsif @env_list.has_key?(k)
+          # If an ENV is available, use it.
+          puts __FILE__ + (__LINE__).to_s + " #{k} => ENV(#{@env_list[k]}) = #{ENV[@env_list[k].to_s]}"  if Scoutui::Utils::TestUtils.instance.isDebug?
+          Scoutui::Base::UserVars.instance.set(k, ENV[@env_list[k].to_s])
         end
       end
 
       puts __FILE__ + (__LINE__).to_s + " test_config => #{@options[:test_config]}"  if Scoutui::Utils::TestUtils.instance.isDebug?
 
-      ['match_level', 'title', 'app'].each do |k|
 
-        _v=nil
+      # Applitools Eyes settings
+      if @options[:test_config].has_key?('eyes')
 
-        if @options[:test_config].has_key?('eyes')
-          _v=@options[:test_config]['eyes'][k].to_s
-        end
+        ['match_level', 'title', 'app', 'viewport'].each do |k|
 
-        if !@options[k.to_sym].nil?
-          _v=@options[k.to_sym].to_s
-        end
+          _v=nil
 
-        if Scoutui::Utils::TestUtils.instance.isDebug?
-          puts __FILE__ + (__LINE__).to_s + " #{k} => #{_v}"
-        end
+          if @options[:test_config]['eyes'].has_key?(k)
+            _v=@options[:test_config]['eyes'][k].to_s
+          end
 
-        Scoutui::Base::UserVars.instance.set('eyes.' + k, _v)
+          if !@options[k.to_sym].nil?
+            _v=@options[k.to_sym].to_s
+          end
+
+          if Scoutui::Utils::TestUtils.instance.isDebug?
+            puts __FILE__ + (__LINE__).to_s + " #{k} => #{_v}"
+          end
 
+          Scoutui::Base::UserVars.instance.set('eyes.' + k, _v) if !_v.nil?
+
+        end
       end
 
       @options[:test_config]
     end
 
+
+    def getTestConfig()
+      @options[:test_config]
+    end
+
     def match_level()
       @options[:match_level]
     end

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,18 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/scoutui_driver.rb
 - bin/setup
+- examples/ex1/commands.yml
+- examples/ex1/test-example.sh
+- examples/ex1/test.config.json
+- examples/ex2/commands.yml
+- examples/ex2/page_model.json
+- examples/ex2/test-example.sh
+- examples/ex2/test.config.json
+- examples/ex6/commands.yml
+- examples/ex6/ex1.config.json
+- examples/ex6/test-example.sh
 - lib/scoutui.rb
 - lib/scoutui/base/q_accounts.rb
 - lib/scoutui/base/q_applitools.rb