RubyGems - capybara-webkit - Versions diffs - 0.14.2 → 1.0.0 - Mend

capybara-webkit 0.14.2 → 1.0.0

Files changed (111) hide show

data/.gitignore +2 -0
data/.travis.yml +21 -0
data/Appraisals +4 -4
data/CONTRIBUTING.md +14 -3
data/Gemfile +1 -1
data/Gemfile.lock +27 -19
data/NEWS.md +15 -0
data/README.md +126 -76
data/Vagrantfile +7 -0
data/capybara-webkit.gemspec +3 -0
data/gemfiles/2.0.gemfile +7 -0
data/gemfiles/2.0.gemfile.lock +72 -0
data/gemfiles/2.1.gemfile +7 -0
data/gemfiles/2.1.gemfile.lock +71 -0
data/lib/capybara/webkit/browser.rb +22 -22
data/lib/capybara/webkit/connection.rb +9 -6
data/lib/capybara/webkit/driver.rb +22 -6
data/lib/capybara/webkit/errors.rb +25 -0
data/lib/capybara/webkit/node.rb +36 -10
data/lib/capybara/webkit/version.rb +1 -1
data/spec/browser_spec.rb +16 -1
data/spec/capybara_webkit_builder_spec.rb +9 -3
data/spec/connection_spec.rb +19 -3
data/spec/driver_spec.rb +324 -144
data/spec/errors_spec.rb +11 -0
data/spec/integration/session_spec.rb +244 -0
data/spec/selenium_compatibility_spec.rb +3 -1
data/spec/spec_helper.rb +1 -9
data/src/Authenticate.cpp +3 -2
data/src/ClearCookies.cpp +1 -1
data/src/ClearPromptText.cpp +1 -1
data/src/Command.cpp +8 -4
data/src/Command.h +7 -4
data/src/CommandFactory.cpp +4 -2
data/src/CommandParser.cpp +1 -1
data/src/Connection.cpp +4 -4
data/src/ConsoleMessages.cpp +1 -1
data/src/CurrentUrl.cpp +2 -2
data/src/EnableLogging.cpp +1 -1
data/src/ErrorMessage.cpp +26 -0
data/src/ErrorMessage.h +21 -0
data/src/Evaluate.cpp +1 -1
data/src/Execute.cpp +3 -2
data/src/FindCss.cpp +13 -0
data/src/FindCss.h +11 -0
data/src/FindXpath.cpp +13 -0
data/src/FindXpath.h +11 -0
data/src/FrameFocus.cpp +4 -3
data/src/GetCookies.cpp +1 -1
data/src/GetTimeout.cpp +1 -1
data/src/GetWindowHandle.cpp +1 -1
data/src/GetWindowHandles.cpp +1 -1
data/src/Header.cpp +2 -2
data/src/Headers.cpp +1 -6
data/src/IgnoreSslErrors.cpp +1 -1
data/src/InvocationResult.cpp +29 -0
data/src/InvocationResult.h +16 -0
data/src/JavascriptAlertMessages.cpp +1 -1
data/src/JavascriptCommand.cpp +15 -0
data/src/JavascriptCommand.h +20 -0
data/src/JavascriptConfirmMessages.cpp +1 -1
data/src/JavascriptInvocation.cpp +128 -1
data/src/JavascriptInvocation.h +22 -1
data/src/JavascriptPromptMessages.cpp +1 -1
data/src/NetworkAccessManager.cpp +8 -16
data/src/NetworkAccessManager.h +5 -11
data/src/NetworkReplyProxy.cpp +91 -0
data/src/NetworkReplyProxy.h +65 -0
data/src/Node.cpp +4 -4
data/src/Node.h +2 -2
data/src/NullCommand.cpp +2 -1
data/src/PageLoadingCommand.cpp +2 -1
data/src/Render.cpp +1 -1
data/src/Reset.cpp +1 -1
data/src/ResizeWindow.cpp +1 -1
data/src/Response.cpp +7 -0
data/src/Response.h +8 -3
data/src/SetConfirmAction.cpp +1 -1
data/src/SetCookie.cpp +2 -2
data/src/SetPromptAction.cpp +1 -1
data/src/SetPromptText.cpp +1 -1
data/src/SetProxy.cpp +2 -2
data/src/SetSkipImageLoading.cpp +1 -1
data/src/SetTimeout.cpp +3 -2
data/src/SetUrlBlacklist.cpp +2 -2
data/src/Status.cpp +1 -1
data/src/TimeoutCommand.cpp +4 -2
data/src/Title.cpp +11 -0
data/src/Title.h +9 -0
data/src/Version.cpp +13 -0
data/src/Version.h +10 -0
data/src/Visit.cpp +1 -1
data/src/WebPage.cpp +49 -27
data/src/WebPage.h +14 -7
data/src/WebPageManager.cpp +10 -1
data/src/WebPageManager.h +4 -1
data/src/WindowFocus.cpp +3 -2
data/src/body.cpp +3 -6
data/src/capybara.js +103 -101
data/src/find_command.h +4 -2
data/src/main.cpp +1 -1
data/src/stable.h +39 -0
data/src/webkit_server.pro +26 -6
data/vagrant_setup.sh +58 -0
metadata +51 -78
data/gemfiles/1.0.gemfile +0 -7
data/gemfiles/1.0.gemfile.lock +0 -70
data/gemfiles/1.1.gemfile +0 -7
data/gemfiles/1.1.gemfile.lock +0 -70
data/src/Find.cpp +0 -20
data/src/Find.h +0 -11

data/spec/errors_spec.rb ADDED Viewed

@@ -0,0 +1,11 @@
+require 'spec_helper'
+describe Capybara::Webkit::JsonError do
+  let(:error) { described_class.new '{"class": "ClickFailed", "message": "Error clicking this element"}' }
+  subject { error.exception }
+  it { should be_an_instance_of Capybara::Webkit::ClickFailed }
+  its(:message) { should == 'Error clicking this element' }
+end

data/spec/integration/session_spec.rb CHANGED Viewed

@@ -60,6 +60,7 @@ describe Capybara::Session do
             <strong>Hello</strong>
             <span>UTF8文字列</span>
             <input type="button" value="ボタン" />
+            <a href="about:blank">Link</a>
           </body></html>
         HTML
         [200,
@@ -84,6 +85,13 @@ describe Capybara::Session do
     it "can click utf8 string" do
       subject.click_button('ボタン')
     end
+    it "raises an ElementNotFound error when the selector scope is no longer valid" do
+      subject.within('//body') do
+        subject.click_link 'Link'
+        lambda { subject.find('//strong') }.should raise_error(Capybara::ElementNotFound)
+      end
+    end
   end
   context "response headers with status code" do
@@ -228,4 +236,240 @@ describe Capybara::Session do
       subject.should have_content('admin')
     end
   end
+  context "iframe app" do
+    before(:all) do
+      @app = Class.new(ExampleApp) do
+        get '/' do
+          <<-HTML
+            <!DOCTYPE html>
+            <html>
+            <body>
+              <h1>Main Frame</h1>
+              <iframe src="/a" name="a_frame" width="500" height="500"></iframe>
+            </body>
+            </html>
+          HTML
+        end
+        get '/a' do
+          <<-HTML
+            <!DOCTYPE html>
+            <html>
+            <body>
+              <h1>Page A</h1>
+              <iframe src="/b" name="b_frame" width="500" height="500"></iframe>
+            </body>
+            </html>
+          HTML
+        end
+        get '/b' do
+          <<-HTML
+            <!DOCTYPE html>
+            <html>
+            <body>
+              <h1>Page B</h1>
+              <form action="/c" method="post">
+              <input id="button" name="commit" type="submit" value="B Button">
+              </form>
+            </body>
+            </html>
+          HTML
+        end
+        post '/c' do
+          <<-HTML
+            <!DOCTYPE html>
+            <html>
+            <body>
+              <h1>Page C</h1>
+            </body>
+            </html>
+          HTML
+        end
+      end
+    end
+    it 'supports clicking an element offset from the viewport origin' do
+      subject.visit '/'
+      subject.within_frame 'a_frame' do
+        subject.within_frame 'b_frame' do
+          subject.click_button 'B Button'
+          subject.should have_content('Page C')
+        end
+      end
+    end
+    it 'raises an error if an element is obscured when clicked' do
+      subject.visit('/')
+      subject.execute_script(<<-JS)
+        var div = document.createElement('div');
+        div.style.position = 'absolute';
+        div.style.left = '0px';
+        div.style.top = '0px';
+        div.style.width = '100%';
+        div.style.height = '100%';
+        document.body.appendChild(div);
+      JS
+      subject.within_frame('a_frame') do
+        subject.within_frame('b_frame') do
+          lambda {
+            subject.click_button 'B Button'
+          }.should raise_error(Capybara::Webkit::ClickFailed)
+        end
+      end
+    end
+  end
+  context 'click tests' do
+    before(:all) do
+      @app = Class.new(ExampleApp) do
+        get '/' do
+          <<-HTML
+            <!DOCTYPE html>
+            <html>
+            <head>
+            <style>
+              body {
+                width: 800px;
+                margin: 0;
+              }
+              .target {
+                width: 200px;
+                height: 200px;
+                float: left;
+                margin: 100px;
+              }
+              #offscreen {
+                position: absolute;
+                left: -5000px;
+              }
+            </style>
+            <body>
+              <div id="one" class="target"></div>
+              <div id="two" class="target"></div>
+              <div id="offscreen"><a href="/" id="foo">Click Me</a></div>
+              <form>
+                <input type="checkbox" id="bar">
+              </form>
+              <div><a href="#"><i></i>Some link</a></div>
+              <script type="text/javascript">
+                var targets = document.getElementsByClassName('target');
+                for (var i = 0; i < targets.length; i++) {
+                  var target = targets[i];
+                  target.onclick = function(event) {
+                    this.setAttribute('data-click-x', event.clientX);
+                    this.setAttribute('data-click-y', event.clientY);
+                  };
+                }
+              </script>
+            </body>
+            </html>
+          HTML
+        end
+      end
+    end
+    it 'clicks in the center of an element' do
+      subject.visit('/')
+      subject.find(:css, '#one').click
+      subject.find(:css, '#one')['data-click-x'].should == '199'
+      subject.find(:css, '#one')['data-click-y'].should == '199'
+    end
+    it 'clicks in the center of the viewable area of an element' do
+      subject.visit('/')
+      subject.driver.resize_window(200, 200)
+      subject.find(:css, '#one').click
+      subject.find(:css, '#one')['data-click-x'].should == '149'
+      subject.find(:css, '#one')['data-click-y'].should == '99'
+    end
+    it 'does not raise an error when an anchor contains empty nodes' do
+      subject.visit('/')
+      lambda { subject.click_link('Some link') }.should_not raise_error(Capybara::Webkit::ClickFailed)
+    end
+    it 'scrolls an element into view when clicked' do
+      subject.visit('/')
+      subject.driver.resize_window(200, 200)
+      subject.find(:css, '#two').click
+      subject.find(:css, '#two')['data-click-x'].should_not be_nil
+      subject.find(:css, '#two')['data-click-y'].should_not be_nil
+    end
+    it 'raises an error if an element is obscured when clicked' do
+      subject.visit('/')
+      subject.execute_script(<<-JS)
+        var two = document.getElementById('two');
+        two.style.position = 'absolute';
+        two.style.left = '0px';
+        two.style.top = '0px';
+      JS
+      lambda {
+        subject.find(:css, '#one').click
+      }.should raise_error(Capybara::Webkit::ClickFailed, /\[@id='one'\] at position/)
+    end
+    it 'raises an error if a checkbox is obscured when checked' do
+      subject.visit('/')
+      subject.execute_script(<<-JS)
+        var div = document.createElement('div');
+        div.style.position = 'absolute';
+        div.style.left = '0px';
+        div.style.top = '0px';
+        div.style.width = '100%';
+        div.style.height = '100%';
+        document.body.appendChild(div);
+      JS
+      lambda {
+        subject.check('bar')
+      }.should raise_error(Capybara::Webkit::ClickFailed)
+    end
+    it 'raises an error if an element is not visible when clicked' do
+      ignore_hidden_elements = Capybara.ignore_hidden_elements
+      Capybara.ignore_hidden_elements = false
+      begin
+        subject.visit('/')
+        subject.execute_script "document.getElementById('foo').style.display = 'none'"
+        lambda { subject.click_link "Click Me" }.should raise_error(Capybara::Webkit::ClickFailed, /\[@id='foo'\] at unknown/)
+      ensure
+        Capybara.ignore_hidden_elements = ignore_hidden_elements
+      end
+    end
+    it 'raises an error if an element is not in the viewport when clicked' do
+      subject.visit('/')
+      lambda { subject.click_link "Click Me" }.should raise_error(Capybara::Webkit::ClickFailed)
+    end
+    context "with wait time of 1 second" do
+      around do |example|
+        default_wait_time = Capybara.default_wait_time
+        Capybara.default_wait_time = 1
+        example.run
+        Capybara.default_wait_time = default_wait_time
+      end
+      it "waits for an element to appear in the viewport when clicked" do
+        subject.execute_script <<-JS
+          setTimeout(function() {
+            var offscreen = document.getElementById('offscreen')
+            offscreen.style.left = '10px';
+          }, 400);
+        JS
+        lambda { subject.click_link "Click Me" }.should_not raise_error(Capybara::Webkit::ClickFailed)
+      end
+    end
+  end
 end

data/spec/selenium_compatibility_spec.rb CHANGED Viewed

@@ -9,6 +9,7 @@ describe Capybara::Webkit, 'compatibility with selenium' do
         <form onsubmit="return false">
           <label for="one">One</label><input type="text" name="one" id="one" />
           <label for="two">Two</label><input type="text" name="two" id="two" />
+          <label for="three">Three</label><input type="text" name="three" id="three" readonly="readonly" />
           <input type="submit" value="Submit" id="submit" />
         </form>
         <script type="text/javascript">
@@ -18,7 +19,7 @@ describe Capybara::Webkit, 'compatibility with selenium' do
           };
           var elements = document.getElementsByTagName("input");
           var events = ["mousedown", "mouseup", "click", "keyup", "keydown",
-                        "keypress", "focus", "blur"];
+                        "keypress", "focus", "blur", "input", "change"];
           for (var i = 0; i < elements.length; i++) {
             for (var j = 0; j < events.length; j++) {
               elements[i].addEventListener(events[j], recordEvent);
@@ -33,6 +34,7 @@ describe Capybara::Webkit, 'compatibility with selenium' do
       fill_in "One", :with => "some value"
       fill_in "One", :with => "a new value"
       fill_in "Two", :with => "other value"
+      fill_in "Three", :with => "readonly value"
       click_button "Submit"
     end
   end

data/spec/spec_helper.rb CHANGED Viewed

@@ -9,14 +9,6 @@ $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 Dir[File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')].each { |file| require(file) }
-spec_dir = nil
-$:.detect do |dir|
-  if File.exists? File.join(dir, "capybara.rb")
-    spec_dir = File.expand_path(File.join(dir,"..","spec"))
-    $:.unshift( spec_dir )
-  end
-end
 require 'capybara/webkit'
 connection = Capybara::Webkit::Connection.new(:socket_class => TCPSocket)
 $webkit_browser = Capybara::Webkit::Browser.new(connection)
@@ -25,7 +17,7 @@ if ENV['DEBUG']
   $webkit_browser.enable_logging
 end
-require File.join(spec_dir, "spec_helper")
+require 'capybara/spec/spec_helper'
 Capybara.register_driver :reusable_webkit do |app|
   Capybara::Webkit::Driver.new(app, :browser => $webkit_browser)

data/src/Authenticate.cpp CHANGED Viewed

@@ -1,6 +1,7 @@
 #include "Authenticate.h"
 #include "WebPage.h"
 #include "NetworkAccessManager.h"
+#include "WebPageManager.h"
 Authenticate::Authenticate(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
@@ -9,10 +10,10 @@ void Authenticate::start() {
   QString username = arguments()[0];
   QString password = arguments()[1];
-  NetworkAccessManager* networkAccessManager = page()->networkAccessManager();
+  NetworkAccessManager* networkAccessManager = manager()->networkAccessManager();
   networkAccessManager->setUserName(username);
   networkAccessManager->setPassword(password);
-  emitFinished(true);
+  finish(true);
 }

data/src/ClearCookies.cpp CHANGED Viewed

@@ -9,5 +9,5 @@ ClearCookies::ClearCookies(WebPageManager *manager, QStringList &arguments, QObj
 void ClearCookies::start()
 {
   manager()->cookieJar()->clearCookies();
-  emitFinished(true);
+  finish(true);
 }

data/src/ClearPromptText.cpp CHANGED Viewed

@@ -7,5 +7,5 @@ ClearPromptText::ClearPromptText(WebPageManager *manager, QStringList &arguments
 void ClearPromptText::start()
 {
   page()->setPromptText(QString());
-  emitFinished(true);
+  finish(true);
 }

data/src/Command.cpp CHANGED Viewed

@@ -1,4 +1,5 @@
-#include "SocketCommand.h"
+#include "Command.h"
+#include "ErrorMessage.h"
 Command::Command(QObject *parent) : QObject(parent) {
 }
@@ -7,15 +8,18 @@ QString Command::toString() const {
   return metaObject()->className();
 }
-void Command::emitFinished(bool success) {
+void Command::finish(bool success) {
   emit finished(new Response(success, this));
 }
-void Command::emitFinished(bool success, QString message) {
+void Command::finish(bool success, QString message) {
   emit finished(new Response(success, message, this));
 }
-void Command::emitFinished(bool success, QByteArray message) {
+void Command::finish(bool success, QByteArray message) {
   emit finished(new Response(success, message, this));
 }
+void Command::finish(bool success, ErrorMessage *message) {
+  emit finished(new Response(success, message, this));
+}

data/src/Command.h CHANGED Viewed

@@ -1,10 +1,12 @@
 #ifndef COMMAND_H
 #define COMMAND_H
-#include <QObject>
 #include "Response.h"
+#include <QObject>
 #include <QString>
+class ErrorMessage;
 class Command : public QObject {
   Q_OBJECT
@@ -14,9 +16,10 @@ class Command : public QObject {
     virtual QString toString() const;
   protected:
-    void emitFinished(bool success);
-    void emitFinished(bool success, QString message);
-    void emitFinished(bool success, QByteArray message);
+    void finish(bool success);
+    void finish(bool success, QString message);
+    void finish(bool success, QByteArray message);
+    void finish(bool success, ErrorMessage *message);
   signals:
     void finished(Response *response);

data/src/CommandFactory.cpp CHANGED Viewed

@@ -1,8 +1,7 @@
 #include "CommandFactory.h"
 #include "NullCommand.h"
-#include "SocketCommand.h"
 #include "Visit.h"
-#include "Find.h"
+#include "FindXpath.h"
 #include "Reset.h"
 #include "Node.h"
 #include "Evaluate.h"
@@ -38,6 +37,9 @@
 #include "JavascriptConfirmMessages.h"
 #include "JavascriptPromptMessages.h"
 #include "SetUrlBlacklist.h"
+#include "Version.h"
+#include "Title.h"
+#include "FindCss.h"
 CommandFactory::CommandFactory(WebPageManager *manager, QObject *parent) : QObject(parent) {
   m_manager = manager;

data/src/CommandParser.cpp CHANGED Viewed

@@ -63,7 +63,7 @@ void CommandParser::processArgument(const char *data) {
   }
   if (m_arguments.length() == m_argumentsExpected) {
-    Command *command = m_commandFactory->createCommand(m_commandName.toAscii().constData(), m_arguments);
+    Command *command = m_commandFactory->createCommand(m_commandName.toLatin1().constData(), m_arguments);
     emit commandReady(command);
     reset();
   }