capybara-accessible 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bc474ce3ecde90316cd8f6693ec63070c2e7c134
+  data.tar.gz: 80e58047c93f55023767eecc37d46b6487f64391
+SHA512:
+  metadata.gz: bb2173ca56885f1cb684ceafb54438e0059f1224e93fca36974592c64a2935c639926b5fcf8a9885af54228662445a5e2678e6c4594a4e96644afbefa06bb45b
+  data.tar.gz: 0f18d822bca546abd31efddaa2775a622c2a1a0b8dee4caf2831a1197bc2698668f1b6f8543556242a977577fe93f9686e878317f2203c4e423ce3c2e9383a22

data/README.md

@@ -31,14 +31,24 @@ Add `gem 'capybara-accessible'` to your application's Gemfile and run `bundle` o
 
 ## Usage
 
-You can use capybara-accessible as a drop-in replacement for Rack::Test, Selenium or capybara-webkit drivers for Capybara.
+You can use capybara-accessible as a drop-in replacement for Rack::Test, Selenium, capybara-webkit, or Poltergeist drivers for Capybara.
 Simply set the driver in `spec/spec_helper.rb` or `features/support/env.rb`:
 
     require 'capybara/rspec'
     require 'capybara/accessible'
 
-    Capybara.default_driver = :accessible
-    Capybara.javascript_driver = :accessible
+    # For selenium integration
+    Capybara.default_driver = :accessible_selenium
+    Capybara.javascript_driver = :accessible_selenium
+
+    # For capybara webkit integration
+    Capybara.default_driver = :accessible_webkit
+    Capybara.javascript_driver = :accessible_webkit
+
+    # For poltergeist integration
+    Capybara.default_driver = :accessible_poltergeist
+    Capybara.javascript_driver = :accessible_poltergeist
+
 
 We suggest that you use [pry-rescue with pry-stack_explorer](https://github.com/ConradIrwin/pry-rescue) 
 to debug the accessibility failures in the DOM. pry-rescue will open a debugging session at the first exception, 

data/capybara-accessible.gemspec

@@ -19,8 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency("capybara", "~> 2.0")
-  spec.add_dependency("selenium-webdriver")
-  
+
+  spec.add_development_dependency "selenium-webdriver"
+  spec.add_development_dependency "capybara-webkit"
+  spec.add_development_dependency "poltergeist"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"

data/lib/capybara/accessible.rb

@@ -1,16 +1,115 @@
 require 'capybara'
 require 'capybara/accessible/auditor'
 require 'capybara/accessible/element'
+require 'capybara/accessible/driver_extensions'
 require "capybara/accessible/version"
 require "capybara/accessible/railtie" if defined?(Rails)
 
 module Capybara
   module Accessible
+    class SeleniumDriverAdapter
+      def modal_dialog_present?(driver)
+        begin
+          driver.browser.switch_to.alert
+          true
+        rescue ::Selenium::WebDriver::Error::NoAlertOpenError, ::NoMethodError
+          false
+        end
+      end
+
+      def failures_script
+        "return axs.Audit.auditResults(results).getErrors();"
+      end
+
+      def create_report_script
+        "return axs.Audit.createReport(results);"
+      end
+
+      def run_javascript(driver, script)
+        driver.execute_script(script)
+      end
+    end
+
+    class WebkitDriverAdapter
+      def modal_dialog_present?(driver)
+        driver.alert_messages.any?
+      end
+
+      def failures_script
+        "axs.Audit.auditResults(results).getErrors();"
+      end
+
+      def create_report_script
+        "axs.Audit.createReport(results);"
+      end
+
+      def run_javascript(driver, script)
+        driver.evaluate_script(script)
+      end
+    end
+
+    class PoltergeistDriverAdapter
+      def modal_dialog_present?(driver)
+        false
+      end
+
+      def failures_script
+        "return axs.Audit.auditResults(results).getErrors()"
+      end
+
+      def create_report_script
+        "return axs.Audit.createReport(results)"
+      end
+
+      def run_javascript(driver, script)
+        # Have to wrap in an anonymous function because of https://github.com/jonleighton/poltergeist/issues/198
+        driver.evaluate_script %{ (function() {#{script}})() }
+      end
+    end
+
+    class << self
+      def skip_audit
+        Capybara::Accessible::Auditor.disable
+        yield
+      ensure
+        Capybara::Accessible::Auditor.enable
+      end
+
+      def driver_adapter
+        @driver_adapter
+      end
+
+      def setup(driver, adaptor)
+        @driver_adapter = adaptor
+        driver.extend(Capybara::Accessible::DriverExtensions)
+        driver
+      end
+    end
   end
 end
 
-require "capybara/accessible/driver"
-
 Capybara.register_driver :accessible do |app|
-  Capybara::Accessible::Driver.new(app)
+  puts "DEPRECATED: Please register this driver as 'accessible_selenium'"
+  driver = Capybara::Selenium::Driver.new(app)
+  adaptor = Capybara::Accessible::SeleniumDriverAdapter.new
+  Capybara::Accessible.setup(driver, adaptor)
+end
+
+
+Capybara.register_driver :accessible_selenium do |app|
+  driver = Capybara::Selenium::Driver.new(app)
+  adaptor = Capybara::Accessible::SeleniumDriverAdapter.new
+  Capybara::Accessible.setup(driver, adaptor)
+end
+
+Capybara.register_driver :accessible_webkit do |app|
+  driver = Capybara::Webkit::Driver.new(app)
+  adaptor = Capybara::Accessible::WebkitDriverAdapter.new
+  Capybara::Accessible.setup(driver, adaptor)
+end
+
+Capybara.register_driver :accessible_poltergeist do |app|
+  driver = Capybara::Poltergeist::Driver.new(app)
+  adaptor = Capybara::Accessible::PoltergeistDriverAdapter.new
+  Capybara::Accessible.setup(driver, adaptor)
 end

data/lib/capybara/accessible/auditor.rb

@@ -1,57 +1,102 @@
 module Capybara::Accessible
   class InaccessibleError < Capybara::CapybaraError; end
 
-  class << self
-    def skip_audit
-      @disabled = true
-      yield
-    ensure
-      @disabled = false
-    end
-  end
+  class Auditor
+    class Node < self
+      def initialize(session)
+        @driver = session.driver
+      end
 
-  module Auditor
-    def self.exclusions=(rules)
-      @@exclusions = rules
-    end
+      def audit!
+        if modal_dialog_present?
+          puts "Skipping accessibility audit: Modal dialog present"
+        else
+          super
+        end
+      end
 
-    def self.exclusions
-      @@exclusions ||= []
+      private
+      def modal_dialog_present?
+        Capybara::Accessible.driver_adapter.modal_dialog_present?(driver)
+      end
     end
 
-    def self.log_level=(level)
-      @@log_level= level
+    class Driver < self
+      def initialize(driver)
+        @driver = driver
+      end
     end
 
-    def self.log_level
-      @@log_level ||= :error
-    end
+    class <<self
+      def exclusions=(rules)
+        @exclusions = rules
+      end
+
+      def exclusions
+        @exclusions ||= []
+      end
+
+      def log_level=(level)
+        @log_level = level
+      end
+
+      def log_level
+        @log_level ||= :error
+      end
+
+      def severe_rules=(rules)
+        @severe_rules = rules
+      end
+
+      def severe_rules
+        @severe_rules ||= []
+      end
+
+      def disable
+        @disabled = true
+      end
+
+      def enable
+        @disabled = false
+      end
 
-    def self.severe_rules=(rules)
-      @@severe_rules = rules
+      def disabled?
+        @disabled
+      end
     end
 
-    def self.severe_rules
-      @@severe_rules ||= []
+    def audit!
+      return if Auditor.disabled?
+
+      if failures?
+        log_level_response[Capybara::Accessible::Auditor.log_level].call(failure_messages)
+      end
     end
 
-    def audit_rules
-      File.read(File.expand_path("../../../vendor/google/accessibility-developer-tools/axs_testing.js", __FILE__))
+    private
+    attr_reader :driver
+
+    def log_level_response
+      @log_level_response ||= {
+          warn: ->(messages) { puts messages },
+          error: ->(messages) { raise Capybara::Accessible::InaccessibleError, failure_messages }
+      }
     end
 
-    def audit_failures
-      if Capybara::Accessible.instance_variable_get(:@disabled)
-        []
-      else
-        run_script("#{perform_audit_script} return axs.Audit.auditResults(results).getErrors();")
-      end
+    def failures?
+      failures = run_script(perform_audit_script + driver_adaptor.failures_script)
+
+      Array(failures).any?
     end
 
     def failure_messages
-      "Found at #{page_url} \n\n" + run_script("#{perform_audit_script} return axs.Audit.createReport(results)")
+      result = run_script(perform_audit_script + driver_adaptor.create_report_script)
+      "Found at #{page_url} \n\n#{result}"
     end
 
-    private
+    def audit_rules
+      File.read(File.expand_path("../../../vendor/google/accessibility-developer-tools/axs_testing.js", __FILE__))
+    end
 
     def perform_audit_script
       <<-JAVASCRIPT
@@ -81,34 +126,34 @@ module Capybara::Accessible
 
     def mapping
       @mapping ||= {
-        'AX_ARIA_01' => 'badAriaRole',
-        'AX_ARIA_02' => 'nonExistentAriaLabelledbyElement',
-        'AX_ARIA_03' => 'requiredAriaAttributeMissing',
-        'AX_ARIA_04' => 'badAriaAttributeValue',
-        'AX_TEXT_01' => 'controlsWithoutLabel',
-        'AX_TEXT_02' => 'imagesWithoutAltText',
-        'AX_TITLE_01' => 'pageWithoutTitle',
-        'AX_IMAGE_01' => 'elementsWithMeaningfulBackgroundImage',
-        'AX_FOCUS_01' => 'focusableElementNotVisibleAndNotAriaHidden',
-        'AX_FOCUS_02' => 'unfocusableElementsWithOnClick',
-        'AX_COLOR_01' => 'lowContrastElements',
-        'AX_VIDEO_01' => 'videoWithoutCaptions',
-        'AX_AUDIO_01' => 'audioWithoutControls'
-        # 'AX_TITLE_01' => 'linkWithUnclearPurpose', # This has a duplicate name
-        # 'AX_ARIA_05' => '', # This has no rule associated with it
+          'AX_ARIA_01' => 'badAriaRole',
+          'AX_ARIA_02' => 'nonExistentAriaLabelledbyElement',
+          'AX_ARIA_03' => 'requiredAriaAttributeMissing',
+          'AX_ARIA_04' => 'badAriaAttributeValue',
+          'AX_TEXT_01' => 'controlsWithoutLabel',
+          'AX_TEXT_02' => 'imagesWithoutAltText',
+          'AX_TITLE_01' => 'pageWithoutTitle',
+          'AX_IMAGE_01' => 'elementsWithMeaningfulBackgroundImage',
+          'AX_FOCUS_01' => 'focusableElementNotVisibleAndNotAriaHidden',
+          'AX_FOCUS_02' => 'unfocusableElementsWithOnClick',
+          'AX_COLOR_01' => 'lowContrastElements',
+          'AX_VIDEO_01' => 'videoWithoutCaptions',
+          'AX_AUDIO_01' => 'audioWithoutControls'
+          # 'AX_TITLE_01' => 'linkWithUnclearPurpose', # This has a duplicate name
+          # 'AX_ARIA_05' => '', # This has no rule associated with it
       }
     end
 
     def page_url
-      @session ? @session.driver.current_url : current_url
+      driver.current_url
     end
 
     def run_script(script)
-      if @session
-        @session.driver.execute_script(script)
-      else
-        execute_script(script)
-      end
+      driver_adaptor.run_javascript(driver, script)
+    end
+
+    def driver_adaptor
+      Capybara::Accessible.driver_adapter
     end
   end
 end

data/lib/capybara/accessible/driver_extensions.rb

@@ -0,0 +1,6 @@
+module Capybara::Accessible::DriverExtensions
+  def visit(path)
+    super
+    Capybara::Accessible::Auditor::Driver.new(self).audit!
+  end
+end

data/lib/capybara/accessible/element.rb

@@ -1,22 +1,9 @@
 module Capybara
   module Node
     class Element < Base
-      include Capybara::Accessible::Auditor
-
       def click
         synchronize { base.click }
-        begin
-          @session.driver.browser.switch_to.alert
-          puts "Skipping accessibility audit: Modal dialog present"
-        rescue ::Selenium::WebDriver::Error::NoAlertOpenError, ::NoMethodError
-          if Capybara.current_driver == :accessible && audit_failures.any?
-            if Capybara::Accessible::Auditor.log_level == :warn
-              puts failure_messages
-            else
-              raise Capybara::Accessible::InaccessibleError, failure_messages
-            end
-          end
-        end
+        Capybara::Accessible::Auditor::Node.new(@session).audit!
       end
     end
   end

data/lib/capybara/accessible/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Accessible
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/vendor/google/accessibility-developer-tools/axs_testing.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/6e426d3e4e38b611bc013c14c2ade77674397627
+ * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/80f7c9ac87569c23429a7b07de1af980679c9a34
  *
  * See project README for build steps.
  */
@@ -543,9 +543,29 @@ axs.utils.elementHasZeroArea = function(a) {
   return a.right - a.left && b ? !1 : !0
 };
 axs.utils.elementIsOutsideScrollArea = function(a) {
-  a = a.getBoundingClientRect();
-  var b = document.body.scrollWidth, c = document.body.scrollTop, d = document.body.scrollLeft;
-  return a.top >= document.body.scrollHeight || a.bottom <= -c || a.left >= b || a.right <= -d ? !0 : !1
+  for(var b = a.parentElement, c = a.ownerDocument.defaultView;b != c.document.body;) {
+    if(axs.utils.isClippedBy(a, b)) {
+      return!0
+    }
+    if(axs.utils.canScrollTo(a, b) && !axs.utils.elementIsOutsideScrollArea(b)) {
+      return!1
+    }
+    b = b.parentElement
+  }
+  return!axs.utils.canScrollTo(a, c.document.body)
+};
+axs.utils.canScrollTo = function(a, b) {
+  var c = a.getBoundingClientRect(), d = b.getBoundingClientRect(), e = d.top, f = d.left, g = e - b.scrollTop, e = e - b.scrollTop + b.scrollHeight, h = f - b.scrollLeft + b.scrollWidth;
+  if(c.right < f - b.scrollLeft || c.bottom < g || c.left > h || c.top > e) {
+    return!1
+  }
+  f = a.ownerDocument.defaultView;
+  g = f.getComputedStyle(b);
+  return c.left > d.right || c.top > d.bottom ? "scroll" == g.overflow || "auto" == g.overflow || b instanceof f.HTMLBodyElement : !0
+};
+axs.utils.isClippedBy = function(a, b) {
+  var c = a.getBoundingClientRect(), d = b.getBoundingClientRect(), e = d.top - b.scrollTop, f = d.left - b.scrollLeft, g = a.ownerDocument.defaultView.getComputedStyle(b);
+  return(c.right < d.left || c.bottom < d.top || c.left > d.right || c.top > d.bottom) && "hidden" == g.overflow ? !0 : c.right < f || c.bottom < e ? "visible" != g.overflow : !1
 };
 axs.utils.isAncestor = function(a, b) {
   return null == b ? !1 : b === a ? !0 : axs.utils.isAncestor(a, b.parentNode)
@@ -1006,7 +1026,7 @@ axs.properties.getFocusProperties = function(a) {
     d && (h.transparent = !0);
     e && (h.zeroArea = !0);
     f && (h.outsideScrollArea = !0);
-    0 < g.length && (h.overlappingElements = g);
+    g && 0 < g.length && (h.overlappingElements = g);
     d = {value:c, valid:c};
     c && (d.reason = axs.properties.getHiddenReason(a));
     h.hidden = d;
@@ -1060,62 +1080,58 @@ axs.properties.getContrastRatioProperties = function(a) {
   (c = axs.utils.suggestColors(d, e, a, c)) && Object.keys(c).length && (b.suggestedColors = c);
   return b
 };
-axs.properties.findTextAlternatives = function(a, b, c) {
-  var d = c || !1;
+axs.properties.findTextAlternatives = function(a, b, c, d) {
+  var e = c || !1;
   c = axs.utils.asElement(a);
-  if(!c || !d && axs.utils.isElementOrAncestorHidden(c)) {
+  if(!c || !e && !d && axs.utils.isElementOrAncestorHidden(c)) {
     return null
   }
   if(a.nodeType == Node.TEXT_NODE) {
     return c = {type:"text"}, c.text = a.textContent, c.lastWord = axs.properties.getLastWord(c.text), b.content = c, a.textContent
   }
   a = null;
-  d || (a = axs.properties.getTextFromAriaLabelledby(c, b));
-  if(c.hasAttribute("aria-label")) {
-    var e = {type:"text"};
-    e.text = c.getAttribute("aria-label");
-    e.lastWord = axs.properties.getLastWord(e.text);
-    a ? e.unused = !0 : d && axs.utils.elementIsHtmlControl(c) || (a = e.text);
-    b.ariaLabel = e
-  }
-  c.hasAttribute("role") && "presentation" == c.getAttribute("role") || (a = axs.properties.getTextFromHostLanguageAttributes(c, b, a, d));
-  if(d && axs.utils.elementIsHtmlControl(c)) {
-    e = c.ownerDocument.defaultView;
-    if(c instanceof e.HTMLInputElement) {
+  e || (a = axs.properties.getTextFromAriaLabelledby(c, b));
+  c.hasAttribute("aria-label") && (d = {type:"text"}, d.text = c.getAttribute("aria-label"), d.lastWord = axs.properties.getLastWord(d.text), a ? d.unused = !0 : e && axs.utils.elementIsHtmlControl(c) || (a = d.text), b.ariaLabel = d);
+  c.hasAttribute("role") && "presentation" == c.getAttribute("role") || (a = axs.properties.getTextFromHostLanguageAttributes(c, b, a, e));
+  if(e && axs.utils.elementIsHtmlControl(c)) {
+    d = c.ownerDocument.defaultView;
+    if(c instanceof d.HTMLInputElement) {
       var f = c;
       "text" == f.type && f.value && 0 < f.value.length && (b.controlValue = {text:f.value});
       "range" == f.type && (b.controlValue = {text:f.value})
     }
-    c instanceof e.HTMLSelectElement && (b.controlValue = {text:c.value});
-    b.controlValue && (e = b.controlValue, a ? e.unused = !0 : a = e.text)
+    c instanceof d.HTMLSelectElement && (b.controlValue = {text:c.value});
+    b.controlValue && (d = b.controlValue, a ? d.unused = !0 : a = d.text)
   }
-  if(d && axs.utils.elementIsAriaWidget(c)) {
-    d = c.getAttribute("role");
-    "textbox" == d && c.textContent && 0 < c.textContent.length && (b.controlValue = {text:c.textContent});
-    if("slider" == d || "spinbutton" == d) {
+  if(e && axs.utils.elementIsAriaWidget(c)) {
+    e = c.getAttribute("role");
+    "textbox" == e && c.textContent && 0 < c.textContent.length && (b.controlValue = {text:c.textContent});
+    if("slider" == e || "spinbutton" == e) {
       c.hasAttribute("aria-valuetext") ? b.controlValue = {text:c.getAttribute("aria-valuetext")} : c.hasAttribute("aria-valuenow") && (b.controlValue = {value:c.getAttribute("aria-valuenow"), text:"" + c.getAttribute("aria-valuenow")})
     }
-    if("menu" == d) {
-      for(var g = c.querySelectorAll("[role=menuitemcheckbox], [role=menuitemradio]"), e = [], f = 0;f < g.length;f++) {
-        "true" == g[f].getAttribute("aria-checked") && e.push(g[f])
+    if("menu" == e) {
+      var g = c.querySelectorAll("[role=menuitemcheckbox], [role=menuitemradio]");
+      d = [];
+      for(f = 0;f < g.length;f++) {
+        "true" == g[f].getAttribute("aria-checked") && d.push(g[f])
       }
-      if(0 < e.length) {
+      if(0 < d.length) {
         g = "";
-        for(f = 0;f < e.length;f++) {
-          g += axs.properties.findTextAlternatives(e[f], {}, !0), f < e.length - 1 && (g += ", ")
+        for(f = 0;f < d.length;f++) {
+          g += axs.properties.findTextAlternatives(d[f], {}, !0), f < d.length - 1 && (g += ", ")
         }
         b.controlValue = {text:g}
       }
     }
-    if("combobox" == d || "select" == d) {
+    if("combobox" == e || "select" == e) {
       b.controlValue = {text:"TODO"}
     }
-    b.controlValue && (e = b.controlValue, a ? e.unused = !0 : a = e.text)
+    b.controlValue && (d = b.controlValue, a ? d.unused = !0 : a = d.text)
   }
-  e = !0;
-  c.hasAttribute("role") && (d = c.getAttribute("role"), (d = axs.constants.ARIA_ROLES[d]) && (!d.namefrom || 0 > d.namefrom.indexOf("contents")) && (e = !1));
-  (d = axs.properties.getTextFromDescendantContent(c)) && e && (e = {type:"text"}, e.text = d, e.lastWord = axs.properties.getLastWord(e.text), a ? e.unused = !0 : a = d, b.content = e);
-  c.hasAttribute("title") && (d = {type:"string", valid:!0}, d.text = c.getAttribute("title"), d.lastWord = axs.properties.getLastWord(d.lastWord), a ? d.unused = !0 : a = d.text, b.title = d);
+  d = !0;
+  c.hasAttribute("role") && (e = c.getAttribute("role"), (e = axs.constants.ARIA_ROLES[e]) && (!e.namefrom || 0 > e.namefrom.indexOf("contents")) && (d = !1));
+  (e = axs.properties.getTextFromDescendantContent(c)) && d && (d = {type:"text"}, d.text = e, d.lastWord = axs.properties.getLastWord(d.text), a ? d.unused = !0 : a = e, b.content = d);
+  c.hasAttribute("title") && (e = {type:"string", valid:!0}, e.text = c.getAttribute("title"), e.lastWord = axs.properties.getLastWord(e.lastWord), a ? e.unused = !0 : a = e.text, b.title = e);
   return 0 == Object.keys(b).length && null == a ? null : a
 };
 axs.properties.getTextFromDescendantContent = function(a) {
@@ -1196,7 +1212,7 @@ axs.properties.getLastWord = function(a) {
 };
 axs.properties.getTextProperties = function(a) {
   var b = {};
-  a = axs.properties.findTextAlternatives(a, b);
+  a = axs.properties.findTextAlternatives(a, b, !1, !0);
   if(0 == Object.keys(b).length) {
     if(!a) {
       return null
@@ -1540,7 +1556,11 @@ axs.AuditRule.specs.focusableElementNotVisibleAndNotAriaHidden = {name:"focusabl
   }
   return!0
 }, test:function(a) {
-  return axs.utils.isElementOrAncestorHidden(a) ? !1 : !axs.utils.elementIsVisible(a)
+  if(axs.utils.isElementOrAncestorHidden(a)) {
+    return!1
+  }
+  a.focus();
+  return!axs.utils.elementIsVisible(a)
 }, code:"AX_FOCUS_01"};
 axs.AuditRule.specs.imagesWithoutAltText = {name:"imagesWithoutAltText", heading:"Images should have an alt attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_text_02--images-should-have-an-alt-attribute-unless-they-have-an-aria-role-of-presentation", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
   return axs.browserUtils.matchSelector(a, "img") && !axs.utils.isElementOrAncestorHidden(a)
@@ -1618,7 +1638,7 @@ axs.AuditRule.specs.requiredAriaAttributeMissing = {name:"requiredAriaAttributeM
 axs.AuditRule.specs.unfocusableElementsWithOnClick = {name:"unfocusableElementsWithOnClick", heading:"Elements with onclick handlers must be focusable", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_focus_02--elements-with-onclick-handlers-must-be-focusable", severity:axs.constants.Severity.WARNING, opt_requiresConsoleAPI:!0, relevantElementMatcher:function(a) {
   return a instanceof a.ownerDocument.defaultView.HTMLBodyElement || axs.utils.isElementOrAncestorHidden(a) ? !1 : "click" in getEventListeners(a) ? !0 : !1
 }, test:function(a) {
-  return!a.hasAttribute("tabindex") && !axs.utils.isElementImplicitlyFocusable(a)
+  return!a.hasAttribute("tabindex") && !axs.utils.isElementImplicitlyFocusable(a) && !a.disabled
 }, code:"AX_FOCUS_02"};
 axs.AuditRule.specs.videoWithoutCaptions = {name:"videoWithoutCaptions", heading:"Video elements should use <track> elements to provide captions", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_video_01--video-elements-should-use-track-elements-to-provide-captions", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
   return axs.browserUtils.matchSelector(a, "video")

data/spec/poltergeist_driver_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe "Using poltergeist driver" do
+  require "capybara/poltergeist"
+  before do
+    @session = Capybara::Session.new(:accessible_poltergeist, AccessibleApp)
+  end
+
+  context 'a page without accessibility errors' do
+    it 'does not raise an exception on audit failures' do
+      expect { @session.visit('/accessible') }.to_not raise_error
+    end
+  end
+
+  context 'a page with inaccessible elements' do
+    it 'raises an exception on visiting the page' do
+      expect { @session.visit('/inaccessible') }.to raise_error(Capybara::Accessible::InaccessibleError)
+    end
+
+    it 'raises an exception when visiting the page via a link' do
+      @session.visit('/accessible')
+      expect { @session.click_link('inaccessible') }.to raise_error(Capybara::Accessible::InaccessibleError)
+    end
+
+    context 'with configuration that excludes rules' do
+      before do
+        Capybara::Accessible::Auditor.exclusions = ['AX_TEXT_01']
+      end
+
+      it 'does not raise an error on an excluded rule' do
+        expect { @session.visit('/excluded') }.to_not raise_error
+      end
+    end
+
+    context 'a page with a javascript popup' do
+      it 'does not raise an exception' do
+        @session.visit('/alert')
+        expect { @session.click_link('Alert!') }.to_not raise_error
+      end
+    end
+
+    context 'with severity set to severe' do
+      before do
+        Capybara::Accessible::Auditor.severe_rules = ['AX_TEXT_02']
+      end
+
+      after do
+        Capybara::Accessible::Auditor.severe_rules = []
+      end
+
+      it 'raises an exception on the image without alt text' do
+        expect { @session.visit('/severe') }.to raise_error(Capybara::Accessible::InaccessibleError)
+      end
+    end
+  end
+end

data/spec/{driver_spec.rb → selenium_driver_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Capybara::Accessible::Driver do
+describe "Using selenium driver" do
   before do
-    @session = Capybara::Session.new(:accessible, AccessibleApp)
+    @session = Capybara::Session.new(:accessible_selenium, AccessibleApp)
   end
 
   context 'a page without accessibility errors' do

data/spec/webkit_driver_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe "Using webkit driver" do
+  require "capybara-webkit"
+  before do
+    @session = Capybara::Session.new(:accessible_webkit, AccessibleApp)
+  end
+
+  context 'a page without accessibility errors' do
+    it 'does not raise an exception on audit failures' do
+      expect { @session.visit('/accessible') }.to_not raise_error
+    end
+  end
+
+  context 'a page with inaccessible elements' do
+    it 'raises an exception on visiting the page' do
+      expect { @session.visit('/inaccessible') }.to raise_error(Capybara::Accessible::InaccessibleError)
+    end
+
+    it 'raises an exception when visiting the page via a link' do
+      @session.visit('/accessible')
+      expect { @session.click_link('inaccessible') }.to raise_error(Capybara::Accessible::InaccessibleError)
+    end
+
+    context 'with configuration that excludes rules' do
+      before do
+        Capybara::Accessible::Auditor.exclusions = ['AX_TEXT_01']
+      end
+
+      it 'does not raise an error on an excluded rule' do
+        expect { @session.visit('/excluded') }.to_not raise_error
+      end
+    end
+
+    context 'with log level set to warn' do
+      before do
+        Capybara::Accessible::Auditor.log_level = :warn
+      end
+
+      after do
+        Capybara::Accessible::Auditor.log_level = :error
+      end
+
+      it 'puts to stdout and does not raise an error' do
+        $stdout.should_receive(:puts)
+        expect { @session.visit('/inaccessible') }.to_not raise_error
+      end
+    end
+
+    context 'a page with a javascript popup' do
+      it 'does not raise an exception' do
+        @session.visit('/alert')
+        expect { @session.click_link('Alert!') }.to_not raise_error
+      end
+    end
+
+    context 'with severity set to severe' do
+      before do
+        Capybara::Accessible::Auditor.severe_rules = ['AX_TEXT_02']
+      end
+
+      after do
+        Capybara::Accessible::Auditor.severe_rules = []
+      end
+
+      it 'raises an exception on the image without alt text' do
+        expect { @session.visit('/severe') }.to raise_error(Capybara::Accessible::InaccessibleError)
+      end
+    end
+  end
+end

metadata

@@ -1,126 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: capybara-accessible
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Case Commons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara-webkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tddium
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Capybara extension and webdriver for automated accessibility testing
@@ -130,7 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -138,44 +151,48 @@ files:
 - capybara-accessible.gemspec
 - lib/capybara/accessible.rb
 - lib/capybara/accessible/auditor.rb
-- lib/capybara/accessible/driver.rb
+- lib/capybara/accessible/driver_extensions.rb
 - lib/capybara/accessible/element.rb
 - lib/capybara/accessible/railtie.rb
 - lib/capybara/accessible/tasks.rb
 - lib/capybara/accessible/version.rb
 - lib/vendor/google/accessibility-developer-tools/axs_testing.js
 - spec/accessible_app.rb
-- spec/driver_spec.rb
+- spec/poltergeist_driver_spec.rb
+- spec/selenium_driver_spec.rb
 - spec/spec_helper.rb
+- spec/webkit_driver_spec.rb
 - tddium.yml
 - travis.yml
 homepage: https://github.com/Casecommons/capybara-accessible
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.27
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Selenium based webdriver and Capybara extension that runs Google Accessibility
   Developer Tools auditing assertions on page visits.
 test_files:
 - spec/accessible_app.rb
-- spec/driver_spec.rb
+- spec/poltergeist_driver_spec.rb
+- spec/selenium_driver_spec.rb
 - spec/spec_helper.rb
+- spec/webkit_driver_spec.rb
+has_rdoc: 

data/lib/capybara/accessible/driver.rb

@@ -1,16 +0,0 @@
-module Capybara::Accessible
-  class Driver < Capybara::Selenium::Driver
-    include Capybara::Accessible::Auditor
-
-    def visit(path)
-      super
-      if Capybara.current_driver == :accessible && audit_failures.any?
-        if Capybara::Accessible::Auditor.log_level == :warn
-          puts failure_messages
-        else
-          raise Capybara::Accessible::InaccessibleError, failure_messages
-        end
-      end
-    end
-  end
-end