From 170ffee951eac2685c1171a3b2b759f8e08aebe2 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Fri, 15 Mar 2013 12:10:15 -0700
Subject: [PATCH] tests for Node#disabled? behavior with option elements

---
 lib/capybara/spec/session/node_spec.rb | 12 ++++++++++++
 lib/capybara/spec/views/form.erb       |  1 +
 2 files changed, 13 insertions(+)

diff --git a/lib/capybara/spec/session/node_spec.rb b/lib/capybara/spec/session/node_spec.rb
index 92424f3d..b3e8bb18 100644
--- a/lib/capybara/spec/session/node_spec.rb
+++ b/lib/capybara/spec/session/node_spec.rb
@@ -99,6 +99,18 @@ Capybara::SpecHelper.spec "node" do
       @session.find('//input[@id="customer_name"]').should be_disabled
       @session.find('//input[@id="customer_email"]').should_not be_disabled
     end
+    
+    it "should see disabled options as disabled" do
+      @session.visit('/form')
+      @session.find('//select[@id="form_title"]/option[1]').should_not be_disabled
+      @session.find('//select[@id="form_title"]/option[@disabled]').should be_disabled
+    end
+    
+    it "should see enabled options in disabled select as disabled" do
+      @session.visit('/form')
+      @session.find('//select[@id="form_disabled_select"]/option').should be_disabled
+      @session.find('//select[@id="form_title"]/option[1]').should_not be_disabled
+    end
   end
 
   describe "#visible?" do
diff --git a/lib/capybara/spec/views/form.erb b/lib/capybara/spec/views/form.erb
index 3718f58a..4a7574c2 100644
--- a/lib/capybara/spec/views/form.erb
+++ b/lib/capybara/spec/views/form.erb
@@ -8,6 +8,7 @@
       <option>Mrs</option>
       <option>Mr</option>
       <option>Miss</option>
+      <option disabled="disabled">Other</option>
     </select>
     </p>