Merge branch 'master' into Add_Watir_browser_driver

craigmcdonald · Jul 14, 2016 · b36074d · b36074d
2 parents 8cb309a + 84d139c
commit b36074d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,11 @@
 language: ruby
 before_install:
   - gem install bundler
+  - mkdir travis-phantomjs
+  - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs:$PATH
+  - phantomjs --version
 rvm:
   - 1.9.3
   - 2.0.0

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Puffing Billy
+# Puffing Billy [![Gem Version](https://badge.fury.io/rb/puffing-billy.svg)](https://badge.fury.io/rb/puffing-billy) [![Build Status](https://travis-ci.org/oesmith/puffing-billy.svg?branch=master)](https://travis-ci.org/oesmith/puffing-billy) 
 
 A rewriting web proxy for testing interactions between your browser and
 external sites. Works with ruby + rspec.