From 55791ed27bdac238c707823e953c1425ff749dc2 Mon Sep 17 00:00:00 2001
From: Philip Blyth <philip.blyth@gmail.com>
Date: Fri, 16 Jan 2015 12:16:10 -0500
Subject: [PATCH 1/2] Added travis config to install Qt for capybara-webkit

---
 .gitignore  | 5 +++++
 .travis.yml | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.gitignore b/.gitignore
index 3a19480b..15e3b688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,12 @@
 *.swp
 *.svn
 *.DS_Store
+
 .bundle
+vendor
+
 tmp/*
+
 lib/settings.yml
+
 capybara-*
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..ddbab8aa
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install libqt4-dev qt4-qmake
+
+script: "bundle exec rake"

From 770ed354584e25729f968597df193f89697beb4a Mon Sep 17 00:00:00 2001
From: Philip Blyth <philip.blyth@gmail.com>
Date: Fri, 16 Jan 2015 13:37:44 -0500
Subject: [PATCH 2/2] Switched `Gemfile` to pessimistic versioning
 (dependencies were no longer being found)

---
 Gemfile      | 14 ++++----
 Gemfile.lock | 97 +++++++++++++++++++++++++++-------------------------
 2 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/Gemfile b/Gemfile
index 96161fe1..b9208cae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 
-gem "colored"
-gem "chunky_png"
+gem "colored", "~> 1" # released February 10, 2010
+gem "chunky_png", "~> 1.2" # released May 8, 2011
 
 group :test do
-  gem "cucumber", "0.10.2"
-  gem "aruba",    "0.3.6"
-  gem "rspec", "2.6.0"
-  gem "capybara", "0.4.1.2"
-  gem "capybara-webkit", "0.3.0"
+  gem "rake", "~> 0.9" # released May 20, 2011
+  gem "aruba", "~> 0.3" # was 0.3.6
+  gem "rspec", "~> 2" # was 2.6.0
+  gem "capybara", "~> 0" # was 0.4.1.2
+  gem "capybara-webkit", "~> 0" # was 0.3.0
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3909338b..7e68becd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.3.6)
-      childprocess (>= 0.1.7)
-      cucumber (>= 0.10.0)
-      rspec (>= 2.5.0)
-    builder (3.0.0)
+    aruba (0.6.2)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.2.2)
     capybara (0.4.1.2)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
@@ -15,46 +15,49 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.3)
-    capybara-webkit (0.3.0)
+    capybara-webkit (0.5.0)
       capybara (~> 0.4.1)
-    celerity (0.8.9)
-    childprocess (0.1.9)
-      ffi (~> 1.0.6)
-    chunky_png (1.2.0)
+    celerity (0.9.2)
+    childprocess (0.5.5)
+      ffi (~> 1.0, >= 1.0.11)
+    chunky_png (1.3.3)
     colored (1.2)
-    cucumber (0.10.2)
+    cucumber (1.3.18)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.5)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
     culerity (0.2.15)
-    diff-lcs (1.1.2)
-    ffi (1.0.8)
-    gherkin (2.3.7)
-      json (>= 1.4.6)
-    json (1.5.1)
-    json_pure (1.5.1)
-    mime-types (1.16)
-    nokogiri (1.4.4)
-    rack (1.2.2)
-    rack-test (0.6.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.6)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.0)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (0.2.0)
-      childprocess (>= 0.1.7)
-      ffi (>= 1.0.7)
-      json_pure
-      rubyzip
-    term-ansicolor (1.0.5)
+    rake (0.9.6)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.3)
+    rubyzip (1.1.6)
+    selenium-webdriver (2.44.0)
+      childprocess (~> 0.5)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
+    websocket (1.2.1)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -62,10 +65,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (= 0.3.6)
-  capybara (= 0.4.1.2)
-  capybara-webkit (= 0.3.0)
-  chunky_png
-  colored
-  cucumber (= 0.10.2)
-  rspec (= 2.6.0)
+  aruba (~> 0.3)
+  capybara (~> 0)
+  capybara-webkit (~> 0)
+  chunky_png (~> 1.2)
+  colored (~> 1)
+  rake (~> 0.9)
+  rspec (~> 2)