capybara-webkit 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 776f7b813939278baf6bbc2064faaa21237ce02b
-  data.tar.gz: f9b9712e3594049e0749ece691b185045908946c
+  metadata.gz: b3e42d4678023063942b9966f2ca08001363a3c2
+  data.tar.gz: 9d80735bf7b20fd0e64329985f28097ba0774d33
 SHA512:
-  metadata.gz: ad454ce63d42b586f1a0eab271a1ff801aab0cd78eead690a9a51ac9c3e85684bba58f9e7f76da1f169479d3ff48215f641c7fb41ab385693f49247a5d8c6fdb
-  data.tar.gz: a15ec0a814e50c402519dd6c0d46a1d8d3a5ac0d9eb98e6403e29ef9bd025a67a5211515b837b1a733320246d8e5fc68430e7b775ec2d815f8620de25ba7cc38
+  metadata.gz: f9d695309b9b677688cecec39a235a5c0556d9b0c72e12a89ff2578ec34bacdb03720fd1a624187383bdaaaaf17659ffad1e579a5245f57e4289d8d8ebbd93c7
+  data.tar.gz: 2e643305242c83c92843c1642f12d0a3a74331a02e84b2ba140a2a9482f4cf7053fe4670cc93399f4407ed0f3c645782f165265950ad5be1a1a73ba91035c325

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.4.1)
+    capybara-webkit (1.5.0)
       capybara (>= 2.3.0, < 2.5.0)
       json
 
@@ -18,13 +18,13 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.4.1)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.2.4)
-    ffi (1.9.3)
-    ffi (1.9.3-java)
-    ffi (1.9.3-x86-mingw32)
-    json (1.8.1)
+    ffi (1.9.8)
+    ffi (1.9.8-java)
+    ffi (1.9.8-x86-mingw32)
+    json (1.8.2)
     launchy (2.4.2)
       addressable (~> 2.3)
     launchy (2.4.2-java)
@@ -33,14 +33,14 @@ GEM
     mime-types (2.4.3)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
-    mini_portile (0.6.1)
-    multi_json (1.8.4)
-    nokogiri (1.6.4)
+    mini_portile (0.6.2)
+    multi_json (1.11.0)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     rack (1.5.2)
     rack-protection (1.3.2)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rake (0.9.2)
     rspec (2.14.1)
@@ -51,12 +51,12 @@ GEM
     rspec-expectations (2.14.1)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
-    rubyzip (1.1.0)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
+    rubyzip (1.1.7)
+    selenium-webdriver (2.45.0)
+      childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
+      websocket (~> 1.0)
     sinatra (1.3.5)
       rack (~> 1.4)
       rack-protection (~> 1.3)
@@ -65,7 +65,7 @@ GEM
       ffi
     subexec (0.0.4)
     tilt (1.3.3)
-    websocket (1.0.7)
+    websocket (1.2.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 thoughtbot, inc.
+Copyright (c) 2010-2015 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,3 +1,8 @@
+New for 1.5.0:
+
+* Fixes for OpenBSD
+* Disable web page and object memory cache
+
 New for 1.4.1:
 
 * Do not consider data URIs unknown.

data/README.md

@@ -142,20 +142,45 @@ page.driver.allow_url 'example.com/*.js'
 Contributing
 ------------
 
-See the CONTRIBUTING document.
+See the [CONTRIBUTING] document.
+Thank you, [contributors]!
+
+[CONTRIBUTING]: CONTRIBUTING.md
+[contributors]: https://github.com/thoughtbot/capybara-webkit/graphs/contributors
+
+Need Help?
+----------
+
+We offer 1-on-1 coaching. We can help you install Qt, set up Capybara, get
+started writing integration tests, and track down slow or erratic tests. [Get in
+touch].
+
+[Get in touch]: http://coaching.thoughtbot.com/rails/?utm_source=github
+
+License
+-------
+
+capybara-webkit is Copyright (c) 2010-2015 thoughtbot, inc. It is free software,
+and may be redistributed under the terms specified in the [LICENSE] file.
+
+[LICENSE]: /LICENSE
 
 About
 -----
 
-The capybara WebKit driver is maintained by Joe Ferris and Matt Horan. It was written by [thoughtbot, inc](http://thoughtbot.com/community) with the help of numerous [contributions from the open source community](https://github.com/thoughtbot/capybara-webkit/contributors).
+The capybara WebKit driver is maintained by Joe Ferris and Matt Horan.
 
-Code for rendering the current webpage to a PNG is borrowed from Phantom.js' implementation.
+Code for rendering the current webpage to a PNG is borrowed from Phantom.js'
+implementation.
 
-![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
+![thoughtbot](https://thoughtbot.com/logo.png)
 
+capybara-webkit is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
-License
--------
+We love open source software!
+See [our other projects][community]
+or [hire us][hire] to help build your product.
 
-capybara-webkit is Copyright (c) 2010-2014 thoughtbot, inc. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+[community]: https://thoughtbot.com/community?utm_source=github
+[hire]: https://thoughtbot.com/hire-us?utm_source=github

data/gemfiles/2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.4.1)
+    capybara-webkit (1.5.0)
       capybara (>= 2.3.0, < 2.5.0)
       json
 
@@ -18,18 +18,18 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.3)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.2.5)
-    ffi (1.9.3)
-    json (1.8.1)
+    ffi (1.9.8)
+    json (1.8.2)
     launchy (2.4.2)
       addressable (~> 2.3)
     mime-types (2.3)
     mini_magick (3.7.0)
       subexec (~> 0.2.1)
     mini_portile (0.6.0)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     rack (1.5.2)
@@ -46,19 +46,19 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    rubyzip (1.1.4)
-    selenium-webdriver (2.42.0)
-      childprocess (>= 0.5.0)
+    rubyzip (1.1.7)
+    selenium-webdriver (2.45.0)
+      childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
+      websocket (~> 1.0)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     subexec (0.2.3)
     tilt (1.4.1)
-    websocket (1.0.7)
+    websocket (1.2.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 

data/gemfiles/2.4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.4.1)
+    capybara-webkit (1.5.0)
       capybara (>= 2.3.0, < 2.5.0)
       json
 
@@ -18,18 +18,18 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.3)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.2.5)
-    ffi (1.9.3)
-    json (1.8.1)
+    ffi (1.9.8)
+    json (1.8.2)
     launchy (2.4.2)
       addressable (~> 2.3)
     mime-types (2.4.3)
     mini_magick (3.7.0)
       subexec (~> 0.2.1)
     mini_portile (0.6.0)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     rack (1.5.2)
@@ -46,19 +46,19 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    rubyzip (1.1.6)
-    selenium-webdriver (2.42.0)
-      childprocess (>= 0.5.0)
+    rubyzip (1.1.7)
+    selenium-webdriver (2.45.0)
+      childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
+      websocket (~> 1.0)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     subexec (0.2.3)
     tilt (1.4.1)
-    websocket (1.0.7)
+    websocket (1.2.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 

data/lib/capybara/webkit/version.rb

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

data/lib/capybara_webkit_builder.rb

@@ -16,32 +16,17 @@ module CapybaraWebkitBuilder
     ENV['QMAKE'] || default_qmake_binary
   end
 
-  def spec
-    ENV['SPEC'] || os_spec
-  end
-
   def default_qmake_binary
     case RbConfig::CONFIG['host_os']
     when /freebsd/
       "qmake-qt4"
+    when /openbsd/
+      "qmake-qt5"
     else
       "qmake"
     end
   end
 
-  def os_spec
-    case RbConfig::CONFIG['host_os']
-    when /linux/
-      "linux-g++"
-    when /freebsd/
-      "freebsd-g++"
-    when /mingw32/
-      "win32-g++"
-    else
-      "macx-g++"
-    end
-  end
-
   def sh(command)
     system(command)
     success = $?.exitstatus == SUCCESS_STATUS
@@ -56,7 +41,7 @@ module CapybaraWebkitBuilder
   def makefile(*configs)
     configs += default_configs
     configs = configs.map { |config| config.shellescape}.join(" ")
-    sh("#{qmake_bin} -spec #{spec} #{configs}")
+    sh("#{qmake_bin} #{configs}")
   end
 
   def qmake

data/spec/capybara_webkit_builder_spec.rb

@@ -16,12 +16,6 @@ describe CapybaraWebkitBuilder do
     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
     with_env_vars("MAKE_BIN" => nil) do
       builder.make_bin.should == 'make'
@@ -33,11 +27,5 @@ describe CapybaraWebkitBuilder do
       builder.qmake_bin.should == 'qmake'
     end
   end
-
-  it "defaults #spec to the #os_specs" do
-    with_env_vars("SPEC" => nil) do
-      builder.spec.should == builder.os_spec
-    end
-  end
 end
 

data/spec/driver_spec.rb

@@ -2070,6 +2070,24 @@ describe Capybara::Webkit::Driver do
     end
   end
 
+  context "caching app" do
+    let(:driver) do
+      etag_value = SecureRandom.hex
+
+      driver_for_app do
+        get '/' do
+          etag etag_value
+        end
+      end
+    end
+
+    it "does not cache responses" do
+      visit '/'
+      visit '/'
+      expect(driver.status_code).to eq(200)
+    end
+  end
+
   context "offline application cache" do
     let(:driver) do
       @visited = []
@@ -2550,7 +2568,7 @@ CACHE MANIFEST
     end
   end
 
-  describe "url blacklisting" do
+  describe "url blacklisting", skip_if_offline: true do
     let(:driver) do
       driver_for_app do
         get "/" do
@@ -2633,7 +2651,7 @@ CACHE MANIFEST
     end
   end
 
-  describe "url whitelisting" do
+  describe "url whitelisting", skip_if_offline: true do
     it_behaves_like "output writer" do
       let(:driver) do
         driver_for_html(<<-HTML, browser)

data/spec/spec_helper.rb

@@ -23,12 +23,24 @@ Capybara.register_driver :reusable_webkit do |app|
   Capybara::Webkit::Driver.new(app, :browser => $webkit_browser)
 end
 
+def has_internet?
+  require 'resolv'
+  dns_resolver = Resolv::DNS.new
+  begin
+    dns_resolver.getaddress("example.com")
+    true
+  rescue Resolv::ResolvError => e
+    false
+  end
+end
+
 RSpec.configure do |c|
   Capybara::SpecHelper.configure(c)
 
   c.filter_run_excluding :skip_on_windows => !(RbConfig::CONFIG['host_os'] =~ /mingw32/).nil?
   c.filter_run_excluding :skip_on_jruby => !defined?(::JRUBY_VERSION).nil?
   c.filter_run_excluding :selenium_compatibility => (Capybara::VERSION =~ /^2\.4\./).nil?
+  c.filter_run_excluding :skip_if_offline => !has_internet?
 
   # We can't support outerWidth and outerHeight without a visible window.
   # We focus the next window instead of failing when closing windows.

data/src/StdinNotifier.cpp

@@ -1,6 +1,8 @@
 #include "StdinNotifier.h"
 
 #include <QTcpServer>
+#include <QSocketNotifier>
+#include <iostream>
 
 StdinNotifier::StdinNotifier(QObject *parent) : QObject(parent) {
   m_notifier = new QSocketNotifier(fileno(stdin), QSocketNotifier::Read, this);

data/src/WebPage.h

@@ -1,5 +1,6 @@
 #ifndef _WEBPAGE_H
 #define _WEBPAGE_H
+#include <QtGlobal>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtWebKitWidgets>
 #else

data/src/WebPageManager.cpp

@@ -29,6 +29,10 @@ WebPageManager::WebPageManager(QObject *parent) : QObject(parent) {
   m_networkAccessManager =
     new NetworkAccessManager(m_blacklistedRequestHandler, this);
   m_networkAccessManager->setCookieJar(m_cookieJar);
+
+  QWebSettings::setMaximumPagesInCache(0);
+  QWebSettings::setObjectCacheCapacities(0, 0, 0);
+
   createPage()->setFocus();
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - thoughtbot
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara