diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-02-02 02:44:06 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-02-02 02:44:06 +1030 |
| commit | 8a51f6fbbf720db9edce3e1c973a9f8c5ee7931c (patch) | |
| tree | 925305ca83e3e9727fa61b717fe5f72269e4732e /railties | |
| parent | 8b2c618cefef1ccd83d270cbacdd19abf4be9b2f (diff) | |
| parent | e77368637e17e6a33db2713f651e85a09456c645 (diff) | |
| download | rails-8a51f6fbbf720db9edce3e1c973a9f8c5ee7931c.tar.gz rails-8a51f6fbbf720db9edce3e1c973a9f8c5ee7931c.tar.bz2 rails-8a51f6fbbf720db9edce3e1c973a9f8c5ee7931c.zip | |
Merge pull request #23381 from matthewd/uneventful-redis
Redis sans EventMachine
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index c629459d95..51394de824 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -344,7 +344,6 @@ module Rails return [] if options[:skip_action_cable] comment = 'Action Cable dependencies for the Redis adapter' gems = [] - gems << GemfileEntry.new("em-hiredis", '~> 0.3.0', comment) gems << GemfileEntry.new("redis", '~> 3.0', comment) gems end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 53f8ed6af0..49536c068f 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -400,7 +400,6 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_no_match(/action_cable_meta_tag/, content) end assert_file "Gemfile" do |content| - assert_no_match(/em-hiredis/, content) assert_no_match(/redis/, content) end end @@ -412,14 +411,12 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_no_file "app/assets/javascripts/cable.coffee" assert_no_file "app/channels" assert_file "Gemfile" do |content| - assert_no_match(/em-hiredis/, content) assert_no_match(/redis/, content) end end def test_action_cable_redis_gems run_generator - assert_gem 'em-hiredis' assert_gem 'redis' end |