scoutui 2.0.3.4.pre → 2.0.3.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527f1f2733f22189ec8c9c60df25ef1bdd5dcc07
-  data.tar.gz: 7b4038b15f762a0fa0514ba1a2fa73feccd9f7c4
+  metadata.gz: 72d63f27b4ad75996c75b6f0dee10a171fc8c253
+  data.tar.gz: da5188f0b749627620d8c503feaa6ae5fe571a7c
 SHA512:
-  metadata.gz: b616c6f713ee98f9707f86aece0f819ca94dff25b0b9ea056746ec771d172932ee82fb5a84df5b224192fc739526e507ed412d92ad99f7f978d6592053e37220
-  data.tar.gz: e0ffad4cdbfcd7dfa7f8a37e9eaadbe2b5d15dc9cc2febe92d768f414d0e076075909f9f22a9c090e0ecac0bc958f1d9ceb9ca36caab9d44de1a5ea1069ff081
+  metadata.gz: 654175f6640baf9a7ba3c67f5a86f6d03af6c200d7956c4fb266494d379cc06f8361721f45b63f12e6100897ce755cbb7a014c8992930f171316e7b3a74e4461
+  data.tar.gz: 8fe1826a4bbf267a92ae9dc40408cc301f3c84a3b91e32336bef117ba2a60f3ae7ee613950c131b8bb1cee3d955d4e01c4609f02188f4504dad16b0587f31564

data/lib/scoutui/base/q_browser.rb

@@ -12,6 +12,10 @@ module Scoutui::Base
     def initialize()
     end
 
+    def self.isChrome?(drv)
+      drv.browser.to_s.match(/chrome/i)
+    end
+
     def self.wait_for_displayed(drv, locator, _timeout=30)
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " wait_for_displayed(#{xpath}"
       rc=nil
@@ -92,13 +96,82 @@ module Scoutui::Base
     end
 
 
+    def self.switch_into_frame(drv, id)
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " switch_into_frame(#{id})"
+
+      hit=nil
+
+      if isChrome?(drv)
+
+        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}"
+
+        if bframes.size == 0
+          bframes = drv.find_elements(:xpath, '//frame')
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " //frame : #{bframes.size}"
+        end
+
+        for i in 0 .. bframes.size - 1
+          begin
+
+            _tag = bframes[i].attribute('name')
+
+            if !_tag.nil? && _tag.empty?
+              _tag = bframes[i].attribute('id')
+            end
+
+
+            puts __FILE__ + (__LINE__).to_s + " <tag, id> :: <#{_tag}, #{id} >"
+
+            if !_tag.empty? && id==_tag
+
+              hit = bframes[i]
+              drv.switch_to.frame hit
+
+              puts __FILE__ + (__LINE__).to_s + " swtichframe to #{i} - #{_tag}"
+              break
+            end
+
+          rescue => ex
+            Scoutui::Logger::LogMgr.instance.debug "Error during processing: #{$!}"
+            Scoutui::Logger::LogMgr.instance.debug "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+          end
+
+        end
+
+      else
+        # Firefox, IE
+        hit = drv.switch_to.frame(id.to_s.strip)
+      end
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " switch_into_frame(#{id}) => #{hit}"
+      hit
+    end
+
     # e : Hash : Command stanza from YML
+    # s : String
+    #
+    # format: frame(<string>)[.frame(<string>)]*
     def self.switch_frame(drv, 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']}";
 
         frames=e['page']['frames']
+      elsif e.is_a?(String)
+        frames=e
+      end
+
+
+      if !frames.nil?
+        puts __FILE__ + (__LINE__).to_s + " frames => #{frames}";
+
         frame_list=frames.split(/(frame\(.*\))\.(?=[\w])/)
+
         frame_list.each do |_f|
 
 
@@ -107,7 +180,13 @@ module Scoutui::Base
 
             puts __FILE__ + (__LINE__).to_s + " switch_to.frame #{_id}"
 
-            drv.switch_to.frame(_id.to_s.strip)
+            # Swtich based on browser type
+
+              if switch_into_frame(drv, _id).nil?
+                Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " Frame with name/id #{_id} not found"
+                break
+              end
+
           end
 
         end
@@ -162,8 +241,6 @@ module Scoutui::Base
         rc.concat frames
       end
 
-
-   #   _obj = drv.find_elements(:xpath, _locator)
       _obj = getObject(drv, _locator, _timeout)
 
       puts __FILE__ + (__LINE__).to_s + " frames => #{frames}  :  #{_obj}"
@@ -304,8 +381,6 @@ module Scoutui::Base
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Locator => #{locator}"
         Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Visible_When => #{visible_when}"
 
-      #  Selenium::WebDriver::Wait.new(timeout: _timeout).until { drv.find_element(:xpath => locator).displayed? }
-        # rc=drv.find_element(:xpath => locator)
         Selenium::WebDriver::Wait.new(timeout: _timeout).until { rc=drv.find_element( locateBy => locator) }
 
 
@@ -324,15 +399,6 @@ module Scoutui::Base
 
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " getObject(#{locator}) => #{rc.to_s}" if Scoutui::Utils::TestUtils.instance.isDebug?
 
-#      if rc.kind_of?(Selenium::WebDriver::Element)
-#
-#        if visible_when
-#          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Displayed => #{rc.displayed?}"
-#          Testmgr::TestReport.instance.getReq('UI').tc('visible_when').add(rc.displayed?, "Verify #{locator} is visible")
-#        end
-#
-#      end
-
       rc
     end
 

data/lib/scoutui/version.rb

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

metadata

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