From f95e3129bbde1bcb60d05bef1375fa104081e03c Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 12 Mar 2012 20:48:28 +0000
Subject: [PATCH] bump faye-websocket and enable jruby on travis

---
 .travis.yml         | 4 ++--
 poltergeist.gemspec | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f1b57ee..c91971b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,8 @@ rvm:
   - 1.8.7
   - rbx-18mode
   - rbx-19mode
-  # - jruby-18mode
-  # - jruby-19mode
+  - jruby-18mode
+  - jruby-19mode
 gemfile:
   - Gemfile
   - ci/Gemfile.capybara1-0
diff --git a/poltergeist.gemspec b/poltergeist.gemspec
index fca871a..5486581 100644
--- a/poltergeist.gemspec
+++ b/poltergeist.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "multi_json",     "~> 1.0"
   s.add_dependency "childprocess",   "~> 0.3"
   s.add_dependency "http_parser.rb", "~> 0.5.3"
-  s.add_dependency "faye-websocket", "~> 0.4", ">= 0.4.2"
+  s.add_dependency "faye-websocket", "~> 0.4", ">= 0.4.3"
 
   s.add_development_dependency 'rspec',      '~> 2.8.0'
   s.add_development_dependency 'sinatra',    '~> 1.0'