capybara-webkit 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caa991e4ca62a2ae01175d74269b04c85109d019
-  data.tar.gz: 9715e5c18998f8d6b33fa73de57d01e64c59413b
+  metadata.gz: b148922bff655cfceedb08dcae431c0bed0cad26
+  data.tar.gz: b3dc9996d98dd05e943092e4bd20be8303c4cc64
 SHA512:
-  metadata.gz: 2bdd5799550be5189825638154cd8f49e79bb5428de741369a6889cfb01f6e4591562efd162cf02d2232757075d3736b595826daa4ca78ffefed96074e8534cc
-  data.tar.gz: 86aef4be069c961c3fd8a9b5f0cdcb93eb7f935c90741b2f4a80542aefdba23ff62a2c5540692abb3ea286b39c1d46eb3a79be5247288884f3784d580b348757
+  metadata.gz: b706abb8a485e9903dae782e60197643a7cdba29a96eed8fcc16550973f1144a176cf2a285e5cd9a81f6c4134bafad2a6a868f6e13af0f7adcdf3d1a36875652
+  data.tar.gz: 960b0b5dbe21488c2ee3163c9fe88715dca6e0a540b16e82d660762f1d7b4b9ba18413213a2bddad956e0b0e87cf948c10660ad339dab5d442875d310d0f10c8

data/.travis.yml

@@ -12,9 +12,6 @@ env:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 matrix:
   include:
-    - rvm: 1.9.3
-      gemfile: gemfiles/2.2.gemfile
-      env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
     - rvm: 1.9.3
       gemfile: gemfiles/2.3.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
@@ -22,7 +19,6 @@ matrix:
       gemfile: gemfiles/2.4.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
 gemfile:
-  - gemfiles/2.2.gemfile
   - gemfiles/2.3.gemfile
   - gemfiles/2.4.gemfile
 before_install:

data/Appraisals

@@ -1,11 +1,3 @@
-appraise "2.1" do
-  gem "capybara", "~> 2.1.0"
-end
-
-appraise "2.2" do
-  gem "capybara", "~> 2.2.0"
-end
-
 appraise "2.3" do
   gem "capybara", "~> 2.3.0"
 end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.3.1)
-      capybara (>= 2.0.2, < 2.5.0)
+    capybara-webkit (1.4.0)
+      capybara (>= 2.3.0, < 2.5.0)
       json
 
 GEM
@@ -33,10 +33,10 @@ GEM
     mime-types (2.4.3)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
-    mini_portile (0.6.0)
+    mini_portile (0.6.1)
     multi_json (1.8.4)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.4)
+      mini_portile (~> 0.6.0)
     rack (1.5.2)
     rack-protection (1.3.2)
       rack

data/NEWS.md

@@ -1,3 +1,10 @@
+New for 1.4.0:
+
+* Fix returning invisible text on a hidden page
+* Expose INCLUDEPATH and LIBS qmake variables
+* Drop support for older Capybara versions
+* Introduce allowed, blocked URL filters
+
 New for 1.3.1:
 
 * Inherit from Capybara::Driver::Base for Capybara 2.4.4 compatibility.

data/capybara-webkit.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.0"
 
-  s.add_runtime_dependency("capybara", ">= 2.0.2", "< 2.5.0")
+  s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.5.0")
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 2.14.0")

data/extconf.rb

@@ -1,2 +1,20 @@
+require "mkmf"
+
+$CPPFLAGS = ""
+
+dir_config("gl")
+dir_config("zlib")
+
+include_path = $CPPFLAGS.gsub("-I", "").strip
+libs = $LIBPATH.map { |path| "-L#{path}"}.join(" ").strip
+
+unless include_path.empty?
+  ENV["CAPYBARA_WEBKIT_INCLUDE_PATH"] = include_path
+end
+
+unless libs.empty?
+  ENV["CAPYBARA_WEBKIT_LIBS"] = libs
+end
+
 require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "capybara_webkit_builder")
 CapybaraWebkitBuilder.build_all

data/gemfiles/2.3.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.3.1)
-      capybara (>= 2.0.2, < 2.5.0)
+    capybara-webkit (1.4.0)
+      capybara (>= 2.3.0, < 2.5.0)
       json
 
 GEM

data/gemfiles/2.4.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.3.1)
-      capybara (>= 2.0.2, < 2.5.0)
+    capybara-webkit (1.4.0)
+      capybara (>= 2.3.0, < 2.5.0)
       json
 
 GEM

data/lib/capybara/webkit/browser.rb

@@ -195,6 +195,8 @@ module Capybara::Webkit
     end
 
     def url_blacklist=(black_list)
+      warn '[DEPRECATION] Capybara::Webkit::Browser#url_blacklist= ' \
+        'is deprecated. Please use page.driver.block_url instead.'
       command("SetUrlBlacklist", *Array(black_list))
     end
 
@@ -263,6 +265,18 @@ module Capybara::Webkit
       command("GoForward")
     end
 
+    def allow_url(url)
+      command("AllowUrl", url)
+    end
+
+    def block_url(url)
+      command("BlockUrl", url)
+    end
+
+    def block_unknown_urls
+      command("SetUnknownUrlMode", "block")
+    end
+
     private
 
     def check

data/lib/capybara/webkit/driver.rb

@@ -21,6 +21,18 @@ module Capybara::Webkit
       browser.enable_logging
     end
 
+    def allow_url(url)
+      browser.allow_url(url)
+    end
+
+    def block_url(url)
+      browser.block_url(url)
+    end
+
+    def block_unknown_urls
+      browser.block_unknown_urls
+    end
+
     def current_url
       browser.current_url
     end

data/lib/capybara/webkit/version.rb

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

data/lib/capybara_webkit_builder.rb

@@ -1,5 +1,6 @@
 require "fileutils"
 require "rbconfig"
+require "shellwords"
 
 module CapybaraWebkitBuilder
   extend self
@@ -52,8 +53,10 @@ module CapybaraWebkitBuilder
     success
   end
 
-  def makefile(config = '')
-    sh("#{qmake_bin} -spec #{spec} #{config}")
+  def makefile(*configs)
+    configs += default_configs
+    configs = configs.map { |config| config.shellescape}.join(" ")
+    sh("#{qmake_bin} -spec #{spec} #{configs}")
   end
 
   def qmake
@@ -82,6 +85,19 @@ module CapybaraWebkitBuilder
     end
   end
 
+  def default_configs
+    configs = []
+    libpath = ENV["CAPYBARA_WEBKIT_LIBS"]
+    cppflags = ENV["CAPYBARA_WEBKIT_INCLUDE_PATH"]
+    if libpath
+      configs << "LIBS += #{libpath}"
+    end
+    if cppflags
+      configs << "INCLUDEPATH += #{cppflags}"
+    end
+    configs
+  end
+
   def build_all
     makefile &&
     qmake &&

data/spec/driver_spec.rb

@@ -561,6 +561,24 @@ describe Capybara::Webkit::Driver do
     end
   end
 
+  context "hidden text app" do
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html>
+          <body>
+            <h1 style="display: none">Hello</h1>
+          </body>
+        </html>
+      HTML
+    end
+
+    before { visit("/") }
+
+    it "has no visible text" do
+      driver.find_xpath("/html").first.text.should be_empty
+    end
+  end
+
   context "console messages app" do
     let(:driver) do
       driver_for_html(<<-HTML)
@@ -2568,10 +2586,10 @@ CACHE MANIFEST
     end
 
     before do
-      driver.browser.url_blacklist = ["http://example.org/path/to/file",
-                                      "http://example.*/foo/*",
-                                      "http://example.com",
-                                      "#{AppRunner.app_host}/script"]
+      driver.block_url "http://example.org/path/to/file"
+      driver.block_url "http://example.*/foo/*"
+      driver.block_url "http://example.com"
+      driver.block_url "#{AppRunner.app_host}/script"
     end
 
     it "should not fetch urls blocked by host" do
@@ -2615,6 +2633,69 @@ CACHE MANIFEST
     end
   end
 
+  describe "url whitelisting" do
+    it_behaves_like "output writer" do
+      let(:driver) do
+        driver_for_html(<<-HTML, browser)
+          <<-HTML
+            <html>
+              <body>
+                <iframe src="http://example.com/path" id="frame"></iframe>
+                <iframe src="http://www.example.com" id="frame2"></iframe>
+              </body>
+            </html>
+        HTML
+      end
+
+      it "prints a warning for remote requests by default" do
+        visit("/")
+
+        expect(stderr).to include("http://example.com/path")
+        expect(stderr).not_to include(driver.current_url)
+      end
+
+      it "can allow specific hosts" do
+        driver.allow_url("example.com")
+        driver.allow_url("www.example.com")
+        visit("/")
+
+        expect(stderr).not_to include("http://example.com/path")
+        expect(stderr).not_to include(driver.current_url)
+        driver.within_frame("frame") do
+          expect(driver.find("//body").first.text).not_to be_empty
+        end
+      end
+
+      it "can block unknown hosts" do
+        driver.block_unknown_urls
+        visit("/")
+
+        expect(stderr).not_to include("http://example.com/path")
+        expect(stderr).not_to include(driver.current_url)
+        driver.within_frame("frame") do
+          expect(driver.find("//body").first.text).to be_empty
+        end
+      end
+
+      it "can allow urls with wildcards" do
+        driver.allow_url("*/path")
+        visit("/")
+
+        expect(stderr).to include("www.example.com")
+        expect(stderr).not_to include("example.com/path")
+        expect(stderr).not_to include(driver.current_url)
+      end
+
+      it "whitelists localhost on reset" do
+        driver.reset!
+
+        visit("/")
+
+        expect(stderr).not_to include(driver.current_url)
+      end
+    end
+  end
+
   describe "timeout for long requests" do
     let(:driver) do
       driver_for_app do
@@ -2688,33 +2769,23 @@ CACHE MANIFEST
   end
 
   describe "logger app" do
-    it "logs nothing before turning on the logger" do
-      visit("/")
-      @write.close
-      log.should_not include logging_message
-    end
-
-    it "logs its commands after turning on the logger" do
-      driver.enable_logging
-      visit("/")
-      @write.close
-      log.should include logging_message
-    end
-
-    before do
-      @read, @write = IO.pipe
-    end
+    it_behaves_like "output writer" do
+      let(:driver) do
+        driver_for_html("<html><body>Hello</body></html>", browser)
+      end
 
-    let(:logging_message) { 'Wrote response true' }
+      it "logs nothing before turning on the logger" do
+        visit("/")
+        stderr.should_not include logging_message
+      end
 
-    let(:driver) do
-      connection = Capybara::Webkit::Connection.new(:stderr => @write)
-      browser = Capybara::Webkit::Browser.new(connection)
-      Capybara::Webkit::Driver.new(AppRunner.app, :browser => browser)
-    end
+      it "logs its commands after turning on the logger" do
+        driver.enable_logging
+        visit("/")
+        stderr.should include logging_message
+      end
 
-    def log
-      @read.read
+      let(:logging_message) { 'Wrote response true' }
     end
   end
 

data/spec/support/app_runner.rb

@@ -31,9 +31,9 @@ module AppRunner
     build_driver
   end
 
-  def driver_for_html(html)
+  def driver_for_html(html, *driver_args)
     run_application_for_html html
-    build_driver
+    build_driver(*driver_args)
   end
 
   def session_for_app(&body)
@@ -50,8 +50,8 @@ module AppRunner
 
   private
 
-  def build_driver
-    Capybara::Webkit::Driver.new(AppRunner.app, :browser => $webkit_browser)
+  def build_driver(browser = $webkit_browser)
+    Capybara::Webkit::Driver.new(AppRunner.app, :browser => browser)
   end
 
   def self.included(example_group)

data/spec/support/output_writer.rb

@@ -0,0 +1,15 @@
+shared_examples_for "output writer" do
+  before do
+    @read, @write = IO.pipe
+  end
+
+  let(:browser) do
+    connection = Capybara::Webkit::Connection.new(:stderr => @write)
+    Capybara::Webkit::Browser.new(connection)
+  end
+
+  let(:stderr) do
+    @write.close
+    @read.read
+  end
+end

data/src/AllowUrl.cpp

@@ -0,0 +1,16 @@
+#include "AllowUrl.h"
+#include "SocketCommand.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+
+AllowUrl::AllowUrl(
+  WebPageManager *manager,
+  QStringList &arguments,
+  QObject *parent
+) : SocketCommand(manager, arguments, parent) {
+}
+
+void AllowUrl::start() {
+  manager()->allowUrl(arguments()[0]);
+  finish(true);
+}