axe-core-api 4.0.0.pre.5880fc5 → 4.0.0.pre.6784dc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29571d99cab55e3437ce1845350d9bfb0aab8c916ccc340f893f2ff0652cf8a0
-  data.tar.gz: cc6fe84356cdd3256270046b34c8015415b4afaaeb23851daaa2ff803dfa791f
+  metadata.gz: 3d2fa9b6947cdd9eea1ed241a92efbf8d63d387c6bc605c654e1dda0205229f1
+  data.tar.gz: 3b553e7b16eb52711025f298a47e362a2b353ded1cda270de49b39975023e9b6
 SHA512:
-  metadata.gz: 7b5cf5569f40a0705e2f6189fc5630b149b7a5e39a55f9bb5d62c78351c07f5a59a1ec6cc04bbef8fd02c05f7a28217a8a67e8666cc81f123140bcde08730984
-  data.tar.gz: f0b3ecbb1d18a2e62ee52da9864da6c1fbd65158faa7b2801c416c16230dcc36094937bcff6319af4e4450188a643203445b0309f6109d4f87d336e88d53a292
+  metadata.gz: e58b998fb631dc8e62f58af21b3528c82b19aa7526e600c2902b4bdddfa6281e3e592edbc5eaf6a22f1e81db1cca0e145a70849a7f02ebcc5b6d583a6d6f2c60
+  data.tar.gz: 59f35e9ac3f5982f0db78cc8893416be3b26949ba9337c9980a566edebcb6bcb80f3ced604f96b20bb1086c777e67d4e61506fef351790f46b1b979b36119d2f

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