Only check for attached nodes when reloading is enabled

trevorsmith · Sep 30, 2011 · 36e13f7 · 36e13f7
1 parent 5843e56
commit 36e13f7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/lib/capybara/driver/webkit/node.rb b/lib/capybara/driver/webkit/node.rb
@@ -88,13 +88,17 @@ def find(xpath)
     end
 
     def invoke(name, *args)
-      if attached?
+      if allow_unattached_nodes? || attached?
         browser.command "Node", name, native, *args
       else
         raise Capybara::Driver::Webkit::NodeNotAttachedError
       end
     end
 
+    def allow_unattached_nodes?
+      !Capybara.automatic_reload
+    end
+
     def attached?
       browser.command("Node", "isAttached", native) == "true"
     end

diff --git a/spec/driver_spec.rb b/spec/driver_spec.rb
@@ -981,4 +981,30 @@ def echoed_cookie
       driver_with_debugger.find("//*[@id='parent']")
     end
   end
+
+  context "remove node app" do
+    before(:all) do
+      @app = lambda do |env|
+        body = <<-HTML
+          <html>
+            <div id="parent">
+              <p id="removeMe">Hello</p>
+            </div>
+          </html>
+        HTML
+        [200,
+          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
+          [body]]
+      end
+    end
+
+    before { Capybara.automatic_reload = false }
+    after { Capybara.automatic_reload = true }
+
+    it "allows removed nodes when reloading is disabled" do
+      node = subject.find("//p[@id='removeMe']").first
+      subject.evaluate_script("document.getElementById('parent').innerHTML = 'Magic'")
+      node.text.should == 'Hello'
+    end
+  end
 end