RubyGems - capybara-webkit - Versions diffs - 0.14.0 → 0.14.1 - Mend

capybara-webkit 0.14.0 → 0.14.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

data/Gemfile.lock +1 -1
data/NEWS.md +6 -0
data/README.md +1 -1
data/lib/capybara/webkit/connection.rb +2 -0
data/lib/capybara/webkit/version.rb +1 -1
data/spec/driver_rendering_spec.rb +24 -4
data/spec/driver_spec.rb +5 -30
data/src/Render.cpp +1 -2
data/src/WebPage.cpp +3 -2
data/src/WebPage.h +1 -1
metadata +16 -16

data/Gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (0.14.0)
+    capybara-webkit (0.14.1)
       capybara (~> 2.0, >= 2.0.2)
       json

data/NEWS.md CHANGED

@@ -1,3 +1,9 @@
+New for 0.14.1:
+* Rescue from Errno::ESRCH in the exit hook in case webkit_server has already ended.
+* Remove web font override for first-letter and first-line pseudo elements, which was causing issues for some users.
+* Restore viewport dimensions after rendering screenshots.
 New for 0.14.0:
 * URL blacklist support.

data/README.md CHANGED

@@ -192,4 +192,4 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
-capybara-webkit is Copyright (c) 2010-2012 thoughtbot, inc. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+capybara-webkit is Copyright (c) 2010-2013 thoughtbot, inc. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/lib/capybara/webkit/connection.rb CHANGED

@@ -62,6 +62,8 @@ module Capybara::Webkit
       else
         Process.kill("INT", @pid)
       end
+    rescue Errno::ESRCH
+      # This just means that the webkit_server process has already ended
     end
     def discover_port

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

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

data/spec/driver_rendering_spec.rb CHANGED

@@ -43,7 +43,7 @@ describe Capybara::Webkit::Driver, "rendering an image" do
     end
     it "height should be at least 10px" do
-      @image[:height].should >= 10
+      @image[:height].should be >= 10
     end
   end
@@ -55,7 +55,12 @@ describe Capybara::Webkit::Driver, "rendering an image" do
     end
     it "height should match the height given" do
-      @image[:height].should > 10
+      @image[:height].should == 400
+    end
+    it "should reset window dimensions to their default value" do
+      driver.evaluate_script('window.innerWidth').should == 1680
+      driver.evaluate_script('window.innerHeight').should == 1050
     end
   end
@@ -63,11 +68,26 @@ describe Capybara::Webkit::Driver, "rendering an image" do
     before { render(:width => 50, :height => 10) }
     it "width should be greater than the width given" do
-      @image[:width].should > 50
+      @image[:width].should be > 50
     end
     it "height should be greater than the height given" do
-      @image[:height].should > 10
+      @image[:height].should be > 10
+    end
+    it "should restore viewport dimensions after rendering" do
+      driver.evaluate_script('window.innerWidth').should == 1680
+      driver.evaluate_script('window.innerHeight').should == 1050
+    end
+  end
+  context "with a custom viewport size" do
+    before { driver.resize_window(800, 600) }
+    it "should restore viewport dimensions after rendering" do
+      render({})
+      driver.evaluate_script('window.innerWidth').should == 800
+      driver.evaluate_script('window.innerHeight').should == 600
     end
   end
 end

data/spec/driver_spec.rb CHANGED

@@ -1334,14 +1334,10 @@ describe Capybara::Webkit::Driver do
               p { font-family: "Verdana"; }
               p:before { font-family: "Verdana"; }
               p:after { font-family: "Verdana"; }
-              #first-line-div:first-line { font-family: "Verdana"; }
-              #first-letter-div:first-letter { font-family: "Verdana"; }
             </style>
           </head>
           <body>
             <p id="text">Hello</p>
-            <p id="first-line-div">Hello first line.</p>
-            <p id="first-letter-div">Hello first letter.</p>
           </body>
         </html>
       HTML
@@ -1349,43 +1345,22 @@ describe Capybara::Webkit::Driver do
     before { visit("/") }
-    it "ignores custom fonts" do
-      font_family = driver.evaluate_script(<<-SCRIPT)
+    let(:font_family) do
+      driver.evaluate_script(<<-SCRIPT)
         var element = document.getElementById("text");
         element.ownerDocument.defaultView.getComputedStyle(element, null).getPropertyValue("font-family");
       SCRIPT
-      font_family.should == "Arial"
-    end
-    it "ignores custom fonts before an element" do
-      font_family = driver.evaluate_script(<<-SCRIPT)
-        var element = document.getElementById("text");
-        element.ownerDocument.defaultView.getComputedStyle(element, 'before').getPropertyValue("font-family");
-      SCRIPT
-      font_family.should == "Arial"
     end
-    it "ignores custom fonts after an element" do
-      font_family = driver.evaluate_script(<<-SCRIPT)
-        var element = document.getElementById("text");
-        element.ownerDocument.defaultView.getComputedStyle(element, 'after').getPropertyValue("font-family");
-      SCRIPT
+    it "ignores custom fonts" do
       font_family.should == "Arial"
     end
-    it "ignores custom fonts applied to the first-line pseudo element" do
-      font_family = driver.evaluate_script(<<-SCRIPT)
-        var element = document.getElementById("first-line-div");
-        element.ownerDocument.defaultView.getComputedStyle(element, 'first-line').getPropertyValue("font-family");
-      SCRIPT
+    it "ignores custom fonts before an element" do
       font_family.should == "Arial"
     end
-    it "ignores custom fonts applied to the first-letter pseudo element" do
-      font_family = driver.evaluate_script(<<-SCRIPT)
-        var element = document.getElementById("first-letter-div");
-        element.ownerDocument.defaultView.getComputedStyle(element, 'first-letter').getPropertyValue("font-family");
-      SCRIPT
+    it "ignores custom fonts after an element" do
       font_family.should == "Arial"
     end
   end

data/src/Render.cpp CHANGED

@@ -11,9 +11,8 @@ void Render::start() {
   int height = arguments()[2].toInt();
   QSize size(width, height);
-  page()->setViewportSize(size);
-  bool result = page()->render( imagePath );
+  bool result = page()->render( imagePath, size );
   emitFinished(result);
 }

data/src/WebPage.cpp CHANGED

@@ -70,7 +70,7 @@ void WebPage::loadJavascript() {
 }
 void WebPage::setUserStylesheet() {
-  QString data = QString("*, :first-line, :first-letter, :before, :after { font-family: 'Arial' ! important; }").toUtf8().toBase64();
+  QString data = QString("*, :before, :after { font-family: 'Arial' ! important; }").toUtf8().toBase64();
   QUrl url = QUrl(QString("data:text/css;charset=utf-8;base64,") + data);
   settings()->setUserStyleSheetUrl(url);
 }
@@ -193,12 +193,13 @@ QString WebPage::failureString() {
     return message + m_errorPageMessage;
 }
-bool WebPage::render(const QString &fileName) {
+bool WebPage::render(const QString &fileName, const QSize &minimumSize) {
   QFileInfo fileInfo(fileName);
   QDir dir;
   dir.mkpath(fileInfo.absolutePath());
   QSize viewportSize = this->viewportSize();
+  this->setViewportSize(minimumSize);
   QSize pageSize = this->mainFrame()->contentsSize();
   if (pageSize.isEmpty()) {
     return false;

data/src/WebPage.h CHANGED

@@ -20,7 +20,7 @@ class WebPage : public QWebPage {
     void setPromptText(QString action);
     int getLastStatus();
     void setCustomNetworkAccessManager();
-    bool render(const QString &fileName);
+    bool render(const QString &fileName, const QSize &minimumSize);
     virtual bool extension (Extension extension, const ExtensionOption *option=0, ExtensionReturn *output=0);
     void setSkipImageLoading(bool skip);
     QVariantList consoleMessages();

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
   prerelease:
 platform: ruby
 authors:
@@ -14,11 +14,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &15525620 !ruby/object:Gem::Requirement
+  requirement: &9711180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -29,10 +29,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *15525620
+  version_requirements: *9711180
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &15519880 !ruby/object:Gem::Requirement
+  requirement: &7355880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -40,10 +40,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15519880
+  version_requirements: *7355880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15509400 !ruby/object:Gem::Requirement
+  requirement: &7240560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -51,10 +51,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *15509400
+  version_requirements: *7240560
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &15507080 !ruby/object:Gem::Requirement
+  requirement: &7239700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15507080
+  version_requirements: *7239700
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &15493300 !ruby/object:Gem::Requirement
+  requirement: &7238900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15493300
+  version_requirements: *7238900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15488580 !ruby/object:Gem::Requirement
+  requirement: &7238420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -84,10 +84,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15488580
+  version_requirements: *7238420
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &15475400 !ruby/object:Gem::Requirement
+  requirement: &7237740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -95,7 +95,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *15475400
+  version_requirements: *7237740
 description:
 email: support@thoughtbot.com
 executables: []