aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-10-02 12:58:58 +1030
committerGitHub <noreply@github.com>2016-10-02 12:58:58 +1030
commit832b02620b1331212a53186023688c8e84a4ca03 (patch)
tree6938e6490090062ad7c2f14f3b4c44bb4f815ad2 /Gemfile
parent9ce2d1b1a43fc4ef3db59849b7412d30583a4074 (diff)
parent7c812c24018989f0f76d00c6e6b4833f942b92c5 (diff)
downloadrails-832b02620b1331212a53186023688c8e84a4ca03.tar.gz
rails-832b02620b1331212a53186023688c8e84a4ca03.tar.bz2
rails-832b02620b1331212a53186023688c8e84a4ca03.zip
Merge pull request #26682 from matthewd/cable-tests
Use websocket-client-simple instead of Faye in tests
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index a3cbb69c74..5b0ecd7b3d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -72,10 +72,7 @@ group :cable do
gem "hiredis", require: false
gem "redis", require: false
- gem "faye-websocket", require: false
-
- # Lock to 1.1.1 until the fix for https://github.com/faye/faye/issues/394 is released
- gem "faye", "1.1.1", require: false
+ gem "websocket-client-simple", require: false
gem "blade", require: false, platforms: [:ruby]
gem "blade-sauce_labs_plugin", require: false, platforms: [:ruby]