Add latest changes from gitlab-org/gitlab@master

1 files changed, 31 insertions, 0 deletions

diff --git a/spec/views/projects/services/edit.html.haml_spec.rb b/spec/views/projects/services/edit.html.haml_spec.rb
new file mode 100644
index 00000000000..12e1cda2c00
--- /dev/null
+++ b/spec/views/projects/services/edit.html.haml_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'projects/services/edit' do
+  let(:service) { create(:drone_ci_service, project: project) }
+  let(:project) { create(:project) }
+
+  before do
+    assign :project, project
+    assign :service, service
+  end
+
+  it do
+    render
+
+    expect(rendered).not_to have_text('Recent Deliveries')
+  end
+
+  context 'service using WebHooks' do
+    before do
+      assign(:web_hook_logs, [])
+    end
+
+    it do
+      render
+
+      expect(rendered).to have_text('Recent Deliveries')
+    end
+  end
+end