lib/watir-webdriver/elements/checkbox.rb in watir-webdriver-0.6.11 vs lib/watir-webdriver/elements/checkbox.rb in watir-webdriver-0.7.0

@@ -15,33 +15,24 @@
     #
     # @param [Boolean] bool
     #
 
     def set(bool = true)
-      assert_exists
-      assert_enabled
-
-      if @element.selected?
-        @element.click unless bool
-      else
-        @element.click if bool
-      end
+      set? == bool ? assert_enabled : click
     end
 
     #
     # Returns true if the element is checked
     # @return [Boolean]
     #
 
     def set?
       assert_exists
-      @element.selected?
+      element_call { @element.selected? }
     end
 
     #
     # Unsets checkbox.
-    #
-    # Same as +set(false)+
     #
 
     def clear
       set false
     end