From 43463b5518a7660764d438dcdab367dabd13332a Mon Sep 17 00:00:00 2001
From: Dominik Sander <git@dsander.de>
Date: Sun, 13 Mar 2016 11:24:17 +0100
Subject: [PATCH 1/2] Increase capybara/poltergeist timeout to 60 seconds

The default wait time of 2 seconds produced false positives on slow test runners.
---
 spec/capybara_helper.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spec/capybara_helper.rb b/spec/capybara_helper.rb
index 384a407a..5cf9024f 100644
--- a/spec/capybara_helper.rb
+++ b/spec/capybara_helper.rb
@@ -2,7 +2,13 @@ require 'rails_helper'
 require 'capybara/rails'
 require 'capybara/poltergeist'
 require 'capybara-select2'
+
+Capybara.register_driver :poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, timeout: 60)
+end
+
 Capybara.javascript_driver = :poltergeist
+Capybara.default_max_wait_time = 60
 
 RSpec.configure do |config|
   config.include Warden::Test::Helpers
@@ -17,4 +23,4 @@ end
 
 VCR.configure do |config|
   config.ignore_localhost = true
-end
\ No newline at end of file
+end

From 4a75ca3797e6423bc9c38c939a8ba40913f8fcb2 Mon Sep 17 00:00:00 2001
From: Dominik Sander <git@dsander.de>
Date: Sun, 13 Mar 2016 19:16:16 +0100
Subject: [PATCH 2/2] Upgrade coffee-rails to fix random spec failures on
 travis

https://github.com/jashkenas/coffeescript/issues/3829
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 594dfba5..f4143523 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,7 +79,7 @@ gem 'protected_attributes', '~>1.0.8' # This must be loaded before some other ge
 gem 'ace-rails-ap', '~> 2.0.1'
 gem 'bootstrap-kaminari-views', '~> 0.0.3'
 gem 'bundler', '>= 1.5.0'
-gem 'coffee-rails', '~> 4.1.0'
+gem 'coffee-rails', '~> 4.1.1'
 gem 'daemons', '~> 1.1.9'
 gem 'delayed_job', '~> 4.1.0'
 gem 'delayed_job_active_record', github: 'collectiveidea/delayed_job_active_record', branch: 'master'
diff --git a/Gemfile.lock b/Gemfile.lock
index c3831ae3..7908df81 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -144,13 +144,13 @@ GEM
     chronic (0.10.2)
     cliver (0.3.2)
     coderay (1.1.0)
-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+      railties (>= 4.0.0, < 5.1.x)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1)
+    coffee-script-source (1.10.0)
     colorize (0.7.7)
     concurrent-ruby (1.0.1)
     cookiejar (0.3.2)
@@ -585,7 +585,7 @@ DEPENDENCIES
   capistrano-bundler (~> 1.1.4)
   capistrano-rails (~> 1.1)
   capybara-select2
-  coffee-rails (~> 4.1.0)
+  coffee-rails (~> 4.1.1)
   coveralls
   daemons (~> 1.1.9)
   delayed_job (~> 4.1.0)