capybara-webkit 0.9.0 → 0.10.0

data/ChangeLog

@@ -1,10 +1,40 @@
-2012-02-01 Joe Ferris <jferris@thoughtbot.com>
+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
+	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-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:
@@ -15,4 +45,4 @@
 	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
+	* CONTRIBUTING.md: add imagemagick dependency to contributing guide.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (0.8.0)
+    capybara-webkit (0.9.0)
       capybara (>= 1.0.0, < 1.2)
       json
 
@@ -18,11 +18,11 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.3)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
     diff-lcs (1.1.2)
     ffi (1.0.11)
-    json (1.6.3)
+    json (1.6.5)
     mime-types (1.17.2)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
@@ -40,9 +40,9 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rubyzip (0.9.5)
-    selenium-webdriver (2.15.0)
-      childprocess (>= 0.2.1)
+    rubyzip (0.9.6.1)
+    selenium-webdriver (2.19.0)
+      childprocess (>= 0.2.5)
       ffi (~> 1.0.9)
       multi_json (~> 1.0.4)
       rubyzip

data/NEWS.md

@@ -1,3 +1,9 @@
+New for 0.10.0:
+
+* current_url now more closely matches the behavior of Selenium
+* custom MAKE, QMAKE, and SPEC options can be set from the environment
+* BUG: Selected attribute is no longer removed when selecting/deselecting. Only the property is changed.
+
 New for 0.9.0:
 
 * Raise an error when an invisible element receives #click.

data/capybara-webkit.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 2.6.0")
+  # Sinatra is used by Capybara's TestApp
   s.add_development_dependency("sinatra")
   s.add_development_dependency("mini_magick")
   s.add_development_dependency("rake")

data/lib/capybara/driver/webkit.rb

@@ -27,7 +27,7 @@ class Capybara::Driver::Webkit
   end
 
   def current_url
-    browser.url
+    browser.current_url
   end
 
   def requested_url

data/lib/capybara/driver/webkit/browser.rb

@@ -70,6 +70,10 @@ class Capybara::Driver::Webkit
       command("RequestedUrl")
     end
 
+    def current_url
+      command("CurrentUrl")
+    end
+
     def frame_focus(frame_id_or_index=nil)
       if frame_id_or_index.is_a? Fixnum
         command("FrameFocus", "", frame_id_or_index.to_s)

data/lib/capybara/driver/webkit/node.rb

@@ -22,11 +22,7 @@ class Capybara::Driver::Webkit
 
     def value
       if multiple_select?
-        self.find(".//option").select do |option|
-          option["selected"] == "selected"
-        end.map do |option|
-          option.value
-        end
+        self.find(".//option").select(&:selected?).map(&:value)
       else
         invoke "value"
       end

data/lib/capybara/driver/webkit/version.rb

@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = '0.9.0'.freeze
+      VERSION = '0.10.0'.freeze
     end
   end
 end

data/lib/capybara_webkit_builder.rb

@@ -5,23 +5,32 @@ module CapybaraWebkitBuilder
   extend self
 
   def make_bin
-    make_binaries = ['gmake', 'make']
-    make_binaries.detect { |make| system("which #{make}") }
+    ENV['MAKE'] || 'make'
   end
 
-  def makefile
-    qmake_binaries = ['qmake', 'qmake-qt4']
-    qmake = qmake_binaries.detect { |qmake| system("which #{qmake}") }
+  def qmake_bin
+    ENV['QMAKE'] || 'qmake'
+  end
+
+  def spec
+    ENV['SPEC'] || os_spec
+  end
+
+  def os_spec
     case RbConfig::CONFIG['host_os']
     when /linux/
-      system("#{qmake} -spec linux-g++")
+      "linux-g++"
     when /freebsd/
-      system("#{qmake} -spec freebsd-g++")
+      "freebsd-g++"
     else
-      system("#{qmake} -spec macx-g++")
+      "macx-g++"
     end
   end
 
+  def makefile
+    system("#{qmake_bin} -spec #{spec}")
+  end
+
   def qmake
     system("#{make_bin} qmake")
   end

data/spec/capybara_webkit_builder_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'capybara_webkit_builder'
+
+describe CapybaraWebkitBuilder do
+  let(:builder) { CapybaraWebkitBuilder }
+
+  it "will use the env variable for #make_bin" do
+    with_env_vars("MAKE" => "fake_make") do
+      builder.make_bin.should == "fake_make"
+    end
+  end
+
+  it "will use the env variable for #qmake_bin" do
+    with_env_vars("QMAKE" => "fake_qmake") do
+      builder.qmake_bin.should == "fake_qmake"
+    end
+  end
+
+  it "will use the env variable for #os_spec" do
+    with_env_vars("SPEC" => "fake_os_spec") do
+      builder.spec.should == "fake_os_spec"
+    end
+  end
+
+  it "defaults the #make_bin" do
+    builder.make_bin.should == 'make'
+  end
+
+  it "defaults the #qmake_bin" do
+    builder.qmake_bin.should == 'qmake'
+  end
+
+  it "defaults #spec to the #os_specs" do
+    builder.spec.should == builder.os_spec
+  end
+end
+

data/spec/driver_spec.rb

@@ -132,6 +132,20 @@ describe Capybara::Driver::Webkit do
       subject.find("//input").first.click
       subject.find("//p").first.text.should == ""
     end
+
+    it "returns the current URL when changed by pushState after a redirect" do
+      subject.visit("/redirect-me")
+      port = subject.instance_variable_get("@rack_server").port
+      subject.execute_script("window.history.pushState({}, '', '/pushed-after-redirect')")
+      subject.current_url.should == "http://127.0.0.1:#{port}/pushed-after-redirect"
+    end
+
+    it "returns the current URL when changed by replaceState after a redirect" do
+      subject.visit("/redirect-me")
+      port = subject.instance_variable_get("@rack_server").port
+      subject.execute_script("window.history.replaceState({}, '', '/replaced-after-redirect')")
+      subject.current_url.should == "http://127.0.0.1:#{port}/replaced-after-redirect"
+    end
   end
 
   context "css app" do
@@ -197,6 +211,11 @@ describe Capybara::Driver::Webkit do
       subject.find("//*[contains(., 'hello')]").should be_empty
     end
 
+    it "has a location of 'about:blank' after reseting" do
+      subject.reset!
+      subject.current_url.should == "about:blank"
+    end
+
     it "raises an error for an invalid xpath query" do
       expect { subject.find("totally invalid salad") }.
         to raise_error(Capybara::Driver::Webkit::WebkitInvalidResponseError, /xpath/i)
@@ -223,6 +242,18 @@ describe Capybara::Driver::Webkit do
       subject.current_url.should == "http://127.0.0.1:#{port}/hello/world?success=true"
     end
 
+    it "returns the current URL when changed by pushState" do
+      port = subject.instance_variable_get("@rack_server").port
+      subject.execute_script("window.history.pushState({}, '', '/pushed')")
+      subject.current_url.should == "http://127.0.0.1:#{port}/pushed"
+    end
+
+    it "returns the current URL when changed by replaceState" do
+      port = subject.instance_variable_get("@rack_server").port
+      subject.execute_script("window.history.replaceState({}, '', '/replaced')")
+      subject.current_url.should == "http://127.0.0.1:#{port}/replaced"
+    end
+
     it "does not double-encode URLs" do
       subject.visit("/hello/world?success=%25true")
       subject.current_url.should =~ /success=\%25true/
@@ -380,6 +411,7 @@ describe Capybara::Driver::Webkit do
               </select>
               <textarea id="only-textarea">what a wonderful area for text</textarea>
               <input type="radio" id="only-radio" value="1"/>
+              <button type="reset">Reset Form</button>
             </form>
           </body></html>
         HTML
@@ -450,18 +482,45 @@ describe Capybara::Driver::Webkit do
     let(:banana_option)   { subject.find("//option[@id='topping-banana']").first }
     let(:cherry_option)   { subject.find("//option[@id='topping-cherry']").first }
     let(:toppings_select) { subject.find("//select[@name='toppings']").first }
+    let(:reset_button)    { subject.find("//button[@type='reset']").first }
 
-    it "selects an option" do
-      animal_select.value.should == "Capybara"
-      monkey_option.select_option
-      animal_select.value.should == "Monkey"
+    context "a select element's selection has been changed" do
+      before do
+        animal_select.value.should == "Capybara"
+        monkey_option.select_option
+      end
+
+      it "returns the new selection" do
+        animal_select.value.should == "Monkey"
+      end
+
+      it "does not modify the selected attribute of a new selection" do
+        monkey_option['selected'].should be_empty
+      end
+
+      it "returns the old value when a reset button is clicked" do
+        reset_button.click
+
+        animal_select.value.should == "Capybara"
+      end
     end
 
-    it "unselects an option in a multi-select" do
-      toppings_select.value.should include("Apple", "Banana", "Cherry")
+    context "a multi-select element's option has been unselected" do
+      before do
+        toppings_select.value.should include("Apple", "Banana", "Cherry")
 
-      apple_option.unselect_option
-      toppings_select.value.should_not include("Apple")
+        apple_option.unselect_option
+      end
+
+      it "does not return the deselected option" do
+        toppings_select.value.should_not include("Apple")
+      end
+
+      it "returns the deselected option when a reset button is clicked" do
+        reset_button.click
+
+        toppings_select.value.should include("Apple", "Banana", "Cherry")
+      end
     end
 
     it "reselects an option in a multi-select" do

data/spec/spec_helper.rb

@@ -23,3 +23,17 @@ $webkit_browser = Capybara::Driver::Webkit::Browser.new(:socket_class => TCPSock
 Capybara.register_driver :reusable_webkit do |app|
   Capybara::Driver::Webkit.new(app, :browser => $webkit_browser)
 end
+
+def with_env_vars(vars)
+  old_env_variables = {}
+  vars.each do |key, value|
+    old_env_variables[key] = ENV[key]
+    ENV[key] = value
+  end
+
+  yield
+
+  old_env_variables.each do |key, value|
+    ENV[key] = value
+  end
+end

data/src/CommandFactory.cpp

@@ -20,6 +20,7 @@
 #include "SetProxy.h"
 #include "ConsoleMessages.h"
 #include "RequestedUrl.h"
+#include "CurrentUrl.h"
 
 CommandFactory::CommandFactory(WebPage *page, QObject *parent) : QObject(parent) {
   m_page = page;

data/src/CurrentUrl.cpp

@@ -0,0 +1,71 @@
+#include "CurrentUrl.h"
+#include "WebPage.h"
+
+CurrentUrl::CurrentUrl(WebPage *page, QObject *parent) : Command(page, parent) {
+}
+
+/*
+ * This CurrentUrl command attempts to produce a current_url value consistent
+ * with that returned by the Selenium WebDriver Capybara driver.
+ *
+ * It does not currently return the correct value in the case of an iframe whose
+ * source URL results in a redirect because the loading of the iframe does not
+ * generate a history item. This is most likely a rare case and is consistent
+ * with the current behavior of the capybara-webkit driver.
+ *
+ * The following two values are *not* affected by Javascript pushState.
+ *
+ * QWebFrame->url()
+ * QWebHistoryItem.originalUrl()
+ *
+ * The following two values *are* affected by Javascript pushState.
+ *
+ * QWebFrame->requestedUrl()
+ * QWebHistoryItem.url()
+ *
+ * In the cases that we have access to both the QWebFrame values and the
+ * correct history item for that frame, we can compare the values and determine
+ * if a redirect occurred and if pushState was used. The table below describes
+ * the various combinations of URL values that are possible.
+ *
+ *   O -> originally requested URL
+ *   R -> URL after redirection
+ *   P -> URL set by pushState
+ *   * -> denotes the desired URL value from the frame
+ *
+ *               frame               history
+ * case          url   requestedUrl  url     originalUrl
+ * -----------------------------------------------------------------
+ * regular load    O     O*            O       O
+ *
+ * redirect w/o    R*    O             R       O
+ * pushState
+ *
+ * pushState       O     P*            P       O
+ * only
+ *
+ * redirect w/     R     P*            P       O
+ * pushState
+ *
+ * Based on the above information, we only need to check for the case of a
+ * redirect w/o pushState, in which case QWebFrame->url() will have the correct
+ * current_url value. In all other cases QWebFrame->requestedUrl() is correct.
+ */
+void CurrentUrl::start(QStringList &arguments) {
+  Q_UNUSED(arguments);
+
+  QUrl humanUrl = wasRedirectedAndNotModifiedByJavascript() ?
+    page()->currentFrame()->url() : page()->currentFrame()->requestedUrl();
+  QByteArray encodedBytes = humanUrl.toEncoded();
+  QString urlString = QString(encodedBytes);
+  emit finished(new Response(true, urlString));
+}
+
+bool CurrentUrl::wasRegularLoad() {
+  return page()->currentFrame()->url() == page()->currentFrame()->requestedUrl();
+}
+
+bool CurrentUrl::wasRedirectedAndNotModifiedByJavascript() {
+  return !wasRegularLoad() && page()->currentFrame()->url() == page()->history()->currentItem().url();
+}
+

data/src/CurrentUrl.h

@@ -0,0 +1,16 @@
+#include "Command.h"
+
+class WebPage;
+
+class CurrentUrl : public Command {
+  Q_OBJECT
+
+  public:
+    CurrentUrl(WebPage *page, QObject *parent = 0);
+    virtual void start(QStringList &arguments);
+
+  private:
+    bool wasRegularLoad();
+    bool wasRedirectedAndNotModifiedByJavascript();
+};
+

data/src/Reset.cpp

@@ -16,6 +16,13 @@ void Reset::start(QStringList &arguments) {
   page()->setUserAgent(NULL);
   page()->resetResponseHeaders();
   page()->resetConsoleMessages();
+  resetHistory();
   emit finished(new Response(true));
 }
 
+void Reset::resetHistory() {
+  // Clearing the history preserves the current history item, so set it to blank first.
+  page()->currentFrame()->setUrl(QUrl("about:blank"));
+  page()->history()->clear();
+}
+

data/src/Reset.h

@@ -8,5 +8,8 @@ class Reset : public Command {
   public:
     Reset(WebPage *page, QObject *parent = 0);
     virtual void start(QStringList &arguments);
+
+  private:
+    void resetHistory();
 };
 

data/src/capybara.js

@@ -196,13 +196,11 @@ Capybara = {
 
   selectOption: function(index) {
     this.nodes[index].selected = true;
-    this.nodes[index].setAttribute("selected", "selected");
     this.trigger(index, "change");
   },
 
   unselectOption: function(index) {
     this.nodes[index].selected = false;
-    this.nodes[index].removeAttribute("selected");
     this.trigger(index, "change");
   },
 

data/src/find_command.h

@@ -24,3 +24,4 @@ CHECK_COMMAND(Headers)
 CHECK_COMMAND(SetProxy)
 CHECK_COMMAND(ConsoleMessages)
 CHECK_COMMAND(RequestedUrl)
+CHECK_COMMAND(CurrentUrl)

data/src/webkit_server.pro

@@ -2,6 +2,7 @@ TEMPLATE = app
 TARGET = webkit_server
 DESTDIR = .
 HEADERS = \
+  CurrentUrl.h \
   RequestedUrl.h \
   ConsoleMessages.h \
   WebPage.h \
@@ -35,6 +36,7 @@ HEADERS = \
   SetProxy.h \
 
 SOURCES = \
+  CurrentUrl.cpp \
   RequestedUrl.cpp \
   ConsoleMessages.cpp \
   main.cpp \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2012-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2158944240 !ruby/object:Gem::Requirement
+  requirement: &2157249340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -28,10 +28,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2158944240
+  version_requirements: *2157249340
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2158943060 !ruby/object:Gem::Requirement
+  requirement: &2157247960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -39,10 +39,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158943060
+  version_requirements: *2157247960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158941580 !ruby/object:Gem::Requirement
+  requirement: &2157240260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -50,10 +50,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2158941580
+  version_requirements: *2157240260
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2158940900 !ruby/object:Gem::Requirement
+  requirement: &2157239520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -61,10 +61,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158940900
+  version_requirements: *2157239520
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &2158940440 !ruby/object:Gem::Requirement
+  requirement: &2157238560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -72,10 +72,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158940440
+  version_requirements: *2157238560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158939820 !ruby/object:Gem::Requirement
+  requirement: &2157237520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -83,10 +83,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158939820
+  version_requirements: *2157237520
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &2158939100 !ruby/object:Gem::Requirement
+  requirement: &2157236860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,7 +94,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2158939100
+  version_requirements: *2157236860
 description: 
 email: support@thoughtbot.com
 executables: []
@@ -131,6 +131,7 @@ files:
 - lib/capybara/webkit/matchers.rb
 - lib/capybara_webkit_builder.rb
 - spec/browser_spec.rb
+- spec/capybara_webkit_builder_spec.rb
 - spec/cookie_jar_spec.rb
 - spec/driver_rendering_spec.rb
 - spec/driver_spec.rb
@@ -151,6 +152,8 @@ files:
 - src/Connection.h
 - src/ConsoleMessages.cpp
 - src/ConsoleMessages.h
+- src/CurrentUrl.cpp
+- src/CurrentUrl.h
 - src/Evaluate.cpp
 - src/Evaluate.h
 - src/Execute.cpp
@@ -234,6 +237,7 @@ specification_version: 3
 summary: Headless Webkit driver for Capybara
 test_files:
 - spec/browser_spec.rb
+- spec/capybara_webkit_builder_spec.rb
 - spec/cookie_jar_spec.rb
 - spec/driver_rendering_spec.rb
 - spec/driver_spec.rb