scoutui 2.0.3.5.pre → 2.0.3.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72d63f27b4ad75996c75b6f0dee10a171fc8c253
-  data.tar.gz: da5188f0b749627620d8c503feaa6ae5fe571a7c
+  metadata.gz: 096cfa3809706ec4eeec2030cc803f6d8cd171e6
+  data.tar.gz: 32a508794bd4e1dd4d8963e0059ecccd04528377
 SHA512:
-  metadata.gz: 654175f6640baf9a7ba3c67f5a86f6d03af6c200d7956c4fb266494d379cc06f8361721f45b63f12e6100897ce755cbb7a014c8992930f171316e7b3a74e4461
-  data.tar.gz: 8fe1826a4bbf267a92ae9dc40408cc301f3c84a3b91e32336bef117ba2a60f3ae7ee613950c131b8bb1cee3d955d4e01c4609f02188f4504dad16b0587f31564
+  metadata.gz: 1df2a115ace9a8c1f3ad84009a79c44003fb624c3e3be5eb3f0861f6aeaaebc7a15c261e2c462b1e285b4b83a65899b981673d9a501d09119c5a55864f1d3608
+  data.tar.gz: 4c27ccb3f63394650c0c38e44fd731a8515746f35b18eb254bdd476e10e5b9183c9cda2d5fa3564ef01763c54ea2ec3428f891b205dfa1910cbb1bc26a4c4374

data/lib/scoutui/base/assertions.rb

@@ -69,7 +69,7 @@ module Scoutui::Base
 
               if _v.is_a?(String)
                 puts __FILE__ + (__LINE__).to_s + " #{_v} is a string - next"
-                puts __FILE__ + (__LINE__).to_S + " Pause", gets
+                puts __FILE__ + (__LINE__).to_S + " TBD"  # Pause", gets
                 next
               end
 
@@ -120,7 +120,7 @@ module Scoutui::Base
 
 
                 elsif assertPageElement(_k, _v, _obj, my_driver, _req)
-                  puts __FILE__ + (__LINE__).to_s + " Processed assertPageElement(#{_k}, #{_v})"; # gets
+                  puts __FILE__ + (__LINE__).to_s + " Processed assertPageElement(#{_k}, #{_v})";
                   ;
 #               elsif visible_when_title(_k, _v, _obj, my_driver, _req)
 #                 ;
@@ -186,6 +186,11 @@ module Scoutui::Base
       puts __FILE__ + (__LINE__).to_s + " Pause debug"; gets
     end
 
+
+    def isEanbled(my_driver, page_elt, _req=nil, _immediate=false)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isEanbled(#{page_elt}"
+    end
+
     #
     # { reqid : <pageElt> }
     def isVisible(my_driver, page_elt, _req=nil, _immediate=false)

data/lib/scoutui/base/q_browser.rb

@@ -106,7 +106,7 @@ module Scoutui::Base
         puts __FILE__ + (__LINE__).to_s + " swtich on Chrome browser"
         bframes = drv.find_elements(:xpath, '//iframe')
 
-        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " //iframe : #{bframes.size}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " //iframe : size #{bframes.size}"
 
         if bframes.size == 0
           bframes = drv.find_elements(:xpath, '//frame')
@@ -124,7 +124,7 @@ module Scoutui::Base
             end
 
 
-            puts __FILE__ + (__LINE__).to_s + " <tag, id> :: <#{_tag}, #{id} >"
+            puts __FILE__ + (__LINE__).to_s + "[switch_into_frame.chrome]: <tag, id> :: <#{_tag}, #{id} >"
 
             if !_tag.empty? && id==_tag
 
@@ -144,6 +144,8 @@ module Scoutui::Base
 
       else
         # Firefox, IE
+        puts __FILE__ + (__LINE__).to_s + " [switch_into_frame]: drv.switch_to.frame(#{id.to_s}";
+
         hit = drv.switch_to.frame(id.to_s.strip)
       end
 
@@ -157,6 +159,7 @@ module Scoutui::Base
     # format: frame(<string>)[.frame(<string>)]*
     def self.switch_frame(drv, e)
 
+      puts __FILE__ + (__LINE__).to_s + "\n\n== self.switch_frame(#{e}) =="
       frames=nil
       if e.is_a?(Hash) && e.has_key?('page') && e['page'].has_key?('frames')
         puts __FILE__ + (__LINE__).to_s + " frames => #{e['page']['frames']}";
@@ -168,24 +171,49 @@ module Scoutui::Base
 
 
       if !frames.nil?
-        puts __FILE__ + (__LINE__).to_s + " frames => #{frames}";
+        puts __FILE__ + (__LINE__).to_s + " [self.switch_frame]: frames => #{frames}";
 
         frame_list=frames.split(/(frame\(.*\))\.(?=[\w])/)
 
         frame_list.each do |_f|
-
+          puts __FILE__ + (__LINE__).to_s + " processing #{_f}"
 
           if !_f.empty?
             _id = _f.match(/frame\((.*)\)/)[1]
 
-            puts __FILE__ + (__LINE__).to_s + " switch_to.frame #{_id}"
+            puts __FILE__ + (__LINE__).to_s + " [self.switch_frame]: switch_to.frame #{_id}"
 
             # Swtich based on browser type
 
+            if isChrome?(drv)
               if switch_into_frame(drv, _id).nil?
                 Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Frame with name/id #{_id} not found"
                 break
+              else
+                Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Sucessfully switched frame into #{_id}"
               end
+            else
+              puts __FILE__ + (__LINE__).to_s + " [firefox]: switch_to.frame #{_id}"
+              drv.switch_to.frame _id
+            end
+
+            if false
+
+              if drv.browser.to_s.match(/firefox/i)
+                puts __FILE__ + (__LINE__).to_s + " [firefox]: switch_to.frame #{_id}"
+                drv.switch_to.frame _id
+              else
+
+                if switch_into_frame(drv, _id).nil?
+                  Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Frame with name/id #{_id} not found"
+                  break
+                else
+                  Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Sucessfully switched frame into #{_id}"
+                end
+              end
+
+            end
+
 
           end
 
@@ -227,7 +255,7 @@ module Scoutui::Base
 
     def self.frame_getObject(drv, _locator, _timeout=nil)
 
-      puts __FILE__ + (__LINE__).to_s + " frame_getObject : #{_locator}"
+      puts __FILE__ + (__LINE__).to_s + " [enter]:frame_getObject : #{_locator}"
 
       rc = Array.new()
 
@@ -249,6 +277,8 @@ module Scoutui::Base
 
         for i in 0 .. (frames.size - 1)
 
+          _madeSwitch=false
+
           begin
 
             _tag = frames[i].attribute('name')
@@ -268,10 +298,14 @@ module Scoutui::Base
             if drv.browser.to_s.match(/chrome/)
               drv.switch_to.frame frames[i]
             else
+
+              puts __FILE__ + (__LINE__).to_s +  " switch_to.frame #{_tag}"
               drv.switch_to.frame _tag
             end
 
+            _madeSwitch=true
 
+            # Recurse into sub-frames
             _hits = frame_getObject(drv, _locator, 3)
           rescue => ex
             Scoutui::Logger::LogMgr.instance.debug "Error during processing: #{$!}"
@@ -289,7 +323,8 @@ module Scoutui::Base
             break
           end
 
-          drv.switch_to.parent_frame
+          puts __FILE__ + (__LINE__).to_s + " switch_to.parent_frame()"
+          drv.switch_to.parent_frame if _madeSwitch
 
         end
 

data/lib/scoutui/base/q_form.rb

@@ -190,7 +190,6 @@ module Scoutui::Base
                         Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " |        location  : #{_o.location}"
                         Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " |        selected  :#{_o.selected?}"
                         Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " |        methods:#{_o.methods.sort.to_s}" # ", #{_o.text.to_s}, selected: #{_o.to_s}"
-                        # Scoutui::Logger::LogMgr.instance.commands.debug __FILE__ + (__LINE__).to_s + " PAUSE"; gets()
                       end
                     end
 

data/lib/scoutui/base/visual_test_framework.rb

@@ -355,10 +355,15 @@ module Scoutui::Base
             Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Temp req #{_req} for assertion"
           end
 
+          if _v.has_key?('locator')  && _v['locator'].is_a?(String) && _v.has_key?('enabled_when')
 
-          if _v.has_key?('locator')  && _v['locator'].is_a?(String) && !_v.has_key?('visible_when')
+            Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Process pageObject #{_v} for enabled_when - PAUSE"; gets;
+            isVisible=Scoutui::Base::Assertions.instance.isEnabled(my_driver, _v, _req)
+
+          elsif _v.has_key?('locator')  && _v['locator'].is_a?(String) && !_v.has_key?('visible_when')
             Scoutui::Logger::LogMgr.instance.info __FILE__ + (__LINE__).to_s + " Process pageObject #{_v}"
             isVisible=Scoutui::Base::Assertions.instance.isVisible(my_driver, _v['locator'], _req)
+
           elsif _v.has_key?('locator')
             _locator = _v['locator'].to_s
 
@@ -712,14 +717,10 @@ module Scoutui::Base
 
           if _execute_when.is_a?(String) && _execute_when.match(/^\s*(existsalert|existsalert|exists\(alert\))/i)
 
-#            puts __FILE__ + (__LINE__).to_s + " DEBUG - pause"; gets;
 
             if QBrowser.existsAlert?(my_driver)
               Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Execution continues - alert IS present #{e[STEP_KEY]}"
 
-#              puts __FILE__ + (__LINE__).to_s + " DEBUG - pause2"; gets;
-
-
             else
 #              puts __FILE__ + (__LINE__).to_s + " + Execution skipped - alert is NOT present";; gets()
               next;
@@ -749,8 +750,6 @@ module Scoutui::Base
         end
 
 
-
-
         if !isRun(e).nil?
 
           Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " ========> RUN <================="
@@ -788,6 +787,8 @@ module Scoutui::Base
           #  if !eyeScout.getStrategy().processCommand(_action, e)
             if !_command.wasExecuted?
               processCommand(_action, e, my_driver)
+            else
+              Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Command #{_action} was not executed"
             end
 
             processExpected(my_driver, e)

data/lib/scoutui/commands/strategy.rb

@@ -211,7 +211,7 @@ module Scoutui::Commands
         sauce_endpoint = "http://#{ENV['SAUCE_USERNAME']}:#{ENV['SAUCE_ACCESS_KEY']}@ondemand.saucelabs.com:80/wd/hub"
 
         caps[:name]=Scoutui::Utils::TestUtils.instance.getSauceName()
-        caps[:tags]=["Concur QE", "ScoutUI"]
+        caps[:tags]=[caps[:name], "ScoutUI"]
 
         begin
           if client.nil?
@@ -225,6 +225,10 @@ module Scoutui::Commands
           Scoutui::Logger::LogMgr.instance.debug "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
         end
 
+        # The following print to STDOUT is useful when running on JENKINS with SauceLabs plugin
+        # Reference:
+        #   https://wiki.saucelabs.com/display/DOCS/Setting+Up+Reporting+between+Sauce+Labs+and+Jenkins
+        puts "SauceOnDemandSessionID=#{@drv.session_id} job-name=#{caps[:name]}"
 
       else
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Create WebDriver: #{browserType.to_s}"

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.5.pre"
+  VERSION = "2.0.3.6.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.5.pre
+  version: 2.0.3.6.pre
 platform: ruby
 authors:
 - Peter Kim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler