Enabled options in disabled selects are disabled

This is the behavior of Selenium and has been standardized in Capybara.

lib/capybara/webkit/node.rb

@@ -92,7 +92,11 @@ module Capybara::Webkit
     end
 
     def disabled?
-      self['disabled']
+      if %w(option optgroup).include? tag_name
+        self['disabled'] || find_xpath("parent::*")[0].disabled?
+      else
+        self['disabled']
+      end
     end
 
     def path

spec/driver_spec.rb

@@ -780,6 +780,9 @@ describe Capybara::Webkit::Driver do
               <option id="select-option-monkey">Monkey</option>
               <option id="select-option-capybara" selected="selected">Capybara</option>
             </select>
+            <select name="disabled" disabled="disabled">
+              <option id="select-option-disabled">Disabled</option>
+            </select>
             <select name="toppings" multiple="multiple">
               <optgroup label="Mediocre Toppings">
                 <option selected="selected" id="topping-apple">Apple</option>
@@ -988,6 +991,10 @@ describe Capybara::Webkit::Driver do
       readonly_input.set('enabled')
       readonly_input.value.should == 'readonly'
     end
+
+    it "should see enabled options in disabled select as disabled" do
+      driver.find_css("#select-option-disabled").first.should be_disabled
+    end
   end
 
   context "dom events" do