axe-core-api 4.6.1.pre.311e4da → 4.7.0.pre.0c19f86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dc193a35646aed3a5ee34ba6b9b1746af646466f3b9611c6232422bea937a87
-  data.tar.gz: e575e139bcda867887b8330aa9586700a128897591cc380118d763a81fe3390a
+  metadata.gz: f32bd4ec89e0f82b22345d3d502cdf7214a486947e9403c9950bb2a141b74157
+  data.tar.gz: 0f9fd994a42519f1b2bf4fecd0c6643b83f725337db94b1515dd10f8cf5e4c6b
 SHA512:
-  metadata.gz: c809a3811675063e9d4fb20682a3cc79814754a8370f3e86f6653c2b9dfe6afc5814bf589d7cdbc6f5eb070865a1fdce5a748adc270fd64e3c0a724d963b4bb0
-  data.tar.gz: a4f1a1f6e73ae9741ec2b8caccc7514d639aa62afb31bc545afb502e8d2ddb11bfdedf88a5bbf41b76f65a762fc8d4b65474c3edf6bfd5a5e57db60131ffddbf
+  metadata.gz: 7edb8a8b3ee384bc4798e232a84fef5ab36507d76ac25e650038c225b2cf4c794fbf8cdeaa682e8909abfcae2d5ef11e0686c52164178b1a1dfb595d2329549b
+  data.tar.gz: f4b66720512f7f8338366605d277b6cfadb212f830d2ca83179093ed3051d61a6fa0dc2f0d26cb93ae1d127b274366a116cd315229aa7bda8e0ba70becb8d014

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 = 20_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
@@ -126,20 +133,30 @@ module Axe
           end
 
           res = axe_run_partial page, context
-          if res.key?("errorMessage")
-            throw res if top_level
+          if res.nil? || res.key?("errorMessage")
+            if top_level
+              throw res unless res.nil?
+              throw "axe.runPartial returned null"
+            end
             return [nil]
           else
             results = [res]
           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