Remove debugging output.

This commit is contained in:
Tristan Dunn 2011-02-25 17:44:16 -05:00
parent e0c4f6f57d
commit 77ff0b4fc5
6 changed files with 2 additions and 22 deletions

View File

@ -20,7 +20,6 @@ class Capybara::Driver::Webkit
end end
def command(name, *args) def command(name, *args)
puts ">> Sending #{name}"
@socket.puts name @socket.puts name
args.each { |arg| @socket.puts arg } args.each { |arg| @socket.puts arg }
check check
@ -35,12 +34,10 @@ class Capybara::Driver::Webkit
end end
def connect def connect
puts ">> Connecting"
Capybara.timeout(5) do Capybara.timeout(5) do
attempt_connect attempt_connect
!@socket.nil? !@socket.nil?
end end
puts ">> Connected"
end end
def attempt_connect def attempt_connect
@ -50,7 +47,7 @@ class Capybara::Driver::Webkit
def check def check
result = @socket.gets.strip result = @socket.gets.strip
puts ">> #{result}"
unless result == 'ok' unless result == 'ok'
raise WebkitError, read_response raise WebkitError, read_response
end end

View File

@ -17,19 +17,16 @@ Connection::Connection(QTcpSocket *socket, WebPage *page, QObject *parent) :
} }
void Connection::checkNext() { void Connection::checkNext() {
std::cout << "<< Data ready to read" << std::endl;
while (m_socket->canReadLine()) { while (m_socket->canReadLine()) {
readNext(); readNext();
} }
} }
void Connection::readNext() { void Connection::readNext() {
std::cout << "<< Reading line" << std::endl;
char buffer[1024]; char buffer[1024];
qint64 lineLength = m_socket->readLine(buffer, 1024); qint64 lineLength = m_socket->readLine(buffer, 1024);
if (lineLength != -1) { if (lineLength != -1) {
buffer[lineLength - 1] = 0; buffer[lineLength - 1] = 0;
std::cout << "<< Got line: " << buffer << std::endl;
if (m_command) { if (m_command) {
m_command->receivedArgument(buffer); m_command->receivedArgument(buffer);
} else { } else {
@ -50,7 +47,6 @@ void Connection::readNext() {
Command *Connection::startCommand(const char *name) { Command *Connection::startCommand(const char *name) {
#include "find_command.h" #include "find_command.h"
std::cout << ">> Unknown command" << std::endl;
return NULL; return NULL;
} }

View File

@ -7,7 +7,6 @@ Find::Find(WebPage *page, QObject *parent) : Command(page, parent) {
} }
void Find::receivedArgument(const char *xpath) { void Find::receivedArgument(const char *xpath) {
std::cout << "<< Running query: " << xpath << std::endl;
QString javascript = QString("\ QString javascript = QString("\
(function () {\ (function () {\
if (!window.__capybara_index) {\ 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; QString response;
QVariant result = page()->mainFrame()->evaluateJavaScript(javascript); QVariant result = page()->mainFrame()->evaluateJavaScript(javascript);
@ -50,9 +45,6 @@ void Find::receivedArgument(const char *xpath) {
addComma = true; addComma = true;
} }
std::cout << "<< Got result:" << std::endl;
std::cout << response.toAscii().data() << std::endl;
emit finished(true, response); emit finished(true, response);
} else { } else {
response = "Invalid XPath expression"; response = "Invalid XPath expression";

View File

@ -16,7 +16,6 @@ bool Server::start() {
} }
void Server::handleConnection() { void Server::handleConnection() {
std::cout << "<< Got connection" << std::endl;
QTcpSocket *socket = m_tcp_server->nextPendingConnection(); QTcpSocket *socket = m_tcp_server->nextPendingConnection();
new Connection(socket, m_page, this); new Connection(socket, m_page, this);
} }

View File

@ -8,14 +8,11 @@ Visit::Visit(WebPage *page, QObject *parent) : Command(page, parent) {
} }
void Visit::receivedArgument(const char *url) { void Visit::receivedArgument(const char *url) {
std::cout << ">> Loading page: " << url << std::endl;
page()->mainFrame()->setUrl(QUrl(url)); page()->mainFrame()->setUrl(QUrl(url));
} }
void Visit::loadFinished(bool success) { void Visit::loadFinished(bool success) {
std::cout << ">> Page loaded" << std::endl;
QString response; QString response;
std::cout << page()->mainFrame()->toHtml().toAscii().constData() << std::endl;
emit finished(success, response); emit finished(success, response);
} }

View File

@ -10,9 +10,8 @@ int main(int argc, char **argv) {
app.setOrganizationDomain("thoughtbot.com"); app.setOrganizationDomain("thoughtbot.com");
Server server; Server server;
if (server.start()) {
std::cout << "<< Started server" << std::endl;
if (server.start()) {
return app.exec(); return app.exec();
} else { } else {
std::cerr << "Couldn't start server" << std::endl; std::cerr << "Couldn't start server" << std::endl;