Remove the Source command
This commit is contained in:
parent
e983c63008
commit
7ace6dce54
|
@ -34,10 +34,6 @@ module Capybara::Webkit
|
||||||
command("Body")
|
command("Body")
|
||||||
end
|
end
|
||||||
|
|
||||||
def source
|
|
||||||
command("Source")
|
|
||||||
end
|
|
||||||
|
|
||||||
def status_code
|
def status_code
|
||||||
command("Status").to_i
|
command("Status").to_i
|
||||||
end
|
end
|
||||||
|
|
|
@ -33,10 +33,6 @@ module Capybara::Webkit
|
||||||
browser.find(query).map { |native| Node.new(self, native) }
|
browser.find(query).map { |native| Node.new(self, native) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def source
|
|
||||||
browser.source
|
|
||||||
end
|
|
||||||
|
|
||||||
def html
|
def html
|
||||||
browser.body
|
browser.body
|
||||||
end
|
end
|
||||||
|
|
|
@ -356,10 +356,6 @@ describe Capybara::Webkit::Driver do
|
||||||
driver.current_url.should =~ /hello#display_none/
|
driver.current_url.should =~ /hello#display_none/
|
||||||
end
|
end
|
||||||
|
|
||||||
it "returns the source code for the page" do
|
|
||||||
driver.source.should =~ %r{<html>.*greeting.*}m
|
|
||||||
end
|
|
||||||
|
|
||||||
it "evaluates Javascript and returns a string" do
|
it "evaluates Javascript and returns a string" do
|
||||||
result = driver.evaluate_script(%<document.getElementById('greeting').innerText>)
|
result = driver.evaluate_script(%<document.getElementById('greeting').innerText>)
|
||||||
result.should == "hello"
|
result.should == "hello"
|
||||||
|
@ -1683,18 +1679,6 @@ describe Capybara::Webkit::Driver do
|
||||||
it_behaves_like "a keyupdown app"
|
it_behaves_like "a keyupdown app"
|
||||||
end
|
end
|
||||||
|
|
||||||
context "null byte app" do
|
|
||||||
let(:driver) do
|
|
||||||
driver_for_html("Hello\0World")
|
|
||||||
end
|
|
||||||
|
|
||||||
before { visit("/") }
|
|
||||||
|
|
||||||
it "should include all the bytes in the source" do
|
|
||||||
driver.source.should == "Hello\0World"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context "javascript new window app" do
|
context "javascript new window app" do
|
||||||
let(:driver) do
|
let(:driver) do
|
||||||
driver_for_app do
|
driver_for_app do
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
#include "Find.h"
|
#include "Find.h"
|
||||||
#include "Reset.h"
|
#include "Reset.h"
|
||||||
#include "Node.h"
|
#include "Node.h"
|
||||||
#include "Source.h"
|
|
||||||
#include "Evaluate.h"
|
#include "Evaluate.h"
|
||||||
#include "Execute.h"
|
#include "Execute.h"
|
||||||
#include "FrameFocus.h"
|
#include "FrameFocus.h"
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
#include "Source.h"
|
|
||||||
#include "WebPage.h"
|
|
||||||
#include "WebPageManager.h"
|
|
||||||
#include "NetworkAccessManager.h"
|
|
||||||
|
|
||||||
Source::Source(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
|
|
||||||
}
|
|
||||||
|
|
||||||
void Source::start() {
|
|
||||||
NetworkAccessManager* accessManager = page()->networkAccessManager();
|
|
||||||
QNetworkRequest request(page()->currentFrame()->requestedUrl());
|
|
||||||
reply = accessManager->get(request);
|
|
||||||
|
|
||||||
connect(reply, SIGNAL(finished()), this, SLOT(sourceLoaded()));
|
|
||||||
}
|
|
||||||
|
|
||||||
void Source::sourceLoaded() {
|
|
||||||
emit finished(new Response(true, reply->readAll()));
|
|
||||||
}
|
|
||||||
|
|
18
src/Source.h
18
src/Source.h
|
@ -1,18 +0,0 @@
|
||||||
#include "SocketCommand.h"
|
|
||||||
|
|
||||||
class QNetworkReply;
|
|
||||||
|
|
||||||
class Source : public SocketCommand {
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
Source(WebPageManager *, QStringList &arguments, QObject *parent = 0);
|
|
||||||
virtual void start();
|
|
||||||
|
|
||||||
public slots:
|
|
||||||
void sourceLoaded();
|
|
||||||
|
|
||||||
private:
|
|
||||||
QNetworkReply *reply;
|
|
||||||
};
|
|
||||||
|
|
|
@ -7,7 +7,6 @@ CHECK_COMMAND(Visit)
|
||||||
CHECK_COMMAND(Find)
|
CHECK_COMMAND(Find)
|
||||||
CHECK_COMMAND(Reset)
|
CHECK_COMMAND(Reset)
|
||||||
CHECK_COMMAND(Node)
|
CHECK_COMMAND(Node)
|
||||||
CHECK_COMMAND(Source)
|
|
||||||
CHECK_COMMAND(Evaluate)
|
CHECK_COMMAND(Evaluate)
|
||||||
CHECK_COMMAND(Execute)
|
CHECK_COMMAND(Execute)
|
||||||
CHECK_COMMAND(FrameFocus)
|
CHECK_COMMAND(FrameFocus)
|
||||||
|
|
|
@ -25,7 +25,6 @@ HEADERS = \
|
||||||
Reset.h \
|
Reset.h \
|
||||||
Node.h \
|
Node.h \
|
||||||
JavascriptInvocation.h \
|
JavascriptInvocation.h \
|
||||||
Source.h \
|
|
||||||
Evaluate.h \
|
Evaluate.h \
|
||||||
Execute.h \
|
Execute.h \
|
||||||
FrameFocus.h \
|
FrameFocus.h \
|
||||||
|
@ -82,7 +81,6 @@ SOURCES = \
|
||||||
Reset.cpp \
|
Reset.cpp \
|
||||||
Node.cpp \
|
Node.cpp \
|
||||||
JavascriptInvocation.cpp \
|
JavascriptInvocation.cpp \
|
||||||
Source.cpp \
|
|
||||||
Evaluate.cpp \
|
Evaluate.cpp \
|
||||||
Execute.cpp \
|
Execute.cpp \
|
||||||
FrameFocus.cpp \
|
FrameFocus.cpp \
|
||||||
|
|
Loading…
Reference in New Issue