diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-10-02 12:58:58 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-02 12:58:58 +1030 |
| commit | 832b02620b1331212a53186023688c8e84a4ca03 (patch) | |
| tree | 6938e6490090062ad7c2f14f3b4c44bb4f815ad2 /Gemfile.lock | |
| parent | 9ce2d1b1a43fc4ef3db59849b7412d30583a4074 (diff) | |
| parent | 7c812c24018989f0f76d00c6e6b4833f942b92c5 (diff) | |
| download | rails-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.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 68c75997b1..46a50ef39e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,6 +170,7 @@ GEM em-socksify (0.3.1) eventmachine (>= 1.0.0.beta.4) erubis (2.7.0) + event_emitter (0.2.5) eventmachine (1.2.0.1) eventmachine (1.2.0.1-x64-mingw32) eventmachine (1.2.0.1-x86-mingw32) @@ -346,6 +347,9 @@ GEM nokogiri wdm (0.1.1) websocket (1.2.3) + websocket-client-simple (0.3.0) + event_emitter + websocket websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -370,8 +374,6 @@ DEPENDENCIES delayed_job! delayed_job_active_record! em-hiredis - faye (= 1.1.1) - faye-websocket hiredis jquery-rails kindlerb (= 0.1.1) @@ -409,6 +411,7 @@ DEPENDENCIES uglifier (>= 1.3.0) w3c_validators wdm (>= 0.1.0) + websocket-client-simple BUNDLED WITH 1.13.1 |