wraith 2.5.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afbb6584d3a5e210ab14042805e24ba4e5d5fdd3
-  data.tar.gz: d61a1f542d94c1b5e61be170b682bd3102e5824f
+  metadata.gz: cc02a9bdf3aceb57ec1790b0670454646ac9adbf
+  data.tar.gz: 4d9267de7cb2689b6bb01129fc4f25dbfd76c89e
 SHA512:
-  metadata.gz: 094cb5cf2dcd038666eb604adde015a6426a45a2474b6b8eeef2618903ed2ca95cb3e5a538bd9c1324c658cac03b8806ab7ef2d5775d97bbc0781961c96a86cd
-  data.tar.gz: 247daece8faca88bcfca99be0d7968a9bba5609e2f839e30d1208c4120fec57a18932ed51940f7a99f9d9f9755e42fef25107c9d4f18f1b52d074bab63a6c79c
+  metadata.gz: 883098ff0a08426b8532e29491580ad14ef854777acea133a3da71f25b442e92b65688718bea5e18c5d2db5caa6e4151706c1b29d3cf41eee4c55be0ed905cc1
+  data.tar.gz: 4899954af25ca0b3645dada0519c09c22a97547a6283fe674f67cf580438bf726f248c225b7cc0b5b8013336b4e6070ffc50f2cba8df5177a5b501dd3ccc61e4

data/.travis.yml

@@ -7,6 +7,7 @@ notifications:
   email:
     recipients:
     - david.blooman@bbc.co.uk
+    - chris.ashton@bbc.co.uk
     on_failure: change
     on_success: never
   slack:

data/README.md

@@ -1,15 +1,18 @@
-# Wraith
-
-[![Build Status](https://secure.travis-ci.org/BBC-News/wraith.png?branch=master)](http://travis-ci.org/BBC-News/wraith)
-[![Gem Version](https://badge.fury.io/rb/wraith.svg)](http://badge.fury.io/rb/wraith)
-[![Code Climate](https://codeclimate.com/github/BBC-News/wraith.png)](https://codeclimate.com/github/BBC-News/wraith)
-[![Join the chat at https://gitter.im/BBC-News/wraith](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/BBC-News/wraith?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
- * Website: http://responsivenews.co.uk
- * Source: http://github.com/bbc-news/wraith
-
-Wraith is a screenshot comparison tool, created by developers at BBC News.
-
+<p align="center">
+  <img src="https://raw.githubusercontent.com/BBC-News/wraith/master/wraith-logo.png">
+</p>
+
+<p align="center">
+  <a href="http://travis-ci.org/BBC-News/wraith" target="_blank"><img src="https://secure.travis-ci.org/BBC-News/wraith.png?branch=master"></a>
+  <a href="https://rubygems.org/gems/wraith" target="_blank"><img src="https://img.shields.io/gem/v/wraith.svg"></a>
+  <a href="https://codeclimate.com/github/BBC-News/wraith" target="_blank"><img src="https://codeclimate.com/github/BBC-News/wraith.png"></a>
+</p>
+
+<p align="center">
+  Wraith is a screenshot comparison tool, created by developers at BBC News.
+  <br>
+  <a href="http://responsivenews.co.uk" target="_blank">Website</a> • <a href="http://github.com/bbc-news/wraith" target="_blank">Source</a>
+</p>
 
 ## What is it?
 
@@ -31,7 +34,7 @@ diff](http://bbc-news.github.io/wraith/img/wraith.png)
 Imagemagick and PhantomJS are required to use Wraith, install via your favourite package manager. You can also use SlimerJS and CasperJS, CasperJS can be used to target specific selectors. To read our detailed instructions for setup and install, as well as example configs, visit [wraith docs](http://bbc-news.github.io/wraith/index.html)
 
 ```sh
-brew install phantomjs  
+brew install phantomjs
 brew install imagemagick
 ```
 
@@ -60,7 +63,7 @@ wraith setup
 
 ### CLI
 
-There are other commands also available, these all expect a config_name to be passed as an option. Wraith will look for the config file at `configs/[config_name].yaml`.  
+There are other commands also available, these all expect a config_name to be passed as an option. Wraith will look for the config file at `configs/[config_name].yaml`.
 
 ```sh
   wraith capture [config_name]              # A full Wraith job

data/{templates/configs → configs/templates}/component.yaml

@@ -8,11 +8,11 @@ snap_file: "javascript/casper.js"
 
 # Type the name of the directory that shots will be stored in
 directory: 'shots'
+history_dir: 'shots_base'
 
-# Add only 2 domains, key will act as a label
+# Add as many domains as necessary. Key will act as a label
 domains:
-  russian: "http://www.bbc.com/russian"
-  arabic: "http://www.bbc.com/arabic"
+  english: "http://www.bbc.co.uk/news"
 
 #Type screen widths below, here are a couple of examples
 screen_widths:
@@ -24,9 +24,13 @@ screen_widths:
 
 #Type page URL paths below, here are a couple of examples
 paths:
-  brand:
-    path: /
-    selector: '.site-brand'
+  clickable_guide:
+    path: /entertainment-arts-27221191
+    selector: '.idt__news'
+  clickable_guide__after_click:
+    path: /entertainment-arts-27221191
+    selector: '.idt__news'
+    before_capture: 'javascript/beforeCapture.js'
 
 #Amount of fuzz ImageMagick will use
 fuzz: '20%'

data/{templates/configs → configs/templates}/config.yaml

@@ -11,7 +11,7 @@ directory: 'shots'
 
 # Add only 2 domains, key will act as a label
 domains:
-  english: "http://www.live.bbc.co.uk/news"
+  arabic: "http://www.live.bbc.co.uk/arabic"
   russian: "http://www.live.bbc.co.uk/russian"
 
 #Type screen widths below, here are a couple of examples
@@ -25,7 +25,7 @@ screen_widths:
 #Type page URL paths below, here are a couple of examples
 paths:
   home: /
-  uk_index: /uk
+  uk_index: /topics/video
 
 #Amount of fuzz ImageMagick will use
 fuzz: '20%'

data/configs/test_config--casper.yaml

@@ -0,0 +1,29 @@
+#Headless browser option
+browser:
+  phantomjs: "casperjs"
+  # slimerjs: "slimerjs"
+
+#If you want to have multiple snapping files, set the file name here
+snap_file: "lib/wraith/javascript/casper.js"
+
+# Type the name of the directory that shots will be stored in
+directory: 'shots'
+
+# Add only 2 domains, key will act as a label
+domains:
+  afrique: "http://www.bbc.com/afrique"
+  russian: "http://www.bbc.com/russian"
+
+#Type screen widths below, here are a couple of examples
+screen_widths:
+  - 320
+  - 600
+  - 1280
+
+#Type page URL paths below, here are a couple of examples
+paths:
+  home: /
+  uk_index: /uk
+
+#Amount of fuzz ImageMagick will use
+fuzz: '20%'

data/lib/wraith/cli.rb

@@ -14,19 +14,20 @@ class Wraith::CLI < Thor
   attr_accessor :config_name
 
   def self.source_root
-    File.expand_path("../../../templates/", __FILE__)
+    File.expand_path("../../../", __FILE__)
   end
 
   desc "setup", "creates config folder and default config"
   def setup
-    template("configs/config.yaml", "configs/config.yaml")
-    template("javascript/snap.js", "javascript/snap.js")
+    template("configs/templates/config.yaml", "configs/config.yaml")
+    template("lib/wraith/javascript/snap.js", "javascript/snap.js")
   end
 
   desc "setup_casper", "creates config folder and default config for casper"
   def setup_casper
-    template("configs/component.yaml", "configs/component.yaml")
-    template("javascript/casper.js", "javascript/casper.js")
+    template("configs/templates/component.yaml", "configs/component.yaml")
+    template("lib/wraith/javascript/casper.js", "javascript/casper.js")
+    template("lib/wraith/javascript/beforeCapture.js", "javascript/beforeCapture.js")
   end
 
   desc "reset_shots [config_name]", "removes all the files in the shots folder"

data/lib/wraith/javascript/beforeCapture.js

@@ -0,0 +1,5 @@
+module.exports = function (casper) {
+    casper.wait(2000, function() {
+        casper.click('.ns-panel__hotspot--2');
+    });
+}

data/lib/wraith/javascript/casper.js

@@ -7,14 +7,42 @@ var url = casper.cli.get(0);
 var view_port_width = casper.cli.get(1);
 var image_name = casper.cli.get(2);
 var selector = casper.cli.get(3);
+var globalBeforeCaptureJS = casper.cli.get(4);
+var pathBeforeCaptureJS = casper.cli.get(5);
 
-casper.start(url, function() {
-  this.viewport(view_port_width, 1500).then(function(){
-    this.wait(2000, function() {
-      this.captureSelector(image_name, selector);
-      console.log('Snapping ' + url + ' at width ' + view_port_width);
-    });
+function snap() {
+  if (selector == undefined) {
+    this.capture(image_name);
+  }
+  else {
+    this.captureSelector(image_name, selector);
+  }
+  console.log('Snapping ' + url + ' at width ' + view_port_width);
+}
+
+casper.start();
+casper.open(url);
+casper.viewport(view_port_width, 1500);
+casper.then(function() {
+  if (globalBeforeCaptureJS) {
+    require('./' + globalBeforeCaptureJS)(this);
+  }
+});
+casper.then(function() {
+  if (pathBeforeCaptureJS) {
+    require('./' + pathBeforeCaptureJS)(this);
+  }
+});
+// waits for all images to download before taking screenshots
+// (broken images are a big cause of Wraith failures!)
+// Credit: http://reff.it/8m3HYP
+casper.waitFor(function() {
+  return this.evaluate(function() {
+    var images = document.getElementsByTagName('img');
+    return Array.prototype.every.call(images, function(i) { return i.complete; });
   });
+}, function then () {
+  snap.bind(this)();
 });
 
 casper.run();

data/lib/wraith/save_images.rb

@@ -29,23 +29,23 @@ class Wraith::SaveImages
         base_file_name    = meta.file_names(width, label, meta.base_label)
         compare_file_name = meta.file_names(width, label, meta.compare_label)
 
-        jobs << [label, settings.path, width, settings.base_url,    base_file_name, settings.selector]
-        jobs << [label, settings.path, width, settings.compare_url, compare_file_name, settings.selector] unless settings.compare_url.nil?
+        jobs << [label, settings.path, width, settings.base_url,    base_file_name, settings.selector, wraith.before_capture, settings.before_capture]
+        jobs << [label, settings.path, width, settings.compare_url, compare_file_name, settings.selector, wraith.before_capture, settings.before_capture] unless settings.compare_url.nil?
       end
     end
     parallel_task(jobs)
   end
 
-  def capture_page_image(browser, url, width, file_name, selector)
-    puts `"#{browser}" #{wraith.phantomjs_options} "#{wraith.snap_file}" "#{url}" "#{width}" "#{file_name}" "#{selector}"`
+  def capture_page_image(browser, url, width, file_name, selector, global_before_capture, path_before_capture)
+    puts `"#{browser}" #{wraith.phantomjs_options} "#{wraith.snap_file}" "#{url}" "#{width}" "#{file_name}" "#{selector}" "#{global_before_capture}" "#{path_before_capture}"`
   end
 
   private
 
   def parallel_task(jobs)
-    Parallel.each(jobs, :in_threads => 8) do |_label, _path, width, url, filename, selector|
+    Parallel.each(jobs, :in_threads => 8) do |_label, _path, width, url, filename, selector, global_before_capture, path_before_capture|
       begin
-        attempt_image_capture(width, url, filename, selector, 5)
+        attempt_image_capture(width, url, filename, selector, global_before_capture, path_before_capture, 5)
       rescue => e
         puts e
         create_invalid_image(filename, width)
@@ -53,9 +53,9 @@ class Wraith::SaveImages
     end
   end
 
-  def attempt_image_capture(width, url, filename, selector, max_attempts)
+  def attempt_image_capture(width, url, filename, selector, global_before_capture, path_before_capture, max_attempts)
     max_attempts.times do |i|
-      capture_page_image meta.engine, url, width, filename, selector
+      capture_page_image meta.engine, url, width, filename, selector, global_before_capture, path_before_capture
 
       return if File.exist? filename
 
@@ -91,7 +91,11 @@ class CaptureOptions
   end
 
   def selector
-    casper_selector(options)
+    options["selector"] || " "
+  end
+
+  def before_capture
+    options["before_capture"] || "false"
   end
 
   def base_url
@@ -113,10 +117,6 @@ class CaptureOptions
   def has_casper(options)
     options["path"] ? options["path"] : options
   end
-
-  def casper_selector(options)
-    options["selector"] ? options["selector"] : " "
-  end
 end
 
 class SaveMetadata

data/lib/wraith/version.rb

@@ -1,3 +1,3 @@
 module Wraith
-  VERSION = "2.5.2"
+  VERSION = "2.6.0"
 end

data/lib/wraith/wraith.rb

@@ -27,6 +27,10 @@ class Wraith::Wraith
     @config["snap_file"] ? @config["snap_file"] : File.expand_path("lib/wraith/javascript/snap.js")
   end
 
+  def before_capture
+    @config["before_capture"] || "false"
+  end
+
   def widths
     @config["screen_widths"]
   end

data/spec/helpers.rb

@@ -0,0 +1,22 @@
+def create_diff_image
+  wraith.engine.each do |_type, engine|
+    saving.capture_page_image(engine, test_url1, 320, test_image1, selector, 'false', 'false')
+    saving.capture_page_image(engine, test_url2, 320, test_image2, selector, 'false', 'false')
+  end
+end
+
+def crop_images
+  Wraith::CropImages.new(config_name).crop_images
+end
+
+def compare_images
+  Wraith::CompareImages.new(config_name).compare_task(test_image1, test_image2, diff_image, data_txt)
+end
+
+def run_js_then_capture(config)
+  generated_image = 'shots/test/temporary_jsified_image.png'
+  saving.capture_page_image('casperjs', test_url1, 320, generated_image, selector, config[:global_js], config[:path_js])
+  Wraith::CompareImages.new(config_name).compare_task(generated_image, config[:output_should_look_like], diff_image, data_txt)
+  diff = File.open('shots/test/test.txt', "rb").read
+  expect(diff).to eq '0.0'
+end

data/spec/js/global.js

@@ -0,0 +1,6 @@
+module.exports = function (casper) {
+    casper.evaluate(function () {
+        document.body.innerHTML = ' ';
+        document.body.style['background-color'] = 'red';
+    });
+}

data/spec/js/path.js

@@ -0,0 +1,6 @@
+module.exports = function (casper) {
+    casper.evaluate(function () {
+        document.body.innerHTML = ' ';
+        document.body.style['background-color'] = 'green';
+    });
+}

data/spec/wraith_spec.rb

@@ -1,5 +1,6 @@
 require "rspec"
 require "image_size"
+require "helpers"
 require "./lib/wraith/cli"
 
 describe Wraith do
@@ -68,7 +69,7 @@ describe Wraith do
 
     it "saves image" do
       wraith.engine.each do |_type, engine|
-        saving.capture_page_image(engine, test_url1, 320, test_image1, selector)
+        saving.capture_page_image(engine, test_url1, 320, test_image1, selector, 'false', 'false')
       end
 
       expect(image_size[0]).to eq 320
@@ -87,7 +88,7 @@ describe Wraith do
     end
   end
 
-  describe "When generating tumbnails" do
+  describe "When generating thumbnails" do
     it "produce thumbnails" do
       create_diff_image
       crop_images
@@ -99,19 +100,38 @@ describe Wraith do
       expect(File).to exist("shots/thumbnails/test/test_diff.png")
     end
   end
-end
 
-def create_diff_image
-  wraith.engine.each do |_type, engine|
-    saving.capture_page_image(engine, test_url1, 320, test_image1, selector)
-    saving.capture_page_image(engine, test_url2, 320, test_image2, selector)
-  end
-end
+  describe "When hooking into beforeCapture" do
+    let(:config_name) { "test_config--casper" }
+    let(:saving) { Wraith::SaveImages.new(config_name) }
+    let(:wraith) { Wraith::Wraith.new(config_name) }
+    let(:selector) { "body" }
+    let(:before_suite_js) { "spec/js/global.js" }
+    let(:before_capture_js) { "spec/js/path.js" }
+
+    it "Executes the global JS before capturing" do
+      run_js_then_capture(
+        global_js: before_suite_js,
+        path_js: 'false',
+        output_should_look_like: 'spec/base/global.png'
+      )
+    end
 
-def crop_images
-  Wraith::CropImages.new(config_name).crop_images
-end
+    it "Executes the path-level JS before capturing" do
+      run_js_then_capture(
+        global_js: 'false',
+        path_js: before_capture_js,
+        output_should_look_like: 'spec/base/path.png'
+      )
+    end
+
+    it "Executes the global JS before the path-level JS" do
+      run_js_then_capture(
+        global_js: before_suite_js,
+        path_js: before_capture_js,
+        output_should_look_like: 'spec/base/path.png'
+      )
+    end
+  end
 
-def compare_images
-  Wraith::CompareImages.new(config_name).compare_task(test_image1, test_image2, diff_image, data_txt)
 end

data/wraith.gemspec

@@ -6,8 +6,8 @@ require 'wraith/version'
 Gem::Specification.new do |spec|
   spec.name          = 'wraith'
   spec.version       = Wraith::VERSION
-  spec.authors       = ['Dave Blooman', 'Simon Thulbourn']
-  spec.email         = ['david.blooman@gmail.com', 'simon+github@thulbourn.com']
+  spec.authors       = ['Dave Blooman', 'Simon Thulbourn', 'Chris Ashton']
+  spec.email         = ['david.blooman@gmail.com', 'simon+github@thulbourn.com', 'chrisashtonweb@gmail.com']
   spec.summary       = 'Wraith is a screenshot comparison tool, created by developers at BBC News.'
   spec.description   = 'Wraith is a screenshot comparison tool, created by developers at BBC News.'
   spec.homepage      = 'https://github.com/BBC-News/wraith'

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: wraith
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Dave Blooman
 - Simon Thulbourn
+- Chris Ashton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -170,6 +171,7 @@ description: Wraith is a screenshot comparison tool, created by developers at BB
 email:
 - david.blooman@gmail.com
 - simon+github@thulbourn.com
+- chrisashtonweb@gmail.com
 executables:
 - wraith
 extensions: []
@@ -188,10 +190,12 @@ files:
 - assets/invalid.jpg
 - bin/wraith
 - configs/component.yaml
-- configs/config.yaml
 - configs/config_nojs.yaml
 - configs/custom_height.yaml
 - configs/history.yaml
+- configs/templates/component.yaml
+- configs/templates/config.yaml
+- configs/test_config--casper.yaml
 - configs/test_config.yaml
 - lib/wraith.rb
 - lib/wraith/cli.rb
@@ -200,6 +204,7 @@ files:
 - lib/wraith/folder.rb
 - lib/wraith/gallery.rb
 - lib/wraith/gallery_template/gallery_template.erb
+- lib/wraith/javascript/beforeCapture.js
 - lib/wraith/javascript/casper.js
 - lib/wraith/javascript/customHeight.js
 - lib/wraith/javascript/nojs.js
@@ -209,11 +214,13 @@ files:
 - lib/wraith/thumbnails.rb
 - lib/wraith/version.rb
 - lib/wraith/wraith.rb
+- spec/base/global.png
+- spec/base/path.png
+- spec/helpers.rb
+- spec/js/global.js
+- spec/js/path.js
 - spec/wraith_spec.rb
-- templates/configs/component.yaml
-- templates/configs/config.yaml
-- templates/javascript/casper.js
-- templates/javascript/snap.js
+- wraith-logo.png
 - wraith.gemspec
 homepage: https://github.com/BBC-News/wraith
 licenses:
@@ -240,4 +247,9 @@ signing_key:
 specification_version: 4
 summary: Wraith is a screenshot comparison tool, created by developers at BBC News.
 test_files:
+- spec/base/global.png
+- spec/base/path.png
+- spec/helpers.rb
+- spec/js/global.js
+- spec/js/path.js
 - spec/wraith_spec.rb

data/configs/config.yaml

@@ -1,41 +0,0 @@
-#Headless browser option
-browser:
-  phantomjs: "phantomjs"
-  # slimerjs: "slimerjs"
-
-#If you want to have multiple snapping files, set the file name here
-snap_file: "lib/wraith/javascript/snap.js"
-
-# Type the name of the directory that shots will be stored in
-directory: 'shots'
-
-# Add only 2 domains, key will act as a label
-domains:
-  arabic: "http://www.bbc.com/arabic"
-  russian: "http://www.bbc.com/russian"
-
-#Type screen widths below, here are a couple of examples
-screen_widths:
-  - 320
-  - 600
-  - 768
-  - 1024
-  - 1280
-
-#Type page URL paths below, here are a couple of examples
-paths:
-  home: /
-  uk_index: /uk
-
-#Amount of fuzz ImageMagick will use
-fuzz: '20%'
-
-#Set the number of days to keep the site spider file
-spider_days:
-  - 10
-
-#Choose how results are displayed, by default alphanumeric. Different screen widths are always grouped.
-#alphanumeric - all paths (with, and without, a difference) are shown, sorted by path
-#diffs_first - all paths (with, and without, a difference) are shown, sorted by difference size (largest first)
-#diffs_only - only paths with a difference are shown, sorted by difference size (largest first)
-#mode: diffs_first

data/templates/javascript/casper.js

@@ -1,25 +0,0 @@
-var system = require('system');
-var page = require('webpage').create();
-var fs = require('fs');
-var casper = require("casper").create();
-
-var url = casper.cli.get(0);
-var view_port_width = casper.cli.get(1);
-var image_name = casper.cli.get(2);
-var selector = casper.cli.get(3);
-
-casper.start(url, function() {
-  this.viewport(view_port_width, 1500).then(function(){
-    this.wait(2000, function() {
-      if (selector == undefined) {
-        this.capture(image_name);
-      }
-      else {
-        this.captureSelector(image_name, selector);
-      }
-      console.log('Snapping ' + url + ' at width ' + view_port_width);
-    });
-  });
-});
-
-casper.run();

data/templates/javascript/snap.js

@@ -1,85 +0,0 @@
-var system = require('system');
-var page = require('webpage').create();
-var fs = require('fs');
-
-if (system.args.length === 3) {
-    console.log('Usage: snap.js <some URL> <view port width> <target image name>');
-    phantom.exit();
-}
-
-var url = system.args[1];
-var image_name = system.args[3];
-var view_port_width = system.args[2];
-var current_requests = 0;
-var last_request_timeout;
-var final_timeout;
-
-
-page.viewportSize = { width: view_port_width, height: 1500};
-page.settings = { loadImages: true, javascriptEnabled: true };
-
-// If you want to use additional phantomjs commands, place them here
-page.settings.userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.17';
-
-// You can place custom headers here, example below.
-// page.customHeaders = {
-
-//      'X-Candy-OVERRIDE': 'https://api.live.bbc.co.uk/'
- 
-//  };
-
-// If you want to set a cookie, just add your details below in the following way.
-
-// phantom.addCookie({
-//     'name': 'ckns_policy',
-//     'value': '111',
-//     'domain': '.bbc.co.uk'
-// });
-// phantom.addCookie({
-//     'name': 'locserv',
-//     'value': '1#l1#i=6691484:n=Oxford+Circus:h=e@w1#i=8:p=London@d1#1=l:2=e:3=e:4=2@n1#r=40',
-//     'domain': '.bbc.co.uk'
-// });
-
-page.onResourceRequested = function(req) {
-  current_requests += 1;
-};
-
-page.onResourceReceived = function(res) {
-  if (res.stage === 'end') {
-    current_requests -= 1;
-    debounced_render();
-  }
-};
-
-page.open(url, function(status) {
-  if (status !== 'success') {
-    console.log('Error with page ' + url);
-    phantom.exit();
-  }
-});
-
-
-function debounced_render() {
-  clearTimeout(last_request_timeout);
-  clearTimeout(final_timeout);
-
-  // If there's no more ongoing resource requests, wait for 1 second before
-  // rendering, just in case the page kicks off another request
-  if (current_requests < 1) {
-      clearTimeout(final_timeout);
-      last_request_timeout = setTimeout(function() {
-          console.log('Snapping ' + url + ' at width ' + view_port_width);
-          page.render(image_name);
-          phantom.exit();
-      }, 1000);
-  }
-
-  // Sometimes, straggling requests never make it back, in which
-  // case, timeout after 5 seconds and render the page anyway
-  final_timeout = setTimeout(function() {
-    console.log('Snapping ' + url + ' at width ' + view_port_width);
-    page.render(image_name);
-    phantom.exit();
-  }, 5000);
-}