scoutui 2.0.5.2 → 2.0.5.2.1.pre

data/lib/scoutui/eyes/utils.rb

@@ -26,6 +26,14 @@ module Scoutui::Eyes
       return fn.join '.'
     end
 
+    def get_session_id_from_batch(url)
+      /batches\/\d+\/(?<sessionId>\d+)/.match(url)[1]
+    end
+
+    def get_batch_id_from_batch(url)
+      /batches\/(?<batchId>\d+)/.match(url)[1]
+    end
+
 
     def get_session_id(url)
       /sessions\/\d+\/(?<sessionId>\d+)/.match(url)[1]
@@ -56,8 +64,16 @@ module Scoutui::Eyes
 
     def download_diffs(results, view_key, destination)
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " download_diffs(#{results}, #{destination})"
-      session_id = get_session_id(results.url)
-      batch_id = get_batch_id(results.url)
+
+      # Check if BATCH
+      if  /\/batches\/\d+\/(?<batchId>\d+)/.match(results.url)
+        session_id = get_session_id_from_batch(results.url)
+        batch_id = get_batch_id_from_batch(results.url)
+      else
+        session_id = get_session_id(results.url)
+        batch_id = get_batch_id(results.url)
+      end
+
       diff_urls = get_diff_urls(batch_id, session_id, view_key)
 
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  session_id : #{session_id}, batch_id : #{batch_id}"
@@ -66,12 +82,25 @@ module Scoutui::Eyes
     end
 
     def download_images(diff_urls, destination)
-      diff_urls.each do |index, elem|
-        save_name = sanitize_filename(elem[:tag]) + ".#{elem[:isMatching].to_s}.step_#{elem[:index]}_diff.png"
-        File.open("#{destination}/#{save_name}", 'wb') do |file|
-          file.write HTTParty.get(elem[:url])
+      rc=true
+
+      begin
+        diff_urls.each do |index, elem|
+          save_name = sanitize_filename(elem[:tag]) + ".#{elem[:isMatching].to_s}.step_#{elem[:index]}_diff.png"
+          File.open("#{destination}/#{save_name}", 'wb') do |file|
+            file.write HTTParty.get(elem[:url])
+          end
         end
+
+
+      rescue => ex
+        Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " #{ex.class}: download_images."
+        Scoutui::Logger::LogMgr.instance.info ex.backtrace
+        rc=false
       end
+
+      rc
+
     end
 
     def get_diff_urls(batch_id, session_id, view_key)
@@ -102,4 +131,4 @@ module Scoutui::Eyes
   end
 
 
-end
+end

data/lib/scoutui/version.rb

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

data/scoutui.gemspec

@@ -26,14 +26,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "nokogiri", "1.6.7.2"
-  spec.add_development_dependency "eyes_selenium", ">= 2.33"
+  spec.add_development_dependency "eyes_selenium", ">= 2.38"
   spec.add_development_dependency "selenium-webdriver", "2.53.4"
   spec.add_development_dependency "httparty", ">=0.13.7"
   spec.add_development_dependency "json", ">= 1.8.3"
   spec.add_development_dependency "faker"
   spec.add_development_dependency "logging"
-  spec.add_development_dependency "sauce_whisk", "0.0.21"
+  spec.add_development_dependency "sauce_whisk"
   spec.add_development_dependency "testmgr", ">= 0.3.2.pre"
-  spec.add_development_dependency "DataMgr", ">=0.2.0"
+  spec.add_development_dependency "tiny_tds"
+  spec.add_development_dependency "DataMgr", ">= 0.1.1.1.pre"
   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.2
+  version: 2.0.5.2.1.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.33'
+        version: '2.38'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.33'
+        version: '2.38'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +154,16 @@ dependencies:
   name: sauce_whisk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: testmgr
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +178,34 @@ 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.2.0
+        version: 0.1.1.1.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.1.1.1.pre
 - !ruby/object:Gem::Dependency
   name: CmdShellMgr
   requirement: !ruby/object:Gem::Requirement
@@ -223,16 +237,48 @@ 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/ex1/win10.chromebeta.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/js.rb
 - lib/scoutui.rb
 - lib/scoutui/appmodel/q_model.rb
 - lib/scoutui/base/assertions.rb
@@ -240,7 +286,6 @@ 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
@@ -303,9 +348,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.2

data/examples/ex1/phantom.chrome.json

@@ -1,4 +0,0 @@
-{
-  "browser": "phantomjs",
-  "useragent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36"
-}

data/examples/ex1/run.sh

@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-##
-# H20Dragon
-##
-
-##
-# Execute test on Chrome locally.
-##
-run_chrome()
-{
-    CMD=$1
-    ruby $SCOUTUI_BIN --config ./test.config.json \
-                      --browser chrome \
-                      --host "http://www.elvis-presley.com" \
-                      --viewport 800x600 \
-                      --dut ${CMD} --debug
-}
-
-##
-# Execute test on Firefox locally.
-##
-run_firefox()
-{
-    CMD=$1
-    ruby $SCOUTUI_BIN --config ./test.config.json \
-                      --browser firefox \
-                      --host "http://www.elvis-presley.com" \
-                      --viewport 800x600 \
-                      --dut ${CMD} --debug
-}
-
-##
-# Execute test on phantom (GhostDriver)
-##
-run_headless()
-{
-    CMD=$1
-    ruby $SCOUTUI_BIN --config ./test.config.json \
-                      --browser phantomjs \
-                      --host "http://www.elvis-presley.com" \
-                      --viewport 800x600 \
-                      --dut ${CMD} --debug
-}
-
-
-##
-# Run tests on ghostdriver (phantom) as defined in
-# its capabilities file.
-##
-run_headless2()
-{
-    CMD=$1
-    ruby $SCOUTUI_BIN --config ./test.config.json \
-                      --capabilities ./phantom.chrome.json \
-                      --host "http://www.elvis-presley.com" \
-                      --viewport 800x600 \
-                      --dut ${CMD} --debug
-}
-
-
-##
-# Run a test on ghostdriver (phantom) defined by
-# capabilities files, while taking screen shots.
-##
-run_screenshots_phantom()
-{
-    CMD=$1
-    ruby $SCOUTUI_BIN --config ./test.config.json \
-                      --capabilities ./phantom.chrome.json \
-                      --screenshots:run true \
-                        --screenshots:dir /tmp/phantom \
-                      --host "http://www.elvis-presley.com" \
-                      --viewport 800x600 \
-                      --dut ${CMD} --debug
-}
-
-
-
-run_chrome ./simple.yml
-run_firefox ./simple.yml
-
-#run_headless  ./simple.yml
-#run_headless2 ./simple.yml
-#run_screenshots_phantom ./simple.yml
-

data/examples/ex1/simple.yml

@@ -1,13 +0,0 @@
-page:
-  name: Home
-  action: navigate(http://www.elvis.com)
----
-page:
-  name: TAB
-  action: type(__TAB__)
-  do:
-    - focused.Highlight
-    - press(__TAB__)
-  until:
-    - true
-

data/examples/ex1/win10.chromebeta.json

@@ -1,6 +0,0 @@
-{
-  "platform": "Windows 10",
-  "browser": "chrome",
-  "version": "beta",
-  "screenResolution": "1280x1024"
-}

data/lib/scoutui/base/q_har_mgr.rb

@@ -1,63 +0,0 @@
-require 'singleton'
-#require 'browsermob/proxy'
-
-
-module Scoutui::Base
-
-  class QHarMgr
-    include Singleton
-
-    attr_accessor :proxy_binary
-    attr_accessor :proxy
-    attr_accessor :seleniumProfile
-
-
-    def initialize()
-      puts __FILE__ + (__LINE__).to_s + " -- start BrowserMob --" if Scoutui::Utils::TestUtils.instance.isDebug?
-      @proxy_binary = BrowserMob::Proxy::Server.new(ENV['BROWSER_MOB_BIN'], { :port => 8088 })
-    end
-
-    def start()
-      puts __FILE__ + (__LINE__).to_s + " --start --"
-      @proxy_binary.start
-      @proxy = @proxy_binary.create_proxy
-      @seleniumProfile = @proxy.selenium_proxy  # Needed by Selenium instance
-
-      @proxy.new_har(:capture_headers => true)
-    end
-
-
-    def getSeleniumProfile()
-      puts __FILE__ + (__LINE__).to_s + " == getSeleniumProfile() => #{@seleniumProfile} --"
-      @seleniumProfile
-    end
-
-    def stop(save_as=nil)
-      puts __FILE__ + (__LINE__).to_s + " -- stop(#{save_as.to_s} --"
-    #  @proxy.close
-
-      if !save_as.nil?
-        @proxy.har.save_to(save_as)
-      end
-
-      @proxy.close
-    end
-
-    def capture_traffic
-     # @proxy.new_har
-      yield
-     @proxy.har
-    end
-
-    def run(n)
-      puts __FILE__ + (__LINE__).to_s + " -- run --"
-      @har = capture_traffic { yield }
-#      @proxy.close
-#      @har.save_to(n)
-    end
-
-
-  end
-
-
-end