capybara-webkit 0.10.1 → 0.11.0

data/ChangeLog

@@ -1,3 +1,9 @@
+2012-03-09  Joe Ferris  <jferris@thoughtbot.com>
+  * node.rb, driver_spec.rb: Allow interaction with invisible elements
+
+2012-03-02  Joe Ferris  <jferris@thoughtbot.com>
+  * browser.rb: Use Timeout from stdlib since Capybara.timeout is being removed
+
 2012-03-02  Matthew Mongeau  <halogenandtoast@gmail.com>
   * capybara_webkit_builder.rb:
 	set LANG to en_US.UTF-8 to prevent string encoding issues during install

data/NEWS.md

@@ -1,4 +1,10 @@
+New for 0.11.0:
+
+* Allow interaction with invisible elements
+* Use Timeout from stdlib since Capybara.timeout is being removed
+
 New for 0.10.1:
+
 * LANG environment variable is set to en_US.UTF-8 in order to avoid string encoding issues from qmake.
 * pro, find_command, and CommandFactory are more structured.
 * Changed wiki link and directing platform specific issues to the google group.

data/lib/capybara/driver/webkit/browser.rb

@@ -1,6 +1,6 @@
 require 'socket'
 require 'thread'
-require 'capybara/util/timeout'
+require 'timeout'
 require 'json'
 
 class Capybara::Driver::Webkit
@@ -194,9 +194,10 @@ class Capybara::Driver::Webkit
     end
 
     def connect
-      Capybara.timeout(5) do
-        attempt_connect
-        !@socket.nil?
+      Timeout.timeout(5) do
+        while @socket.nil?
+          attempt_connect
+        end
       end
     end
 

data/lib/capybara/driver/webkit/node.rb

@@ -1,9 +1,5 @@
 class Capybara::Driver::Webkit
   class Node < Capybara::Driver::Node
-
-    class ElementNotDisplayedError < StandardError
-    end
-
     NBSP = "\xC2\xA0"
     NBSP.force_encoding("UTF-8") if NBSP.respond_to?(:force_encoding)
 
@@ -33,7 +29,6 @@ class Capybara::Driver::Webkit
     end
 
     def select_option
-      check_visibility(self)
       invoke "selectOption"
     end
 
@@ -47,13 +42,10 @@ class Capybara::Driver::Webkit
     end
 
     def click
-      check_visibility(self)
       invoke "click"
     end
 
     def drag_to(element)
-      check_visibility(self)
-      check_visibility(element)
       invoke 'dragTo', element.native
     end
 
@@ -122,9 +114,5 @@ class Capybara::Driver::Webkit
     def multiple_select?
       self.tag_name == "select" && self["multiple"] == "multiple"
     end
-
-    def check_visibility(element)
-      raise(ElementNotDisplayedError, "This element is not visible so it may not be interacted with") unless element.visible?
-    end
   end
 end

data/lib/capybara/driver/webkit/version.rb

@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = '0.10.1'.freeze
+      VERSION = '0.11.0'.freeze
     end
   end
 end

data/spec/driver_spec.rb

@@ -713,13 +713,10 @@ describe Capybara::Driver::Webkit do
             <div id="change">Change me</div>
             <div id="mouseup">Push me</div>
             <div id="mousedown">Release me</div>
-            <div id="invisible-mouseup" style="display:none;">You can't push me</div>
-            <div id="invisible-mousedown" style="display:none;">You can't release me</div>
             <form action="/" method="GET">
               <select id="change_select" name="change_select">
                 <option value="1" id="option-1" selected="selected">one</option>
                 <option value="2" id="option-2">two</option>
-                <option value="2" id="invisible-option" style="display:none;">three</option>
               </select>
             </form>
             <script type="text/javascript">
@@ -741,7 +738,6 @@ describe Capybara::Driver::Webkit do
                 });
             </script>
             <a href="/next">Next</a>
-            <a href="/next" id="hidden" style="display:none;">Not displayed</a>
           </body></html>
         HTML
         [200,
@@ -750,7 +746,7 @@ describe Capybara::Driver::Webkit do
       end
     end
 
-    it "clicks a visible element" do
+    it "clicks an element" do
       subject.find("//a").first.click
       subject.current_url =~ %r{/next$}
     end
@@ -782,39 +778,6 @@ describe Capybara::Driver::Webkit do
 
       subject.find("//*[@class='triggered']").size.should == 1
     end
-
-    context "raises error when" do
-      it "tries to click an invisible element" do
-        expect {
-          subject.find("//*[@id='hidden']").first.click
-        }.to raise_error(Capybara::Driver::Webkit::Node::ElementNotDisplayedError)
-      end
-
-      it "tries to drag an invisible element to a visible one" do
-        draggable = subject.find("//*[@id='invisible-mousedown']").first
-        container = subject.find("//*[@id='mouseup']").first
-
-        expect {
-          draggable.drag_to(container)
-        }.to raise_error(Capybara::Driver::Webkit::Node::ElementNotDisplayedError)
-      end
-
-      it "tries to drag a visible element to an invisible one" do
-        draggable = subject.find("//*[@id='mousedown']").first
-        container = subject.find("//*[@id='invisible-mouseup']").first
-
-        expect {
-          draggable.drag_to(container)
-        }.to raise_error(Capybara::Driver::Webkit::Node::ElementNotDisplayedError)
-      end
-
-      it "tries to select an invisible option" do
-        option = subject.find("//option[@id='invisible-option']").first
-        expect {
-          option.select_option
-        }.to raise_error(Capybara::Driver::Webkit::Node::ElementNotDisplayedError)
-      end
-    end
   end
 
   context "nesting app" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2012-03-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2153762820 !ruby/object:Gem::Requirement
+  requirement: &2152940960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -28,10 +28,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2153762820
+  version_requirements: *2152940960
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156481880 !ruby/object:Gem::Requirement
+  requirement: &2152940280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -39,10 +39,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156481880
+  version_requirements: *2152940280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156481340 !ruby/object:Gem::Requirement
+  requirement: &2152939740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -50,10 +50,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156481340
+  version_requirements: *2152939740
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2156480920 !ruby/object:Gem::Requirement
+  requirement: &2152939320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -61,10 +61,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156480920
+  version_requirements: *2152939320
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &2156480460 !ruby/object:Gem::Requirement
+  requirement: &2152938860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -72,10 +72,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156480460
+  version_requirements: *2152938860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156480040 !ruby/object:Gem::Requirement
+  requirement: &2152938440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -83,10 +83,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156480040
+  version_requirements: *2152938440
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &2156479540 !ruby/object:Gem::Requirement
+  requirement: &2152937940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,7 +94,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2156479540
+  version_requirements: *2152937940
 description: 
 email: support@thoughtbot.com
 executables: []