From 02229f059368ad7228dd99e3cf57ebb21e73f2bb Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Wed, 9 Aug 2017 17:32:01 +0100
Subject: [PATCH] CE->EE: Fix conflicts in
spec/services/wiki_pages/update_service_spec.rb
---
spec/services/wiki_pages/update_service_spec.rb | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/spec/services/wiki_pages/update_service_spec.rb b/spec/services/wiki_pages/update_service_spec.rb
index b8e7ce4683805..f623aece15253 100644
--- a/spec/services/wiki_pages/update_service_spec.rb
+++ b/spec/services/wiki_pages/update_service_spec.rb
@@ -25,14 +25,9 @@
updated_page = service.execute(page)
expect(updated_page).to be_valid
-<<<<<<< HEAD
expect(updated_page).to have_attributes(message: opts[:message], content: opts[:content], format: opts[:format].to_sym)
-=======
- expect(updated_page.message).to eq(opts[:message])
- expect(updated_page.content).to eq(opts[:content])
- expect(updated_page.format).to eq(opts[:format].to_sym)
+
expect(updated_page.title).to eq(opts[:title])
->>>>>>> upstream/master
end
it 'executes webhooks' do
--
GitLab