Add boolean methods for some boolean attribute selectors to handle ma…

…rionette differences

lib/capybara/driver/node.rb

@@ -42,23 +42,23 @@ def unselect_option
       def click
         raise NotImplementedError
       end
-      
+
       def right_click
         raise NotImplementedError
       end
-      
+
       def double_click
         raise NotImplementedError
       end
-      
+
       def send_keys(*args)
         raise NotImplementedError
       end
-      
+
       def hover
         raise NotImplementedError
       end
-      
+
       def drag_to(element)
         raise NotImplementedError
       end
@@ -83,6 +83,14 @@ def disabled?
         raise NotImplementedError
       end
 
+      def readonly?
+        !!self[:readonly]
+      end
+
+      def multiple?
+        !!self[:multiple]
+      end
+
       def path
         raise NotSupportedByDriverError, 'Capybara::Driver::Node#path'
       end

lib/capybara/node/element.rb

@@ -282,6 +282,26 @@ def disabled?
         synchronize { base.disabled? }
       end
 
+      ##
+      #
+      # Whether or not the element is readonly.
+      #
+      # @return [Boolean]     Whether the element is readonly
+      #
+      def readonly?
+        synchronize { base.readonly? }
+      end
+
+      ##
+      #
+      # Whether or not the element supports multiple results.
+      #
+      # @return [Boolean]     Whether the element supports multiple results.
+      #
+      def multiple?
+        synchronize { base.multiple? }
+      end
+
       ##
       #
       # An XPath expression describing where on the page the element can be found

lib/capybara/rack_test/node.rb

@@ -17,7 +17,7 @@ def value
   end
 
   def set(value)
-    if (Array === value) && !self[:multiple]
+    if (Array === value) && !multiple?
       raise ArgumentError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
     end
 

lib/capybara/selector.rb

@@ -124,7 +124,7 @@ def locate_field(xpath, locator)
   filter(:checked, boolean: true) { |node, value| not(value ^ node.checked?) }
   filter(:unchecked, boolean: true) { |node, value| (value ^ node.checked?) }
   filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
-  filter(:multiple, boolean: true) { |node, value| !(value ^ node[:multiple]) }
+  filter(:multiple, boolean: true) { |node, value| !(value ^ node.multiple?) }
 
   describe do |options|
     desc, states = String.new, []
@@ -150,7 +150,7 @@ def locate_field(xpath, locator)
 
   filter_set(:_field)
 
-  filter(:readonly, boolean: true) { |node, value| not(value ^ node[:readonly]) }
+  filter(:readonly, boolean: true) { |node, value| not(value ^ node.readonly?) }
   filter(:with) { |node, with| node.value == with.to_s }
   filter(:type) do |node, type|
     if ['textarea', 'select'].include?(type)
@@ -159,7 +159,6 @@ def locate_field(xpath, locator)
       node[:type] == type
     end
   end
-  # filter(:multiple, boolean: true) { |node, value| !(value ^ node[:multiple]) }
   describe do |options|
     desc, states = String.new, []
     desc << " of type #{options[:type].inspect}" if options[:type]

lib/capybara/selenium/node.rb

@@ -17,7 +17,7 @@ def [](name)
   end
 
   def value
-    if tag_name == "select" and self[:multiple] and not self[:multiple] == "false"
+    if tag_name == "select" and multiple?
       native.find_elements(:xpath, ".//option").select { |n| n.selected? }.map { |n| n[:value] || n.text }
     else
       native[:value]
@@ -38,7 +38,7 @@ def value
   def set(value, options={})
     tag_name = self.tag_name
     type = self[:type]
-    if (Array === value) && !self[:multiple]
+    if (Array === value) && !multiple?
       raise ArgumentError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
     end
     if tag_name == 'input' and type == 'radio'
@@ -131,12 +131,21 @@ def selected?
     selected = native.selected?
     selected and selected != "false"
   end
+  alias :checked? :selected?
 
   def disabled?
     !native.enabled?
   end
 
-  alias :checked? :selected?
+  def readonly?
+    readonly = self[:readonly]
+    readonly and readonly != "false"
+  end
+
+  def multiple?
+    multiple = self[:multiple]
+    multiple and multiple != "false"
+  end
 
   def find_xpath(locator)
     native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
@@ -175,11 +184,6 @@ def path
   end
 
 private
-  def readonly?
-    readonly = self[:readonly]
-    readonly and readonly != "false"
-  end
-
   # a reference to the select node if this is an option node
   def select_node
     find_xpath('./ancestor::select').first