capybara-webkit 0.12.1 → 0.13.0

data/src/find_command.h

@@ -1,6 +1,6 @@
 #define CHECK_COMMAND(expectedName) \
   if (strcmp(#expectedName, name) == 0) { \
-    return new expectedName(m_page, arguments, this); \
+    return new expectedName(m_manager, arguments, this); \
   }
 
 CHECK_COMMAND(Visit)
@@ -20,10 +20,25 @@ CHECK_COMMAND(Headers)
 CHECK_COMMAND(SetCookie)
 CHECK_COMMAND(ClearCookies)
 CHECK_COMMAND(GetCookies)
-CHECK_COMMAND(Headers)
 CHECK_COMMAND(SetProxy)
 CHECK_COMMAND(ConsoleMessages)
 CHECK_COMMAND(RequestedUrl)
 CHECK_COMMAND(CurrentUrl)
 CHECK_COMMAND(ResizeWindow)
 CHECK_COMMAND(IgnoreSslErrors)
+CHECK_COMMAND(SetSkipImageLoading)
+CHECK_COMMAND(WindowFocus)
+CHECK_COMMAND(GetWindowHandles)
+CHECK_COMMAND(GetWindowHandle)
+CHECK_COMMAND(Authenticate)
+CHECK_COMMAND(EnableLogging)
+CHECK_COMMAND(SetConfirmAction)
+CHECK_COMMAND(SetPromptAction)
+CHECK_COMMAND(SetPromptText)
+CHECK_COMMAND(ClearPromptText)
+CHECK_COMMAND(JavascriptAlertMessages)
+CHECK_COMMAND(JavascriptConfirmMessages)
+CHECK_COMMAND(JavascriptPromptMessages)
+CHECK_COMMAND(GetTimeout)
+CHECK_COMMAND(SetTimeout)
+

data/src/main.cpp

@@ -18,8 +18,6 @@ int main(int argc, char **argv) {
   app.setOrganizationName("thoughtbot, inc");
   app.setOrganizationDomain("thoughtbot.com");
 
-  QStringList args = app.arguments();
-
   Server server(0);
 
   if (server.start()) {

data/src/webkit_server.pro

@@ -2,6 +2,15 @@ TEMPLATE = app
 TARGET = webkit_server
 DESTDIR = .
 HEADERS = \
+  EnableLogging.h \
+  Authenticate.h \
+  SetConfirmAction.h \
+  SetPromptAction.h \
+  SetPromptText.h \
+  ClearPromptText.h \
+  JavascriptAlertMessages.h \
+  JavascriptConfirmMessages.h \
+  JavascriptPromptMessages.h \
   IgnoreSslErrors.h \
   ResizeWindow.h \
   CurrentUrl.h \
@@ -11,6 +20,7 @@ HEADERS = \
   Server.h \
   Connection.h \
   Command.h \
+  SocketCommand.h \
   Visit.h \
   Find.h \
   Reset.h \
@@ -38,8 +48,25 @@ HEADERS = \
   SetProxy.h \
   NullCommand.h \
   PageLoadingCommand.h \
+  SetSkipImageLoading.h \
+  WebPageManager.h \
+  WindowFocus.h \
+  GetWindowHandles.h \
+  GetWindowHandle.h \
+  GetTimeout.h \
+  SetTimeout.h \
+  TimeoutCommand.h \
 
 SOURCES = \
+  EnableLogging.cpp \
+  Authenticate.cpp \
+  SetConfirmAction.cpp \
+  SetPromptAction.cpp \
+  SetPromptText.cpp \
+  ClearPromptText.cpp \
+  JavascriptAlertMessages.cpp \
+  JavascriptConfirmMessages.cpp \
+  JavascriptPromptMessages.cpp \
   IgnoreSslErrors.cpp \
   ResizeWindow.cpp \
   CurrentUrl.cpp \
@@ -50,6 +77,7 @@ SOURCES = \
   Server.cpp \
   Connection.cpp \
   Command.cpp \
+  SocketCommand.cpp \
   Visit.cpp \
   Find.cpp \
   Reset.cpp \
@@ -77,6 +105,14 @@ SOURCES = \
   SetProxy.cpp \
   NullCommand.cpp \
   PageLoadingCommand.cpp \
+  SetTimeout.cpp \
+  GetTimeout.cpp \
+  SetSkipImageLoading.cpp \
+  WebPageManager.cpp \
+  WindowFocus.cpp \
+  GetWindowHandles.cpp \
+  GetWindowHandle.cpp \
+  TimeoutCommand.cpp \
 
 RESOURCES = webkit_server.qrc
 QT += network webkit

data/templates/Command.cpp

@@ -1,10 +1,8 @@
 #include "NAME.h"
 #include "WebPage.h"
 
-NAME::NAME(WebPage *page, QObject *parent) : Command(page, parent) {
+NAME::NAME(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
-void NAME::start(QStringList &arguments) {
-  Q_UNUSED(arguments);
+void NAME::start() {
 }
-

data/templates/Command.h

@@ -2,11 +2,11 @@
 
 class WebPage;
 
-class NAME : public Command {
+class NAME : public SocketCommand {
   Q_OBJECT
 
   public:
-    NAME(WebPage *page, QObject *parent = 0);
-    virtual void start(QStringList &arguments);
+    NAME(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
 };
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70292891001540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -28,10 +28,18 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70292891001540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70292891000820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -39,10 +47,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292891000820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70292891000220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -50,10 +63,15 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70292891000220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70292890999720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -61,10 +79,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292890999720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70292890999140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -72,10 +95,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292890999140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70292890989640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -83,10 +111,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292890989640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70292890988800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,7 +127,12 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70292890988800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 description: 
 email: support@thoughtbot.com
 executables: []
@@ -106,7 +144,7 @@ files:
 - .rspec
 - Appraisals
 - CONTRIBUTING.md
-- ChangeLog
+- GOALS
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -121,15 +159,16 @@ files:
 - gemfiles/1.1.gemfile
 - gemfiles/1.1.gemfile.lock
 - lib/capybara-webkit.rb
-- lib/capybara/driver/webkit.rb
-- lib/capybara/driver/webkit/browser.rb
-- lib/capybara/driver/webkit/connection.rb
-- lib/capybara/driver/webkit/cookie_jar.rb
-- lib/capybara/driver/webkit/node.rb
-- lib/capybara/driver/webkit/socket_debugger.rb
-- lib/capybara/driver/webkit/version.rb
 - lib/capybara/webkit.rb
+- lib/capybara/webkit/browser.rb
+- lib/capybara/webkit/connection.rb
+- lib/capybara/webkit/cookie_jar.rb
+- lib/capybara/webkit/driver.rb
+- lib/capybara/webkit/errors.rb
 - lib/capybara/webkit/matchers.rb
+- lib/capybara/webkit/node.rb
+- lib/capybara/webkit/socket_debugger.rb
+- lib/capybara/webkit/version.rb
 - lib/capybara_webkit_builder.rb
 - spec/browser_spec.rb
 - spec/capybara_webkit_builder_spec.rb
@@ -140,11 +179,17 @@ files:
 - spec/driver_spec.rb
 - spec/integration/driver_spec.rb
 - spec/integration/session_spec.rb
+- spec/selenium_compatibility_spec.rb
 - spec/self_signed_ssl_cert.rb
 - spec/spec_helper.rb
+- spec/support/app_runner.rb
+- src/Authenticate.cpp
+- src/Authenticate.h
 - src/Body.h
 - src/ClearCookies.cpp
 - src/ClearCookies.h
+- src/ClearPromptText.cpp
+- src/ClearPromptText.h
 - src/Command.cpp
 - src/Command.h
 - src/CommandFactory.cpp
@@ -157,6 +202,8 @@ files:
 - src/ConsoleMessages.h
 - src/CurrentUrl.cpp
 - src/CurrentUrl.h
+- src/EnableLogging.cpp
+- src/EnableLogging.h
 - src/Evaluate.cpp
 - src/Evaluate.h
 - src/Execute.cpp
@@ -167,14 +214,26 @@ files:
 - src/FrameFocus.h
 - src/GetCookies.cpp
 - src/GetCookies.h
+- src/GetTimeout.cpp
+- src/GetTimeout.h
+- src/GetWindowHandle.cpp
+- src/GetWindowHandle.h
+- src/GetWindowHandles.cpp
+- src/GetWindowHandles.h
 - src/Header.cpp
 - src/Header.h
 - src/Headers.cpp
 - src/Headers.h
 - src/IgnoreSslErrors.cpp
 - src/IgnoreSslErrors.h
+- src/JavascriptAlertMessages.cpp
+- src/JavascriptAlertMessages.h
+- src/JavascriptConfirmMessages.cpp
+- src/JavascriptConfirmMessages.h
 - src/JavascriptInvocation.cpp
 - src/JavascriptInvocation.h
+- src/JavascriptPromptMessages.cpp
+- src/JavascriptPromptMessages.h
 - src/NetworkAccessManager.cpp
 - src/NetworkAccessManager.h
 - src/NetworkCookieJar.cpp
@@ -197,14 +256,28 @@ files:
 - src/Response.h
 - src/Server.cpp
 - src/Server.h
+- src/SetConfirmAction.cpp
+- src/SetConfirmAction.h
 - src/SetCookie.cpp
 - src/SetCookie.h
+- src/SetPromptAction.cpp
+- src/SetPromptAction.h
+- src/SetPromptText.cpp
+- src/SetPromptText.h
 - src/SetProxy.cpp
 - src/SetProxy.h
+- src/SetSkipImageLoading.cpp
+- src/SetSkipImageLoading.h
+- src/SetTimeout.cpp
+- src/SetTimeout.h
+- src/SocketCommand.cpp
+- src/SocketCommand.h
 - src/Source.cpp
 - src/Source.h
 - src/Status.cpp
 - src/Status.h
+- src/TimeoutCommand.cpp
+- src/TimeoutCommand.h
 - src/UnsupportedContentHandler.cpp
 - src/UnsupportedContentHandler.h
 - src/Url.cpp
@@ -213,6 +286,10 @@ files:
 - src/Visit.h
 - src/WebPage.cpp
 - src/WebPage.h
+- src/WebPageManager.cpp
+- src/WebPageManager.h
+- src/WindowFocus.cpp
+- src/WindowFocus.h
 - src/body.cpp
 - src/capybara.js
 - src/find_command.h
@@ -236,7 +313,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3284702242753131256
+      hash: 1143768426363543239
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -245,10 +322,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3284702242753131256
+      hash: 1143768426363543239
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Headless Webkit driver for Capybara
@@ -262,5 +339,7 @@ test_files:
 - spec/driver_spec.rb
 - spec/integration/driver_spec.rb
 - spec/integration/session_spec.rb
+- spec/selenium_compatibility_spec.rb
 - spec/self_signed_ssl_cert.rb
 - spec/spec_helper.rb
+- spec/support/app_runner.rb

data/ChangeLog

@@ -1,70 +0,0 @@
-2012-03-09  Joe Ferris  <jferris@thoughtbot.com>
-  * node.rb, driver_spec.rb: Allow interaction with invisible elements
-
-2012-03-02  Joe Ferris  <jferris@thoughtbot.com>
-  * browser.rb: Use Timeout from stdlib since Capybara.timeout is being removed
-
-2012-03-02  Matthew Mongeau  <halogenandtoast@gmail.com>
-  * capybara_webkit_builder.rb:
-	set LANG to en_US.UTF-8 to prevent string encoding issues during install
-
-2012-03-02  Marc Schwieterman
-  * Rakefile: pro, find_command, and CommandFactory are more structured
-
-2012-02-27  Joe Ferris  <jferris@thoughtbot.com>
-  * README.md: Fixed broken wiki link
-
-2012-02-24  Joe Ferris  <jferris@thoughtbot.com>
-  * README.md: Update instructions for platform specific installation issues
-
-2012-02-17  Matthew Mongeau  <halogenandtoast@gmail.com>
-  * driver_spec.rb, capybara.js: Send proper keycode during keypress event
-
-2012-02-17  Matthew Mongeau  <halogenandtoast@gmail.com>
-  * ChangeLog, version.rb:
-	Bump to 0.10.0
-
-2012-02-17  Marc Schwieterman
-  * driver_spec.rb, Reset.cpp, Reset.h: Reset history when resetting session.
-	* driver_spec.rb, webkit.rb, browser.rb, CommandFactory.cpp, CurrentUrl.cpp,
-	CurrentUrl.h, find_command.h, webkit_server.pro:
-	current_url now conforms more closely to the behavior of Selenium.
-
-2012-02-17  Igor Zubkov  <igor.zubkov@gmail.com>
-  * spec_helper.rb: Fix typo.
-
-2012-02-17  Matthew Mongeau  <halogenandtoast@gmail.com>
-  * capybara_webkit_builder.rb, capybara_webkit_builder_spec.rb,
-	spec_helper.rb:
-	Allow for overriding MAKE, QMAKE, and SPEC options via the environment.
-
-2012-02-12  Jason Petersen  <jasonmp85@gmail.com>
-  * driver_spec.rb, node.rb, capybara.js:
-	Selected attribute is no longer removed when selecting/deselecting. Only the
-	property is changed.
-
-2012-02-09  Gabe Berke-Williams  <gabe@thoughtbot.com>
-  * capybara-webkit.gemspec: Note capybara-webkit's usage of Sinatra.
-
-2012-02-03  Matthew Mongeau  <halogenandtoast@gmail.com>
-  * version.rb:
-	Bump to 0.9.0
-
-2012-02-01  Joe Ferris  <jferris@thoughtbot.com>
-	* driver_spec.rb, Connection.cpp, Connection.h:
-	Try to detect when a command starts a page load and wait for it to finish.
-
-2012-01-27  Matthew Mongeau  <halogenandtoast@gmail.com>
-	* driver_spec.rb, capybara.js: Trigger mousedown and mouseup events.
-	* driver_spec.rb, capybara.js: Simulate browser events more closely.
-
-2012-01-19  Marco Antonio  <marcofognog@gmail.com>
-	* node.rb, driver_spec.rb:
-	Raise ElementNotDisplayedError also for #drag_to and #select_option when they are invisible.
-
-2012-01-18  Marco Antonio  <marcofognog@gmail.com>
-	* node.rb, driver_spec.rb:
-	Raise error when an invisible element receives #click so it resembles a browser more closely.
-
-2012-01-15  Marc Schwieterman
-	* CONTRIBUTING.md: add imagemagick dependency to contributing guide.