Make Node#[] behave more like capybara with selenium

CHANGELOG.md

@@ -3,6 +3,8 @@
 #### Features ####
 *   Implement support for Capybara Window#size and Window#resize_to (Thomas Walpole)
 *   Add access to properties of node's native element (Mike Souza)
+*   Node#[] now prefers element properties over attributes when the property exists and is
+    not an object.  This is similar to the selenium driver behavior. (Thomas Walpole)
 
 #### Bug fixes ####
 

lib/capybara/poltergeist/client/browser.coffee

@@ -138,7 +138,7 @@ class Poltergeist.Browser
     @current_command.sendResponse this.node(page_id, id).deleteText()
 
   property: (page_id, id, name) ->
-    this.sendResponse this.node(page_id, id).getProperty(name)
+    @current_command.sendResponse this.node(page_id, id).getProperty(name)
 
   attribute: (page_id, id, name) ->
     @current_command.sendResponse this.node(page_id, id).getAttribute(name)

lib/capybara/poltergeist/client/compiled/browser.js

@@ -180,6 +180,10 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(this.node(page_id, id).deleteText());
   };
 
+  Browser.prototype.property = function(page_id, id, name) {
+    return this.current_command.sendResponse(this.node(page_id, id).getProperty(name));
+  };
+
   Browser.prototype.attribute = function(page_id, id, name) {
     return this.current_command.sendResponse(this.node(page_id, id).getAttribute(name));
   };
@@ -188,10 +192,6 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(this.node(page_id, id).getAttributes());
   };
 
-  Browser.prototype.property = function(page_id, id, name) {
-    return this.sendResponse(this.node(page_id, id).getProperty(name));
-  };
-
   Browser.prototype.parents = function(page_id, id) {
     return this.current_command.sendResponse(this.node(page_id, id).parentIds());
   };

lib/capybara/poltergeist/node.rb

@@ -55,7 +55,18 @@ def property(name)
     end
 
     def [](name)
-      command :attribute, name
+      # Although the attribute matters, the property is consistent. Return that in
+      # preference to the attribute for links and images.
+      if (tag_name == 'img' and name == 'src') or (tag_name == 'a' and name == 'href' )
+         #if attribute exists get the property
+         value = command(:attribute, name) && command(:property, name)
+         return value
+      end
+
+      value = property(name)
+      value = command(:attribute, name) if value.nil? || value.is_a?(Hash)
+
+      value
     end
 
     def attributes

spec/integration/session_spec.rb

@@ -257,6 +257,42 @@
       end
     end
 
+    describe 'Node#checked?' do
+      before do
+        @session.visit '/poltergeist/attributes_properties'
+      end
+
+      it 'is a boolean' do
+        expect(@session.find_field('checked').checked?).to be true
+        expect(@session.find_field('unchecked').checked?).to be false
+      end
+    end
+
+    describe 'Node#[]' do
+      before do
+        @session.visit '/poltergeist/attributes_properties'
+      end
+
+      it 'gets normalized href' do
+        expect(@session.find(:link, 'Loop')['href']).to eq("http://#{@session.server.host}:#{@session.server.port}/poltergeist/attributes_properties")
+      end
+
+      it 'gets innerHTML' do
+        expect(@session.find(:css,'.some_other_class')['innerHTML']).to eq '<p>foobar</p>'
+      end
+
+      it 'gets attribute' do
+        link = @session.find(:link, 'Loop')
+        expect(link['data-random']).to eq '42'
+        expect(link['onclick']).to eq "return false;"
+      end
+
+      it 'gets boolean attributes as booleans' do
+        expect(@session.find_field('checked')['checked']).to be true
+        expect(@session.find_field('unchecked')['checked']).to be false
+      end
+    end
+
     it 'has no trouble clicking elements when the size of a document changes' do
       @session.visit('/poltergeist/long_page')
       @session.find(:css, '#penultimate').click
@@ -737,20 +773,20 @@
 
     context 'supports accessing element properties' do
       before do
-        @session.visit '/poltergeist/property'
+        @session.visit '/poltergeist/attributes_properties'
       end
 
       it 'gets property innerHTML' do
-        expect(@session.find(:css,'.some_class').native.property('innerHTML')).to eq '<p>foobar</p>'
+        expect(@session.find(:css,'.some_other_class').native.property('innerHTML')).to eq '<p>foobar</p>'
       end
 
       it 'gets property outerHTML' do
-        expect(@session.find(:css,'.some_class').native.property('outerHTML')).to eq '<div class="some_class"><p>foobar</p></div>'
+        expect(@session.find(:css,'.some_other_class').native.property('outerHTML')).to eq '<div class="some_other_class"><p>foobar</p></div>'
       end
     end
 
     it 'allows access to element attributes' do
-      @session.visit '/poltergeist/attributes'
+      @session.visit '/poltergeist/attributes_properties'
       expect(@session.find(:css,'#my_link').native.attributes).to eq(
         'href' => '#', 'id' => 'my_link', 'class' => 'some_class', 'data' => 'rah!'
       )

spec/support/views/attributes_properties.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <a href="#" id="my_link" class="some_class" data="rah!">Link me</a>
+    <div class="some_other_class"><p>foobar</p></div>
+    <a href="/poltergeist/attributes_properties" onclick="return false;" data-random="42">Loop</a>
+    <input type="checkbox" id="checked" checked="checked"/>
+    <input type="checkbox" id="unchecked"/>
+  </body>
+</html>