aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-07-23 11:59:12 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-07-23 11:59:12 +0200
commitbdbc91ab5840faf1e1c5002eb9d0be442ec52504 (patch)
treec0abf89954a67790aa11031089992a340dea4c78 /test
parent6ee8bb9310f78de85e6b89c8cac33493b0582383 (diff)
parent5d8c84827361ab7bfe7e2b7afac446f8017d3a02 (diff)
downloadrails-bdbc91ab5840faf1e1c5002eb9d0be442ec52504.tar.gz
rails-bdbc91ab5840faf1e1c5002eb9d0be442ec52504.tar.bz2
rails-bdbc91ab5840faf1e1c5002eb9d0be442ec52504.zip
Merge pull request #35 from twalpole/gem_updates
Update gems and requires
Diffstat (limited to 'test')
-rw-r--r--test/test_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 759ea18524..5640178f34 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,6 +10,8 @@ Bundler.require :default, :test
require 'puma'
require 'mocha/mini_test'
+require 'rack/mock'
+
require 'action_cable'
ActiveSupport.test_order = :sorted