axe-core-api 4.7.0.pre.3fef592 → 4.7.0.pre.bef7d97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 184e8889d0e0267b547d795658a4821956bc829cb304faf5172a99721f1afba3
-  data.tar.gz: 6a85bd09134d066b0c6401147bd9c0ec967aebbd16d1cf62036ad56ccf366d11
+  metadata.gz: f63f03aabbdc386e87f007bca1f14e666203847b1bd40421998c24e2d2753de5
+  data.tar.gz: 15e008be4b1485ba688b20623fb745b573926f68cb26ae24df1e2fe881c17e0c
 SHA512:
-  metadata.gz: fb3a6c1d3e8e098df050224426c2d4a78349997af9cc62a6f835a898be026a3ece34d9fa9ce67f1886774b35e4e3e0d85e932460356af9fd5c9e516a8704fe2e
-  data.tar.gz: 0c907651e2dff7d014571deb724ac1c6bed6fcd0cb8398dae61f3a1c9a97dd71ae164af04295dec80313dfa05afa340a68cd76ca72c1eaf12c75efdb137f5259
+  metadata.gz: 45017760cb3d8fd6a57516f3eb46d91430e1cd0a29a645f07c859e7680aaf54b06ddf98f8119e0479bf8bf61c4b2d4e73db269135e269ccb2eb8e32aa1b9c90c
+  data.tar.gz: da50e4c0d64abd5edc33c7ed947e21dd926beed96f3b09e0db477e8fcff2b97e4dc52eb3caac11fd66e874fb2960dca9e3904ca1791196f7abfc0af3daf52de5

data/lib/axe/api/run.rb

@@ -32,27 +32,34 @@ module Axe
       end
 
       def analyze_post_43x(page, lib)
-        @original_window = window_handle page
-        partial_results = run_partial_recursive(page, @context, lib, true)
-        throw partial_results if partial_results.respond_to?("key?") and partial_results.key?("errorMessage")
-        results = within_about_blank_context(page) { |page|
-          partial_res_str = partial_results.to_json
-          size_limit = 10_000_000
-          while not partial_res_str.empty? do
-            chunk_size = size_limit
-            chunk_size = partial_res_str.length if chunk_size > partial_res_str.length
-            chunk = partial_res_str[0..chunk_size-1]
-            partial_res_str = partial_res_str[chunk_size..-1]
-            store_chunk page, chunk
-          end
-
-          Common::Loader.new(page, lib).load_top_level Axe::Configuration.instance.jslib
-          begin
-            axe_finish_run page
-          rescue
-            raise StandardError.new "axe.finishRun failed. Please check out https://github.com/dequelabs/axe-core-gems/blob/develop/error-handling.md"
-          end
-        }
+        user_page_load = (get_selenium page).manage.timeouts.page_load
+        (get_selenium page).manage.timeouts.page_load = 1
+        begin
+          @original_window = window_handle page
+          partial_results = run_partial_recursive(page, @context, lib, true)
+          throw partial_results if partial_results.respond_to?("key?") and partial_results.key?("errorMessage")
+          results = within_about_blank_context(page) { |page|
+            partial_res_str = partial_results.to_json
+            size_limit = 10_000_000
+            while not partial_res_str.empty? do
+              chunk_size = size_limit
+              chunk_size = partial_res_str.length if chunk_size > partial_res_str.length
+              chunk = partial_res_str[0..chunk_size-1]
+              partial_res_str = partial_res_str[chunk_size..-1]
+              store_chunk page, chunk
+            end
+  
+            Common::Loader.new(page, lib).load_top_level Axe::Configuration.instance.jslib
+            begin
+              axe_finish_run page
+            rescue
+              raise StandardError.new "axe.finishRun failed. Please check out https://github.com/dequelabs/axe-core-gems/blob/develop/error-handling.md"
+            end
+  
+          }
+        ensure
+          (get_selenium page).manage.timeouts.page_load = user_page_load
+        end
         Audit.new to_js, Results.new(results)
       end
 
@@ -108,15 +115,15 @@ module Axe
         page.current_window_handle
       end
 
-      def run_partial_recursive(page, context, lib, top_level = false)
+      def run_partial_recursive(page, context, lib, top_level = false, frame_stack = [])
         begin
+          current_window_handle = window_handle page
           if not top_level
             begin
               Common::Loader.new(page, lib).load_top_level Axe::Configuration.instance.jslib
             rescue
               return [nil]
             end
-
           end
 
           frame_contexts = get_frame_context_script page
@@ -134,12 +141,19 @@ module Axe
           end
 
           for frame_context in frame_contexts
-            frame_selector = frame_context["frameSelector"]
-            frame_context = frame_context["frameContext"]
-            frame = axe_shadow_select page, frame_selector
-            switch_to_frame_by_handle page, frame
-            res = run_partial_recursive page, frame_context, lib
-            results += res
+            begin
+              frame_selector = frame_context["frameSelector"]
+              frame_context = frame_context["frameContext"]
+              frame = axe_shadow_select page, frame_selector
+              switch_to_frame_by_handle page, frame
+              res = run_partial_recursive page, frame_context, lib, false, [*frame_stack, frame]
+              results += res
+            rescue Selenium::WebDriver::Error::TimeoutError
+              page = get_selenium page
+              page.switch_to.window current_window_handle
+              frame_stack.each {|frame| page.switch_to.frame frame }
+              results.push nil
+            end
           end
 
         ensure

data/lib/axe/core.rb

@@ -3,6 +3,7 @@ require_relative "../webdriver_script_adapter/frame_adapter"
 require_relative "../webdriver_script_adapter/query_selector_adapter"
 require_relative "../loader"
 require_relative "./configuration"
+require 'timeout'
 
 module Axe
   class Core
@@ -37,8 +38,22 @@ module Axe
       Core.has_run_partial?(@page) and not Axe::Configuration.instance.legacy_mode
     end
 
+    def assert_frame_ready
+      begin
+        ready = Timeout.timeout(10) {
+          @page.evaluate_script <<-JS
+            document.readyState === 'complete'
+          JS
+        }
+      rescue Timeout::Error
+        ready = false
+      end
+      raise Exception.new "Page/frame not ready" if not ready
+    end
+
     def load_axe_core(source)
       return if already_loaded?
+      assert_frame_ready
       loader = Common::Loader.new(@page, self)
       loader.load_top_level source
       return if use_run_partial

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axe-core-api
 version: !ruby/object:Gem::Version
-  version: 4.7.0.pre.3fef592
+  version: 4.7.0.pre.bef7d97
 platform: ruby
 authors:
 - Deque Systems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dumb_delegator