axe-core-api 4.7.0.pre.5cb81f7 → 4.7.0.pre.7fc5a48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63159393301b9412aef8c4985d721bb4296316866a8cbc05a8465fa40077fcb2
-  data.tar.gz: e0e8b4c76b4f1a512ab415a22c4dc373a3eae9a898a7067dd1aed02a977ee61b
+  metadata.gz: 720b1837f977baf630c6579f0c1890f1d254adc453b1186a3a908531fbe64120
+  data.tar.gz: a5e55c477c0f9d207c26bb4220b7a5ca470506cf58ca5b8461ab9c346c81edaf
 SHA512:
-  metadata.gz: e62475b52597c15a2f5dcaefffbf7d457fae86a6a03c19aee013234a19ce15f80c2f33000f57cb4ab683731b899eb1d9e4a6d85569fd80a63f051d338ad87b69
-  data.tar.gz: 501a16eb84da7b92075645d84f1f40b05eaeaf7568abd4c423455b72db2231289f8121a1d8195464fd0236e2f9b0a7eb6e59a775efdad79f4477851571e37e5e
+  metadata.gz: d515501790fb498e2c4edb35375607b731e69030bf3f1986124fe91ffbcdf7bf7755f7d768b9516c7b3c181d43a76cc87543d08f2c2cf8716706e78a88f02d27
+  data.tar.gz: e0c87923fbd37c05fa547be00a8c3a59881a8af2591e437d7f8ca971fafff43018eab45691c9a87f6236bfd5e3c3c1340f99c5b87ec89bf67d7dde751b286c2b

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
@@ -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