diff --git a/lib/capybara/driver/webkit/browser.rb b/lib/capybara/driver/webkit/browser.rb index 1b75814..8c9f4e8 100644 --- a/lib/capybara/driver/webkit/browser.rb +++ b/lib/capybara/driver/webkit/browser.rb @@ -20,7 +20,6 @@ class Capybara::Driver::Webkit end def command(name, *args) - puts ">> Sending #{name}" @socket.puts name args.each { |arg| @socket.puts arg } check @@ -35,12 +34,10 @@ class Capybara::Driver::Webkit end def connect - puts ">> Connecting" Capybara.timeout(5) do attempt_connect !@socket.nil? end - puts ">> Connected" end def attempt_connect @@ -50,7 +47,7 @@ class Capybara::Driver::Webkit def check result = @socket.gets.strip - puts ">> #{result}" + unless result == 'ok' raise WebkitError, read_response end diff --git a/src/Connection.cpp b/src/Connection.cpp index 05c9d6e..d2cef2a 100644 --- a/src/Connection.cpp +++ b/src/Connection.cpp @@ -17,19 +17,16 @@ Connection::Connection(QTcpSocket *socket, WebPage *page, QObject *parent) : } void Connection::checkNext() { - std::cout << "<< Data ready to read" << std::endl; while (m_socket->canReadLine()) { readNext(); } } void Connection::readNext() { - std::cout << "<< Reading line" << std::endl; char buffer[1024]; qint64 lineLength = m_socket->readLine(buffer, 1024); if (lineLength != -1) { buffer[lineLength - 1] = 0; - std::cout << "<< Got line: " << buffer << std::endl; if (m_command) { m_command->receivedArgument(buffer); } else { @@ -50,7 +47,6 @@ void Connection::readNext() { Command *Connection::startCommand(const char *name) { #include "find_command.h" - std::cout << ">> Unknown command" << std::endl; return NULL; } diff --git a/src/Find.cpp b/src/Find.cpp index 4e9ccac..a3bc4c7 100644 --- a/src/Find.cpp +++ b/src/Find.cpp @@ -7,7 +7,6 @@ Find::Find(WebPage *page, QObject *parent) : Command(page, parent) { } void Find::receivedArgument(const char *xpath) { - std::cout << "<< Running query: " << xpath << std::endl; QString javascript = QString("\ (function () {\ if (!window.__capybara_index) {\ @@ -30,10 +29,6 @@ void Find::receivedArgument(const char *xpath) { })()\ "; - - std::cout << "<< Javascript to execute:" << std::endl; - std::cout << javascript.toAscii().data() << std::endl; - QString response; QVariant result = page()->mainFrame()->evaluateJavaScript(javascript); @@ -50,9 +45,6 @@ void Find::receivedArgument(const char *xpath) { addComma = true; } - std::cout << "<< Got result:" << std::endl; - std::cout << response.toAscii().data() << std::endl; - emit finished(true, response); } else { response = "Invalid XPath expression"; diff --git a/src/Server.cpp b/src/Server.cpp index 2cb81d2..5e57a86 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -16,7 +16,6 @@ bool Server::start() { } void Server::handleConnection() { - std::cout << "<< Got connection" << std::endl; QTcpSocket *socket = m_tcp_server->nextPendingConnection(); new Connection(socket, m_page, this); } diff --git a/src/Visit.cpp b/src/Visit.cpp index dbac86d..5ad1b63 100644 --- a/src/Visit.cpp +++ b/src/Visit.cpp @@ -8,14 +8,11 @@ Visit::Visit(WebPage *page, QObject *parent) : Command(page, parent) { } void Visit::receivedArgument(const char *url) { - std::cout << ">> Loading page: " << url << std::endl; page()->mainFrame()->setUrl(QUrl(url)); } void Visit::loadFinished(bool success) { - std::cout << ">> Page loaded" << std::endl; QString response; - std::cout << page()->mainFrame()->toHtml().toAscii().constData() << std::endl; emit finished(success, response); } diff --git a/src/main.cpp b/src/main.cpp index 72db042..f07e5c2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,9 +10,8 @@ int main(int argc, char **argv) { app.setOrganizationDomain("thoughtbot.com"); Server server; - if (server.start()) { - std::cout << "<< Started server" << std::endl; + if (server.start()) { return app.exec(); } else { std::cerr << "Couldn't start server" << std::endl;