Permalink
Browse files

Remove Url command

  • Loading branch information...
mhoran committed Nov 18, 2012
1 parent 73948fc commit 14a38088e7717b4aeb02708e9ca50790ef93f6a3
Showing with 1 addition and 32 deletions.
  1. +0 −4 lib/capybara/webkit/browser.rb
  2. +1 −1 spec/browser_spec.rb
  3. +0 −1 src/CommandFactory.cpp
  4. +0 −13 src/Url.cpp
  5. +0 −10 src/Url.h
  6. +0 −1 src/find_command.h
  7. +0 −2 src/webkit_server.pro
@@ -74,10 +74,6 @@ def response_headers
Hash[command("Headers").split("\n").map { |header| header.split(": ") }]
end
- def url
- command("Url")
- end
-
def requested_url
command("RequestedUrl")
end
View
@@ -231,7 +231,7 @@
end
it 'uses original URL' do
- browser.url.should == @url
+ browser.current_url.should == @url
end
it 'uses URLs changed by javascript' do
View
@@ -5,7 +5,6 @@
#include "Find.h"
#include "Reset.h"
#include "Node.h"
-#include "Url.h"
#include "Source.h"
#include "Evaluate.h"
#include "Execute.h"
View
@@ -1,13 +0,0 @@
-#include "Url.h"
-#include "WebPage.h"
-#include "WebPageManager.h"
-
-Url::Url(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
-}
-
-void Url::start() {
- QUrl humanUrl = page()->currentFrame()->url();
- QByteArray encodedBytes = humanUrl.toEncoded();
- emit finished(new Response(true, encodedBytes));
-}
-
View
@@ -1,10 +0,0 @@
-#include "SocketCommand.h"
-
-class Url : public SocketCommand {
- Q_OBJECT
-
- public:
- Url(WebPageManager *, QStringList &arguments, QObject *parent = 0);
- virtual void start();
-};
-
View
@@ -7,7 +7,6 @@ CHECK_COMMAND(Visit)
CHECK_COMMAND(Find)
CHECK_COMMAND(Reset)
CHECK_COMMAND(Node)
-CHECK_COMMAND(Url)
CHECK_COMMAND(Source)
CHECK_COMMAND(Evaluate)
CHECK_COMMAND(Execute)
View
@@ -26,7 +26,6 @@ HEADERS = \
Reset.h \
Node.h \
JavascriptInvocation.h \
- Url.h \
Source.h \
Evaluate.h \
Execute.h \
@@ -85,7 +84,6 @@ SOURCES = \
Reset.cpp \
Node.cpp \
JavascriptInvocation.cpp \
- Url.cpp \
Source.cpp \
Evaluate.cpp \
Execute.cpp \

0 comments on commit 14a3808

Please sign in to comment.