scoutui 2.0.3.15.pre → 2.0.3.16.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f5ec30b2035139e274aa3fbab055ff814788e76
-  data.tar.gz: 68497e9af33ddcd16df11f26904c62043717837c
+  metadata.gz: 99c18cd1f8d5282053583a8b37de329c02a2d71f
+  data.tar.gz: d1c31fd719bcce0bc7fbfa65a39c07639110ba6e
 SHA512:
-  metadata.gz: f4cef4d179bb04396a53d886b9bb5d221988619aa6aa5daf9b3a8c0ff83798803e9f481c24493f25ffa9dd871a4533b81d9d382db10cdda15128c625cffa452a
-  data.tar.gz: 51f7f1089fd17eebccfa4cebc4b9747ed9b3e4eadb6aadde11a13a605c0cd6ce9397ec73c0f1efee228538c2a8e5a46ef36dd98b1fd0f974d99f718bbafe2b15
+  metadata.gz: e0f7d17193e59de07ce21044fde89efac1c91a5d4173de19af8d608b1b84af456366a1b5d521a856544376b321d24a7bce26118923c37755d8fdf42a2bb5afc6
+  data.tar.gz: 339f0aac7671b53d0b04ebf0b34e865ed8ec3e8dd071b3813a17502b87938e5e8129bfdc23718855fe45780f29ce652216873699b59159fe20fcff80b106a30c

data/examples/carmax/tests/test-carmax.sh

@@ -22,14 +22,17 @@ setup()
 
   MODEL="../appmodel/main.nav.json,../appmodel/search_results.json"
 
-  EYES="--eyes --app ${TITLE} --title ${TITLE}"
-  EYES=
+  EYES="--eyes --app ${TITLE} --title ${TITLE}  --match layout2"
+#  EYES=
 
   SAUCE="--sauce --sauce_name ${TITLE}"
-  SAUCE=
+  SAUCE="--browser chrome"
 
   CMD="../commands/commands.yml"
   CMD="../commands/basic_search.yml"
+
+  CMD="../commands/home.commands.yml"
+
 }
 
 
@@ -37,11 +40,13 @@ setup()
 
 setup
 
+mkdir -p /tmp/vt
 
 ruby $SCOUTUI_BIN  \
        --config ${TESTCFG} \
        --user "expense.admin@scoutui.com" --password password1 \
        ${EYES} \
+       --diff /tmp/vt \
        --viewport ${VIEWPORT} \
        ${SAUCE} \
        ${CAPS} \

data/examples/eyes/ex2.rb

@@ -0,0 +1,23 @@
+require 'eyes_selenium'
+
+eyes = Applitools::Eyes.new
+# This is your api key, make sure you use it in all your tests.
+eyes.api_key = 'dHntgIngYlRjYuG5RmdjqOFk106XDCKJplGklCXzjsWjk110'
+
+# Get a selenium web driver object.
+my_webdriver = Selenium::WebDriver.for :firefox
+
+begin
+  # Start visual testing using my_webdriver and setting the viewport to 1024x768.
+  eyes.test(app_name: 'Applitools', test_name: 'Test Web Page',
+            viewport_size: {width: 1024, height: 768}, driver: my_webdriver) do |driver|
+    driver.get 'http://www.applitools.com'
+    # Visual validation point #1
+    eyes.check_window('Main Page')
+    driver.find_element(:css, ".features>a").click
+    # Visual validation point #2
+    eyes.check_window('Features Page')
+  end
+ensure
+  my_webdriver.quit
+end

data/lib/scoutui/base/visual_test_framework.rb

@@ -870,7 +870,7 @@ module Scoutui::Base
         processAssertions(my_driver, e)
 
          if !_region.nil?
-          eyeScount.check_window(_name, _region)
+          eyeScout.check_window(_name, _region)
         else
           eyeScout.check_window(_name)
         end

data/lib/scoutui/eyes/eye_scout.rb

@@ -1,6 +1,8 @@
 #require 'eyes_selenium'
 #require 'testmgr'
 require 'httparty'
+#require 'uri'
+#require 'cgi'
 
 module Scoutui::Eyes
 
@@ -36,10 +38,27 @@ module Scoutui::Eyes
     def get_session_id(url)
       Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " -- get_session_id(#{url}) =="
       _s=/sessions\/(?<session>\d+)/.match(url)[1]
+    end
+
+    def get_accountid(url)
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " -- get_account_id(#{url}) =="
+
+      uri = URI(url)
+      queryString = CGI::parse(uri.query)
+
+      accountid = queryString['accountId'] || queryString['accountid']
 
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " => accountId : #{accountid}"
+
+#      _s=/sessions\/(?<accountid>\d+)/.match(url)[1]
+
+      accountid.is_a?(Array) ? accountid[0] : accountid
     end
 
-    def get_diff_urls(session_id, view_key)
+    def Legacyget_diff_urls(session_id, view_key)
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "=== get_diffs_url(#{session_id} ==="
+
       info = "https://eyes.applitools.com/api/sessions/#{session_id}/?ApiKey=#{view_key}&format=json"
       diff_template = "https://eyes.applitools.com/api/sessions/#{session_id}/steps/%s/diff?ApiKey=#{view_key}"
       diff_urls = Hash.new
@@ -70,6 +89,45 @@ module Scoutui::Eyes
 
     end
 
+
+    def get_diff_urls(session_id, account_id, view_key)
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " == get_diffs_url(#{session_id} =="
+
+      info = "https://eyes.applitools.com/api/sessions/#{session_id}?ApiKey=#{view_key}&format=json"
+     #info = "https://eyes.applitools.com/api/sessions/#{session_id}?accountId=#{account_id}&format=json"
+      diff_template = "https://eyes.applitools.com/api/sessions/#{session_id}/steps/%s/diff?ApiKey=#{view_key}"
+      diff_template = "https://eyes.applitools.com/api/sessions/#{session_id}?accountId=#{account_id}&format=json"
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " diff_template => #{diff_template}"
+      diff_urls = Hash.new
+
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " info => #{info}"
+      response = HTTParty.get(info)
+
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " RESP => #{response.to_s}"
+
+      begin
+        data = JSON.parse(response.body)
+        index = 1
+        data['actualOutput'].each do |elem|
+          if !elem.nil? && (elem['isMatching'] == false)
+            #diff_urls[index] = diff_template % [index]
+            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " #{index.to_s} :#{elem['tag'].to_s}"
+            #diff_urls[index] = diff_template % [index]
+            diff_urls[index] = { :tag => elem['tag'].to_s, :url => diff_template % [index] }
+            index+=1
+          end
+        end
+
+        diff_urls
+
+      rescue JSON::ParserError
+        ;
+      end
+
+    end
+
     def sanitize_filename(filename)
       # Split the name when finding a period which is preceded by some
       # character, and is followed by some character other than a period,
@@ -87,21 +145,49 @@ module Scoutui::Eyes
     end
 
     def download_images(diff_urls, destination)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " download_images(#{diff_urls}, #{destination}"
+
       diff_urls.each do |index, elem|
         save_name = sanitize_filename(elem[:tag]) + ".step_#{index}_diff.png"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => download : #{save_name}"
+
         File.open("#{destination}/#{save_name}", 'wb') do |file|
           file.write HTTParty.get(elem[:url])
         end
       end
     end
 
+    def Legacy_saveDiffs(_eyes, results, outdir, view_key)
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s +  "  saveDiffs(#{outdir.to_s})"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " | eyesResults => #{results.to_s}"
+
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " | steps : #{results.steps.to_s}"
+      session_id = get_session_id(results.url)
+      Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " session => #{session_id}"
+
+      diffs = Legacyget_diff_urls(session_id, view_key)
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " diffs => #{diffs}"
+      if diffs.is_a?(Array)
+        diffs.each do |d|
+          Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " #{d.to_s}"
+        end
+
+        download_images(diffs, outdir)
+      end
+
+    end
+
     def saveDiffs(_eyes, results, outdir, view_key)
       Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s +  "  saveDiffs(#{outdir.to_s})"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  results => #{results.to_s}"
 
       Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " | steps : #{results.steps.to_s}"
       session_id = get_session_id(results.url)
       Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " session => #{session_id}"
 
+      account_id = get_accountid(results.url)
+
       diffs = get_diff_urls(session_id, view_key)
 
       diffs.each do |d|
@@ -121,6 +207,17 @@ module Scoutui::Eyes
       return if !Scoutui::Utils::TestUtils.instance.eyesEnabled?
       @testResults = eyes().close(false)
 
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " @eyes => #{eyes().to_s}"
+
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "| app_name : #{eyes().app_name}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "| match_level: #{eyes().match_level}"
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "| viewport_size: #{eyes().viewport_size.to_s}"
+
+      eyes().viewport_size.to_hash.each_pair do |k, v|
+        Scoutui::Logger::LogMgr.instance.debug  "  o " + k.to_s + " : " + v.to_s
+      end
+
       Testmgr::TestReport.instance.getReq("EYES").testcase('Images').add(@testResults.steps.to_i > 0, "Verify at least 1 shot taken (#{@testResults.steps.to_s} shots)")
       Testmgr::TestReport.instance.getReq("EYES").testcase('Images').add(@testResults.missing.to_i==0, "Verify Eyes did not miss any screens (#{@testResults.missing.to_s} screens)")
 
@@ -129,7 +226,7 @@ module Scoutui::Eyes
       if ENV.has_key?('APPLITOOLS_VIEW_KEY') && !_diffdir.nil?
 
         if Dir.exists?(_diffdir)
-          saveDiffs(eyes(), @testResults, _diffdir, ENV['APPLITOOLS_VIEW_KEY'])
+          Legacy_saveDiffs(eyes(), @testResults, _diffdir, ENV['APPLITOOLS_VIEW_KEY'])
         else
           Scoutui::Logger::LogMgr.instance.warn " Specified Visual Diff folder does not exist - #{_diffdir.to_s}.  Unable to download diffs"
         end

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.15.pre"
+  VERSION = "2.0.3.16.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.15.pre
+  version: 2.0.3.16.pre
 platform: ruby
 authors:
 - Peter Kim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,6 +219,7 @@ files:
 - examples/ex2/tests/test-example2.sh
 - examples/ex2/tests/test-example3.sauce.sh
 - examples/ex2/tests/test-example3.sh
+- examples/eyes/ex2.rb
 - examples/eyes_results/response.json
 - lib/scoutui.rb
 - lib/scoutui/appmodel/q_model.rb