axe-core-api 4.0.0.pre.a8e5044 → 4.0.0.pre.a442c75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b50c76d7382217ecbd97306a795fe6793861e22d001e2a171db0787d0652cf24
-  data.tar.gz: e1a505a45c04ae044b76aa5ae97a3c80a4bc3381ee96ecc8df7f9cf633df7c54
+  metadata.gz: 214697fde2c946cef218f35aa358ae69621357bd8ab4a3c4953082ea36ea73db
+  data.tar.gz: 6e14744f988c40af657ac9fc5c8ffca7aaa2a11e2fe8df2ea5389813fdd9add3
 SHA512:
-  metadata.gz: 26a5ad9f24fa70f3f856e51c790c7391a22010c9d7c699c0746169ab345f4e2acbd57a089290a8e433e1df919c29ade6f29f55d031f27af7eb0d7effdd2b3365
-  data.tar.gz: e4ae00935afbb0423b5d663f3b7c8f5aef27dcea8cbf29b302a8a4c9ba6863e6cbb3b652298700e3fe471b75473e32025287b1186873b05c7ba577bc35b2861e
+  metadata.gz: 2bc1d6b4bc73d6b784e56b2f9022012552e794f249de5550e22d26b00285c1e7e858395ab89d0bf9be568e910edc048aafaf016af936d8db454b598761f0e750
+  data.tar.gz: 06b937cfa02e45a955d557b577d381e6beb79b9b1766b128af67168f9fae7fcd83c78be2ca1b363626a6be24a20161e85198a08ea06cc6321dca50f1244ce645

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