1 files changed, 24 insertions, 3 deletions
diff --git a/actioncable/lib/rails/generators/channel/channel_generator.rb b/actioncable/lib/rails/generators/channel/channel_generator.rb
index c5d398810a..20d807c033 100644
--- a/actioncable/lib/rails/generators/channel/channel_generator.rb
+++ b/actioncable/lib/rails/generators/channel/channel_generator.rb
@@ -10,16 +10,37 @@ module Rails
       check_class_collision suffix: "Channel"
 
       def create_channel_file
-        template "channel.rb", File.join('app/channels', class_path, "#{file_name}_channel.rb")
+        template "channel.rb", File.join("app/channels", class_path, "#{file_name}_channel.rb")
 
         if options[:assets]
-          template "assets/channel.coffee", File.join('app/assets/javascripts/channels', class_path, "#{file_name}.coffee")
+          if self.behavior == :invoke
+            template "assets/cable.js", "app/assets/javascripts/cable.js"
+          end
+
+          js_template "assets/channel", File.join("app/assets/javascripts/channels", class_path, "#{file_name}")
         end
+
+        generate_application_cable_files
       end
 
       protected
         def file_name
-          @_file_name ||= super.gsub(/\_channel/i, '')
+          @_file_name ||= super.gsub(/_channel/i, "")
+        end
+
+        # FIXME: Change these files to symlinks once RubyGems 2.5.0 is required.
+        def generate_application_cable_files
+          return if self.behavior != :invoke
+
+          files = [
+            "application_cable/channel.rb",
+            "application_cable/connection.rb"
+          ]
+
+          files.each do |name|
+            path = File.join("app/channels/", name)
+            template(name, path) if !File.exist?(path)
+          end
         end
     end
   end