Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 11 deletions

diff --git a/spec/views/projects/services/_form.haml_spec.rb b/spec/views/projects/services/_form.haml_spec.rb
index 5c48b17848e..8dd8bd98388 100644
--- a/spec/views/projects/services/_form.haml_spec.rb
+++ b/spec/views/projects/services/_form.haml_spec.rb
@@ -11,17 +11,16 @@ RSpec.describe 'projects/services/_form' do
 
     allow(controller).to receive(:current_user).and_return(user)
 
-    allow(view).to receive_messages(current_user: user,
-                                    can?: true,
-                                    current_application_settings: Gitlab::CurrentSettings.current_application_settings,
-                                    request: double(referrer: '/services'))
+    allow(view).to receive_messages(
+      current_user: user,
+      can?: true,
+      current_application_settings: Gitlab::CurrentSettings.current_application_settings,
+      integration: project.redmine_service,
+      request: double(referrer: '/services')
+    )
   end
 
   context 'commit_events and merge_request_events' do
-    before do
-      assign(:service, project.redmine_service)
-    end
-
     it 'display merge_request_events and commit_events descriptions' do
       allow(Integrations::Redmine).to receive(:supported_events).and_return(%w(commit merge_request))
 
diff --git a/spec/views/projects/services/edit.html.haml_spec.rb b/spec/views/projects/services/edit.html.haml_spec.rb
index 785af6a5344..8ac0a3363be 100644
--- a/spec/views/projects/services/edit.html.haml_spec.rb
+++ b/spec/views/projects/services/edit.html.haml_spec.rb
@@ -3,12 +3,12 @@
 require 'spec_helper'
 
 RSpec.describe 'projects/services/edit' do
-  let(:service) { create(:drone_ci_service, project: project) }
+  let(:integration) { create(:drone_ci_service, project: project) }
   let(:project) { create(:project) }
 
   before do
     assign :project, project
-    assign :service, service
+    assign :integration, integration
   end
 
   it do
@@ -17,7 +17,7 @@ RSpec.describe 'projects/services/edit' do
     expect(rendered).not_to have_text('Recent Deliveries')
   end
 
-  context 'service using WebHooks' do
+  context 'integration using WebHooks' do
     before do
       assign(:web_hook_logs, [])
     end