axe-core-api 4.0.0.pre.287120d → 4.2.0.pre.6beb600

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 003b9dcdc5e275cd5ac5733265e80c40ddee5771e1385d4a1da1340c81950980
-  data.tar.gz: cce2443c8c16750ea59ab54be236a8f706a4bc5ef984accb251fc7160407dd2d
+  metadata.gz: 93fdbc2f4d06b670e6a36caa7489196b44f3b2a09e939ec16b541ae7c45c47d9
+  data.tar.gz: 7dcc16ad9bd768830d7a5a227ba72af18e7ec67d0612397cd8cd391547049c0d
 SHA512:
-  metadata.gz: 578da0b5eabeb562f5ec9604fdbcd2e96f2d19920b77cbc9fb30a2b3c3acb1840118a35b46974ff6cef767497c3e7edc36e0ce15009a3fde99e41b6024e0e205
-  data.tar.gz: 2848e4c3b6a0a33d39bcd257327bbb021581a23e2a4a3fe8c212ff71f918debf513d475251fc00e4917cde52c62449dc43114a1befe9c7883b284ee6d3c03802
+  metadata.gz: e359e128c431a0345906f64bdf29444f35f5128cb67c728cf4af58bbbe55e88b6d600b4766800e886e16d225f6746f3e0c31f911e9fd21e895f9de740356e13b
+  data.tar.gz: daa3fcd4f2c12b81e560e19771151ae3010977153f74423b31b16e5567dac224ce89825ed53da5556ea56bf5991a8db4120f144a333e983b29870ba6ea4fd6d9

data/lib/axe/api/context.rb

@@ -16,13 +16,19 @@ module Axe
         @exclusion.concat selectors.map { |s| Array(Selector.new s) }
       end
 
+      def to_h
+        to_hash
+      end
       def to_hash
-        { include: @inclusion, exclude: @exclusion }
-          .reject { |k, v| v.empty? }
+        return { exclude: @exclusion } if @inclusion.empty?
+        h = {}
+        h["include"] = @inclusion unless @inclusion.empty?
+        h["exclude"] = @exclusion unless @exclusion.empty?
+        h
       end
 
-      def to_json
-        to_hash.to_json
+      def to_json(options = nil)
+        to_hash.to_json options
       end
 
       def empty?

data/lib/axe/api/options.rb

@@ -14,12 +14,16 @@ module Axe
         @custom = {}
       end
 
+      def to_h
+        to_hash
+      end
+
       def to_hash
         @rules.to_hash.merge(@custom)
       end
 
-      def to_json
-        to_hash.to_json
+      def to_json(options = nil)
+        to_hash.to_json options
       end
 
       def empty?

data/lib/axe/api/results.rb

@@ -10,6 +10,10 @@ module Axe
         attribute :incomplete, ::Array[Rule]
         attribute :passes, ::Array[Rule]
         attribute :timestamp
+        attribute :testEngine
+        attribute :testEnvironment
+        attribute :testRunner
+        attribute :toolOptions
         attribute :url, ::String
         attribute :violations, ::Array[Rule]
       end
@@ -28,12 +32,18 @@ module Axe
           inapplicable: inapplicable.map(&:to_h),
           incomplete: incomplete.map(&:to_h),
           passes: passes.map(&:to_h),
+          testEngine: testEngine,
           timestamp: timestamp,
           url: url,
           violations: violations.map(&:to_h),
         }
       end
 
+      def timestamp=(ts)
+        timestamp = ts
+      end
+
+
       private
 
       def violation_count_message

data/lib/axe/api/run.rb

@@ -27,21 +27,170 @@ module Axe
       end
 
       def call(page)
-        audit page do |results|
-          Audit.new to_js, Results.new(results)
-        end
+        results = audit page
+        Audit.new to_js, Results.new(results)
+      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|
+          Common::Loader.new(page, lib).load_top_level Axe::Configuration.instance.jslib
+          axe_finish_run page, partial_results
+        }
+        Audit.new to_js, Results.new(results)
       end
 
       private
 
       def audit(page)
-        yield page.execute_async_script "#{METHOD_NAME}.apply(#{Core::JS_NAME}, arguments)", *js_args
+        script = <<-JS
+          var callback = arguments[arguments.length - 1];
+          var context = arguments[0] || document;
+          var options = arguments[1] || {};
+          #{METHOD_NAME}(context, options).then(callback);
+        JS
+        page.execute_async_script_fixed script, *js_args
+      end
+
+      def switch_to_frame_by_handle(page, handle)
+        page = get_selenium page
+        page.switch_to.frame handle
+      end
+
+      def switch_to_parent_frame(page)
+        page = get_selenium page
+        page.switch_to.parent_frame
+      end
+
+      def within_about_blank_context(page)
+        driver = get_selenium page
+
+        driver.execute_script("window.open('about:blank'), '_blank'")
+        driver.switch_to.window page.window_handles[-1]
+        driver.get "about:blank"
+
+        ret = yield page
+
+        driver.switch_to.window page.window_handles[-1]
+        driver.close
+        driver.switch_to.window @original_window
+
+        ret
+      end
+      def window_handle(page)
+        page = get_selenium page
+
+        return page.window_handle if page.respond_to?("window_handle")
+        page.current_window_handle
+      end
+
+      def run_partial_recursive(page, context, lib, top_level = false)
+        begin
+          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
+          if frame_contexts.respond_to?("key?") and frame_contexts.key?("errorMessage")
+            throw frame_contexts if top_level
+            return [nil]
+          end
+
+          res = axe_run_partial page, context
+          if res.key?("errorMessage")
+            throw res if top_level
+            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
+          end
+
+        ensure
+          switch_to_parent_frame page if not top_level
+        end
+        return results
+      end
+
+      def axe_finish_run(page, partial_results)
+        script = <<-JS
+          const partialResults = arguments[0];
+          return axe.finishRun(partialResults);
+        JS
+        page.execute_script_fixed script, partial_results
+      end
+
+      def axe_shadow_select(page, frame_selector)
+        script = <<-JS
+          const frameSelector = arguments[0];
+          return axe.utils.shadowSelect(frameSelector);
+        JS
+        page.execute_script_fixed script, frame_selector
+      end
+
+      def axe_run_partial(page, context)
+        script = <<-JS
+          const context = arguments[0];
+          const options = arguments[1];
+          const cb = arguments[arguments.length - 1];
+          try {
+            const ret = window.axe.runPartial(context, options);
+            cb(ret);
+          } catch (err) {
+            const ret = {
+              violations: [],
+              passes: [],
+              url: '',
+              timestamp: new Date().toString(),
+              errorMessage: err.message
+            };
+            cb(ret);
+          }
+        JS
+        page.execute_async_script_fixed script, context, @options
+      end
+
+      def get_frame_context_script(page)
+        script = <<-JS
+          const context = arguments[0];
+          try {
+            return window.axe.utils.getFrameContexts(context);
+          } catch (err) {
+            return {
+              violations: [],
+              passes: [],
+              url: '',
+              timestamp: new Date().toString(),
+              errorMessage: err.message
+            };
+          }
+        JS
+        page.execute_script_fixed script, @context
+      end
+
+      def get_selenium(page)
+        page = page.driver if page.respond_to?("driver")
+        page = page.browser if page.respond_to?("browser") and not page.browser.is_a?(::Symbol)
+        page
       end
 
       def js_args
         [@context, @options]
-          .reject(&:empty?)
-          .map(&:to_json)
+          .map(&:to_h)
       end
 
       def to_js

data/lib/axe/configuration.rb

@@ -26,7 +26,7 @@ module Axe
     # init
     def initialize
       @page = :page
-      @skip_iframes = :skip_iframes
+      @skip_iframes = nil
       @jslib_path = get_root + "/node_modules/axe-core/axe.min.js"
     end
 

data/lib/axe/core.rb

@@ -14,13 +14,32 @@ module Axe
     end
 
     def call(callable)
-      callable.call(@page)
+      if has_run_partial?
+        callable.analyze_post_43x @page, self
+      else
+        callable.call @page
+      end
+    end
+
+    def call_verbatim(callable)
+      callable.call @page
     end
 
     private
 
     def load_axe_core(source)
-      Common::Loader.new(@page, self).call(source) unless already_loaded?
+      return if already_loaded?
+      loader = Common::Loader.new(@page, self)
+      loader.load_top_level source
+      return if has_run_partial?
+
+      loader.call source
+    end
+
+    def has_run_partial?
+      @page.evaluate_script <<-JS
+          typeof window.axe.runPartial === 'function'
+      JS
     end
 
     def already_loaded?
@@ -31,6 +50,7 @@ module Axe
     end
 
     def wrap_driver(driver)
+      driver = driver.driver if driver.respond_to? :driver
       ::WebDriverScriptAdapter::QuerySelectorAdapter.wrap(
         ::WebDriverScriptAdapter::FrameAdapter.wrap(
           ::WebDriverScriptAdapter::ExecuteAsyncScriptAdapter.wrap(

data/lib/loader.rb

@@ -6,10 +6,18 @@ module Common
     def initialize(page, lib)
       @page = page
       @lib = lib
+      @loaded_top_level = false
     end
 
-    def call(source)
+    def load_top_level(source)
       @page.execute_script source
+      @loaded_top_level = true
+      Common::Hooks.run_after_load @lib
+    end
+
+    def call(source, is_top_level = true)
+      @page.execute_script source unless (@loaded_top_level and is_top_level)
+      @page.execute_script "axe.configure({ allowedOrigins: ['<unsafe_all_origins>'] });"
       Common::Hooks.run_after_load @lib
       load_into_iframes(source) unless Axe::Configuration.instance.skip_iframes
     end
@@ -18,7 +26,7 @@ module Common
 
     def load_into_iframes(source)
       @page.find_frames.each do |iframe|
-        @page.within_frame(iframe) { call source }
+        @page.within_frame(iframe) { call source, false }
       end
     end
   end

data/lib/webdriver_script_adapter/exec_eval_script_adapter.rb

@@ -8,7 +8,7 @@ module WebDriverScriptAdapter
     def self.wrap(driver)
       raise WebDriverError, "WebDriver must respond to #execute_script" unless driver.respond_to? :execute_script
 
-      driver.respond_to?(:evaluate_script) ? driver : new(driver)
+      driver.respond_to?(:evaluate_script) ? ExecEvalScriptAdapter2.new(driver) : new(driver)
     end
 
     # executes script without returning result
@@ -21,6 +21,19 @@ module WebDriverScriptAdapter
     def evaluate_script(script)
       __getobj__.execute_script "return #{script}"
     end
+
+    def execute_script_fixed(script, *args)
+      page = __getobj__
+      page.execute_script(script, *args)
+    end
+  end
+  class ExecEvalScriptAdapter2 < ::DumbDelegator
+    def execute_script_fixed(script, *args)
+      page = __getobj__
+      page = page.driver if page.respond_to?("driver")
+      page = page.browser if page.respond_to?("browser") and not page.browser.is_a?(::Symbol)
+      page.execute_script(script, *args)
+    end
   end
 
   class WebDriverError < TypeError; end

data/lib/webdriver_script_adapter/execute_async_script_adapter.rb

@@ -3,6 +3,11 @@ require "securerandom"
 require "timeout"
 require_relative "./exec_eval_script_adapter"
 
+def get_selenium(page)
+  page = page.driver if page.respond_to?("driver")
+  page = page.browser if page.respond_to?("browser") and not page.browser.is_a?(Symbol)
+  page
+end
 module WebDriverScriptAdapter
   class << self
     attr_accessor :async_results_identifier,
@@ -76,7 +81,7 @@ module WebDriverScriptAdapter
 
   class ExecuteAsyncScriptAdapter < ::DumbDelegator
     def self.wrap(driver)
-      new ExecEvalScriptAdapter.wrap driver
+      new driver
     end
 
     def execute_async_script(script, *args)
@@ -84,6 +89,13 @@ module WebDriverScriptAdapter
       execute_script ScriptWriter.async_wrapper(script, *args, ScriptWriter.callback(results))
       Patiently.wait_until { evaluate_script results }
     end
+
+    def execute_async_script_fixed(script, *args)
+      page = __getobj__
+      page = page.driver if page.respond_to?("driver")
+      page = page.browser if page.respond_to?("browser") and not page.browser.is_a?(::Symbol)
+      page.execute_async_script(script, *args)
+    end
   end
 
   configure do |c|

data/lib/webdriver_script_adapter/frame_adapter.rb

@@ -3,7 +3,7 @@ require "dumb_delegator"
 module WebDriverScriptAdapter
   class FrameAdapter < ::DumbDelegator
     def self.wrap(driver)
-      if driver.respond_to?(:within_frame)
+      if driver.respond_to?(:find_css)
         CapybaraAdapter.new driver
       elsif !driver.respond_to?(:switch_to)
         WatirAdapter.new driver
@@ -16,20 +16,19 @@ module WebDriverScriptAdapter
 
     private
 
-    class CapybaraAdapter < ::DumbDelegator
-      def find_frames
-        all(:css, "iframe")
+    class WatirAdapter < ::DumbDelegator
+      def initialize(driver)
+        super(driver)
+        @driver = driver
       end
-    end
 
-    class WatirAdapter < ::DumbDelegator
       # delegate to Watir's Selenium #driver
       def within_frame(frame, &block)
-        SeleniumAdapter.instance_method(:within_frame).bind(FrameAdapter.wrap driver).call(frame, &block)
+        SeleniumAdapter.instance_method(:within_frame).bind(FrameAdapter.wrap @driver).call(frame, &block)
       end
 
       def find_frames
-        driver.find_elements(:css, "iframe")
+        find_elements(:css, "iframe")
       end
     end
 
@@ -57,6 +56,41 @@ module WebDriverScriptAdapter
       end
     end
 
+    class CapybaraAdapter < ::DumbDelegator
+      def initialize(driver)
+        super(driver)
+        @driver = driver
+      end
+
+      def within_frame(frame)
+        # Patch the `Symbol` class to respond to the :native method.
+        # Will be fixed in https://github.com/teamcapybara/capybara/pull/2462
+        (:parent).class.define_method(:native) do
+          nil
+        end
+        switch_to_frame frame
+        yield
+      ensure
+        begin
+          switch_to_frame :parent
+        rescue => e
+          if /switchToParentFrame|frame\/parent/.match(e.message)
+            ::Kernel.warn "WARNING:
+            This browser only supports first-level iframes.
+            Second-level iframes and beyond will not be audited.
+            To skip auditing all iframes,
+            set Axe::Configuration#skip_iframes=true"
+          end
+          switch_to_frame :top
+        end
+      end
+
+      def find_frames
+        find_css("iframe")
+      end
+    end
+
+
     # Selenium Webdriver < 2.43 doesnt support moving back to the parent
     class ParentlessFrameAdapter < ::DumbDelegator
       # storage of frame stack (for reverting to parent) taken from Capybara