Add latest changes from gitlab-org/gitlab@13-1-stable-ee

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/channels/application_cable/connection_spec.rb b/spec/channels/application_cable/connection_spec.rb
index f3d67133528..e5f7ea1103c 100644
--- a/spec/channels/application_cable/connection_spec.rb
+++ b/spec/channels/application_cable/connection_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ApplicationCable::Connection, :clean_gitlab_redis_shared_state do
+RSpec.describe ApplicationCable::Connection, :clean_gitlab_redis_shared_state do
   let(:session_id) { Rack::Session::SessionId.new('6919a6f1bb119dd7396fadc38fd18d0d') }
 
   before do
diff --git a/spec/channels/issues_channel_spec.rb b/spec/channels/issues_channel_spec.rb
index 1c88cc73456..4c860402f03 100644
--- a/spec/channels/issues_channel_spec.rb
+++ b/spec/channels/issues_channel_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuesChannel do
+RSpec.describe IssuesChannel do
   let_it_be(:issue) { create(:issue) }
 
   it 'rejects when project path is invalid' do
@@ -18,7 +18,7 @@ describe IssuesChannel do
   end
 
   it 'rejects when the user does not have access' do
-    stub_connection current_user: nil
+    stub_action_cable_connection current_user: nil
 
     subscribe(project_path: issue.project.full_path, iid: issue.iid)
 
@@ -26,7 +26,7 @@ describe IssuesChannel do
   end
 
   it 'subscribes to a stream when the user has access' do
-    stub_connection current_user: issue.author
+    stub_action_cable_connection current_user: issue.author
 
     subscribe(project_path: issue.project.full_path, iid: issue.iid)