Merge remote branch 'PickLive/master'

levicole · May 9, 2010 · 87aa2ca · 87aa2ca
2 parents 5fd3744 + 73800eb
commit 87aa2ca
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/lib/capybara/driver/rack_test_driver.rb b/lib/capybara/driver/rack_test_driver.rb
@@ -32,9 +32,9 @@ def set(value)
         driver.html.xpath("//input[@name=#{Capybara::XPath.escape(self[:name])}]").each { |node| node.remove_attribute("checked") }
         node['checked'] = 'checked'
       elsif tag_name == 'input' and type == 'checkbox'
-        if value
+        if value && !node['checked']
           node['checked'] = 'checked'
-        else
+        elsif !value && node['checked']
           node.remove_attribute('checked')
         end
       elsif tag_name == 'input'

diff --git a/lib/capybara/driver/selenium_driver.rb b/lib/capybara/driver/selenium_driver.rb
@@ -31,7 +31,7 @@ def set(value)
       elsif tag_name == 'input' and type == 'radio'
         node.click
       elsif tag_name == 'input' and type == 'checkbox'
-        node.click
+        node.click if node.attribute('checked') != value
       end
     end
 

diff --git a/lib/capybara/spec/session/check_spec.rb b/lib/capybara/spec/session/check_spec.rb
@@ -17,6 +17,34 @@ module CheckSpec
         end
       end
 
+      describe "checking" do
+        it "should not change an already checked checkbox" do
+          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+          @session.check('form_pets_dog')
+          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+        end
+
+        it "should check an unchecked checkbox" do
+          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+          @session.check('form_pets_cat')
+          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_true
+        end
+      end
+
+      describe "unchecking" do
+        it "should not change an already unchecked checkbox" do
+          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+          @session.uncheck('form_pets_cat')
+          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+        end
+
+        it "should uncheck a checked checkbox" do
+          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+          @session.uncheck('form_pets_dog')
+          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_false
+        end
+      end
+
       it "should check a checkbox by id" do
         @session.check("form_pets_cat")
         @session.click_button('awesome')