axe-core-api 4.0.0.pre.c46720b → 4.0.0.pre.e73e472

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a14358b906d30e6bc99898292675d0b4ac96f8c0807b1ea15da2264009574cc3
-  data.tar.gz: dfd62ab52270b6ae9c0999ab3b759d2b8441017d87c673cf24ac746e69fa1d13
+  metadata.gz: 63019d8d56602adad15b503584d207b0cfc9c479e726a1baa047c9ecfa9aefda
+  data.tar.gz: 2dc0aaaca0b40ded981d423b6bc5a321d59d67e8338a14b0b961906001c2606d
 SHA512:
-  metadata.gz: 13889c574ae182f933beeb9749ba50c2b0b5a5bb855d73f5dcf9fa09e2407572bfdf34f1067a84e0dc123d6caa7969bab832ab2944dc084e4b68fc6161871217
-  data.tar.gz: af4b61ef6a4466b7f2cf5745260994f22655ad17592bafb896042a6383af6d19c8cd7d36260848ae6940ec7b5d46e9bc7a875fa34d8bd4f885ce181392710b32
+  metadata.gz: 022d9629c0eb1460e370dd799d3d869eb1d7bd50570ffad9889e58f7a5e7aca6b420f10f370de9cdcac5f1f4052d63f5eb85f8679ee4bc4f2ed32c6c0045e69f
+  data.tar.gz: c0c6060010657c0b963aadb637e44d4dd35c69a371eabe9ed69ae1621a34c3488824ac148343274cfd13b0cab9b83892c3ede187cccf129faba01028fcb70393

data/lib/axe/configuration.rb

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

data/lib/axe/core.rb

@@ -31,7 +31,6 @@ 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

@@ -10,7 +10,6 @@ module Common
 
     def call(source)
       @page.execute_script source
-      @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

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?(:find_css)
+      if driver.respond_to?(:within_frame)
         CapybaraAdapter.new driver
       elsif !driver.respond_to?(:switch_to)
         WatirAdapter.new driver
@@ -16,19 +16,20 @@ module WebDriverScriptAdapter
 
     private
 
-    class WatirAdapter < ::DumbDelegator
-      def initialize(driver)
-        super(driver)
-        @driver = driver
+    class CapybaraAdapter < ::DumbDelegator
+      def find_frames
+        all(:css, "iframe")
       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
-        find_elements(:css, "iframe")
+        driver.find_elements(:css, "iframe")
       end
     end
 
@@ -56,41 +57,6 @@ 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