6 files changed, 48 insertions, 4 deletions
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index 7657a05077..a0254fe323 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 5.1.0.beta1 (February 23, 2017) ##
+
 *   Redis subscription adapters now support `channel_prefix` option in `cable.yml`
 
     Avoids channel name collisions when multiple apps use the same Redis server.
diff --git a/actioncable/Rakefile b/actioncable/Rakefile
index 87d443919c..bda8c7b6c8 100644
--- a/actioncable/Rakefile
+++ b/actioncable/Rakefile
@@ -1,12 +1,13 @@
 require "rake/testtask"
 require "pathname"
+require "open3"
 require "action_cable"
 
 dir = File.dirname(__FILE__)
 
 task default: :test
 
-task package: "assets:compile"
+task package: %w( assets:compile assets:verify )
 
 Rake::TestTask.new do |t|
   t.libs << "test"
@@ -37,6 +38,39 @@ namespace :assets do
   desc "Compile Action Cable assets"
   task :compile do
     require "blade"
+    require "sprockets"
+    require "sprockets/export"
     Blade.build
   end
+
+  desc "Verify compiled Action Cable assets"
+  task :verify do
+    file = "lib/assets/compiled/action_cable.js"
+    pathname = Pathname.new("#{dir}/#{file}")
+
+    print "[verify] #{file} exists "
+    if pathname.exist?
+      puts "[OK]"
+    else
+      $stderr.puts "[FAIL]"
+      fail
+    end
+
+    print "[verify] #{file} is a UMD module "
+    if pathname.read =~ /module\.exports.*define\.amd/m
+      puts "[OK]"
+    else
+      $stderr.puts "[FAIL]"
+      fail
+    end
+
+    print "[verify] #{dir} can be required as a module "
+    stdout, stderr, status = Open3.capture3("node", "--print", "window = {}; require('#{dir}');")
+    if status.success?
+      puts "[OK]"
+    else
+      $stderr.puts "[FAIL]\n#{stderr}"
+      fail
+    end
+  end
 end
diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb
index 8ba0230d47..c09613a747 100644
--- a/actioncable/lib/action_cable/gem_version.rb
+++ b/actioncable/lib/action_cable/gem_version.rb
@@ -8,7 +8,7 @@ module ActionCable
     MAJOR = 5
     MINOR = 1
     TINY  = 0
-    PRE   = "alpha"
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb b/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb
index 56b068976b..ed8f315791 100644
--- a/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb
@@ -24,6 +24,12 @@ module ActionCable
       cattr_accessor(:redis_connector) { ->(config) { ::Redis.new(url: config[:url]) } }
 
       def initialize(*)
+        ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          The "evented_redis" subscription adapter is deprecated and
+          will be removed in Rails 5.2. Please use the "redis" adapter
+          instead.
+        MSG
+
         super
         @redis_connection_for_broadcasts = @redis_connection_for_subscriptions = nil
       end
diff --git a/actioncable/package.json b/actioncable/package.json
index 37f82fa1ea..69ae3519d9 100644
--- a/actioncable/package.json
+++ b/actioncable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "actioncable",
-  "version": "5.0.0-rc1",
+  "version": "5.1.0-beta1",
   "description": "WebSocket framework for Ruby on Rails.",
   "main": "lib/assets/compiled/action_cable.js",
   "files": [
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb
index c55d35848e..256458bc24 100644
--- a/actioncable/test/subscription_adapter/evented_redis_test.rb
+++ b/actioncable/test/subscription_adapter/evented_redis_test.rb
@@ -7,7 +7,9 @@ class EventedRedisAdapterTest < ActionCable::TestCase
   include ChannelPrefixTest
 
   def setup
-    super
+    assert_deprecated do
+      super
+    end
 
     # em-hiredis is warning-rich
     @previous_verbose, $VERBOSE = $VERBOSE, nil