Fixed multiple select value for rack-test driver

bjeanes · Feb 19, 2010 · 02daf7a · 02daf7a
1 parent 291bb0f
commit 02daf7a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/capybara/driver/rack_test_driver.rb b/lib/capybara/driver/rack_test_driver.rb
@@ -13,8 +13,12 @@ def [](name)
       attr_name = name.to_s
       case
       when 'select' == tag_name && 'value' == attr_name
-        option = node.xpath(".//option[@selected='selected']").first || node.xpath(".//option").first
-        option.content if option
+        if node['multiple'] == 'multiple'
+          node.xpath(".//option[@selected='selected']").map { |option| option.content  }
+        else
+          option = node.xpath(".//option[@selected='selected']").first || node.xpath(".//option").first
+          option.content if option
+        end
       when 'input' == tag_name && 'checkbox' == type && 'checked' == attr_name
         node[attr_name] == 'checked' ? true : false
       else

diff --git a/spec/dsl/select_spec.rb b/spec/dsl/select_spec.rb
@@ -44,6 +44,16 @@
     end
 
     context "with multiple select" do
+      it "should return an empty value" do
+        @session.find_field('Language').value.should == []
+      end
+
+      it "should return value of the selected options" do
+        @session.select("Ruby",       :from => 'Language')
+        @session.select("Javascript", :from => 'Language')
+        @session.find_field('Language').value.should include('Ruby', 'Javascript')
+      end
+
       it "should select one option" do
         @session.select("Ruby", :from => 'Language')
         @session.click_button('awesome')