From fa3c6eddb4cc8bc0ecc059028c0a2872ddac8e31 Mon Sep 17 00:00:00 2001
From: Jason Morrison <jmorrison@thoughtbot.com>
Date: Sat, 26 Feb 2011 17:51:47 -0500
Subject: [PATCH] Select and unselect options

---
 lib/capybara/driver/webkit/node.rb | 20 ++++++++++++--
 spec/driver_spec.rb                | 44 ++++++++++++++++++++++++++++--
 src/capybara.js                    |  9 ++++++
 3 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/lib/capybara/driver/webkit/node.rb b/lib/capybara/driver/webkit/node.rb
index 4d3460c..129641d 100644
--- a/lib/capybara/driver/webkit/node.rb
+++ b/lib/capybara/driver/webkit/node.rb
@@ -9,7 +9,15 @@ class Capybara::Driver::Webkit
     end
 
     def value
-      invoke "value"
+      if multiple_select?
+        self.find("./option").select do |option|
+          option["selected"] == "selected"
+        end.map do |option|
+          option.value
+        end
+      else
+        invoke "value"
+      end
     end
 
     def set(value)
@@ -17,11 +25,11 @@ class Capybara::Driver::Webkit
     end
 
     def select_option
-      raise NotImplementedError
+      invoke "selectOption"
     end
 
     def unselect_option
-      raise NotImplementedError
+      invoke "unselectOption"
     end
 
     def click
@@ -63,6 +71,12 @@ class Capybara::Driver::Webkit
     def browser
       driver.browser
     end
+
+    private
+
+    def multiple_select?
+      self.tag_name == "select" && self["multiple"] == "multiple"
+    end
   end
 end
 
diff --git a/spec/driver_spec.rb b/spec/driver_spec.rb
index 8a7a5b6..1847bd1 100644
--- a/spec/driver_spec.rb
+++ b/spec/driver_spec.rb
@@ -143,8 +143,13 @@ describe Capybara::Driver::Webkit do
             <form action="/" method="GET">
               <input type="text" name="foo" value="bar"/>
               <select name="animal">
-                <option>Monkey</option>
-                <option selected="selected">Capybara</option>
+                <option id="select-option-monkey">Monkey</option>
+                <option id="select-option-capybara" selected="selected">Capybara</option>
+              </select>
+              <select name="toppings" multiple="multiple">
+                <option selected="selected" id="topping-apple">Apple</option>
+                <option selected="selected" id="topping-banana">Banana</option>
+                <option selected="selected" id="topping-cherry">Cherry</option>
               </select>
               <textarea id="only-textarea">what a wonderful area for text</textarea>
             </form>
@@ -185,6 +190,41 @@ describe Capybara::Driver::Webkit do
       textarea.set("newvalue")
       textarea.value.should == "newvalue"
     end
+
+    let(:monkey_option)   { subject.find("//option[@id='select-option-monkey']").first }
+    let(:capybara_option) { subject.find("//option[@id='select-option-capybara']").first }
+    let(:animal_select)   { subject.find("//select[@name='animal']").first }
+    let(:apple_option)    { subject.find("//option[@id='topping-apple']").first }
+    let(:banana_option)   { subject.find("//option[@id='topping-banana']").first }
+    let(:cherry_option)   { subject.find("//option[@id='topping-cherry']").first }
+    let(:toppings_select) { subject.find("//select[@name='toppings']").first }
+
+    it "selects an option" do
+      animal_select.value.should == "Capybara"
+      monkey_option.select_option
+      animal_select.value.should == "Monkey"
+    end
+
+    it "unselects an option in a multi-select" do
+      toppings_select.value.should include("Apple", "Banana", "Cherry")
+
+      apple_option.unselect_option
+      toppings_select.value.should_not include("Apple")
+    end
+
+    it "reselects an option in a multi-select" do
+      apple_option.unselect_option
+      banana_option.unselect_option
+      cherry_option.unselect_option
+
+      toppings_select.value.should == []
+
+      apple_option.select_option
+      banana_option.select_option
+      cherry_option.select_option
+
+      toppings_select.value.should include("Apple", "Banana", "Cherry")
+    end
   end
 
   context "mouse app" do
diff --git a/src/capybara.js b/src/capybara.js
index ed689c5..6ff13c3 100644
--- a/src/capybara.js
+++ b/src/capybara.js
@@ -66,6 +66,15 @@ Capybara = {
 
   set: function(index, value) {
     this.nodes[index].value = value;
+  },
+
+  selectOption: function(index) {
+    this.nodes[index].setAttribute("selected", "selected");
+  },
+
+  unselectOption: function(index) {
+    this.nodes[index].removeAttribute("selected");
   }
+
 };