README.md in poltergeist-1.6.0 vs README.md in poltergeist-1.7.0

- old
+ new

@@ -2,16 +2,16 @@ [![Build Status](https://secure.travis-ci.org/teampoltergeist/poltergeist.png)](http://travis-ci.org/teampoltergeist/poltergeist) Poltergeist is a driver for [Capybara](https://github.com/jnicklas/capybara). It allows you to run your Capybara tests on a headless [WebKit](http://webkit.org) browser, -provided by [PhantomJS](http://www.phantomjs.org/). +provided by [PhantomJS](http://phantomjs.org/). **If you're viewing this at https://github.com/teampoltergeist/poltergeist, you're reading the documentation for the master branch. [View documentation for the latest release -(1.6.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.6.0)** +(1.7.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.7.0)** ## Getting help ## Questions should be posted [on Stack Overflow, using the 'poltergeist' tag](http://stackoverflow.com/questions/tagged/poltergeist). @@ -41,29 +41,29 @@ ### Mac ### * *Homebrew*: `brew install phantomjs` * *MacPorts*: `sudo port install phantomjs` -* *Manual install*: [Download this](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-macosx.zip) +* *Manual install*: [Download this](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-macosx.zip) ### Linux ### -* Download the [32 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-i686.tar.bz2) -or [64 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2) +* Download the [32 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-i686.tar.bz2) +or [64 bit](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2) binary. * Extract the tarball and copy `bin/phantomjs` into your `PATH` ### Windows ### -* Download the [precompiled binary](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-windows.zip) +* Download the [precompiled binary](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-windows.zip) for Windows ### Manual compilation ### Do this as a last resort if the binaries don't work for you. It will take quite a long time as it has to build WebKit. -* Download [the source tarball](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-source.zip) +* Download [the source tarball](https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-source.zip) * Extract and cd in * `./build.sh` (See also the [PhantomJS building guide](http://phantomjs.org/build.html).) @@ -233,11 +233,11 @@ See more about [sendEvent](http://phantomjs.org/api/webpage/method/send-event.html) and [PhantomJS keys](https://github.com/ariya/phantomjs/commit/cab2635e66d74b7e665c44400b8b20a8f225153a) ## Customization ## -You can customize the way that Capybara sets up Poltegeist via the following code in your +You can customize the way that Capybara sets up Poltergeist via the following code in your test setup: ``` ruby Capybara.register_driver :poltergeist do |app| Capybara::Poltergeist::Driver.new(app, options) @@ -264,10 +264,24 @@ * `:extensions` (Array) - An array of JS files to be preloaded into the phantomjs browser. Useful for faking unsupported APIs. * `:port` (Fixnum) - The port which should be used to communicate with the PhantomJS process. Defaults to a random open port. +### URL Blacklisting ### + +Poltergeist supports URL blacklisting which allows you +to prevent scripts from running on designated domains. If you are experiencing +slower run times, consider creating a URL blacklist of domains that are not +essential to your testing environment, such as ad networks or analytics. + +```ruby +page.driver.browser.url_blacklist = ['http://www.example.com'] +``` + +Make sure you set it before each running test, because this setting's cleaned +up when capybara does reset. + ## Troubleshooting ## Unfortunately, the nature of full-stack testing is that things can and do go wrong from time to time. This section aims to highlight a number of common problems and provide ideas about how you can work around them. @@ -381,10 +395,10 @@ Version history and a list of next-release features and fixes can be found in the [changelog](CHANGELOG.md). ## License ## -Copyright (c) 2011-2014 Jonathan Leighton +Copyright (c) 2011-2015 Jonathan Leighton Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish,