From 694124db7b59b2e7704652a8922424b639c2b7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 4 Feb 2019 17:35:53 +0000
Subject: [PATCH] Merge branch 'fj-regression-external-wiki-url' into 'master'

Changed external wiki query method to prevent attribute caching

Closes #57228

See merge request gitlab-org/gitlab-ce!24907

(cherry picked from commit 7ffbfeb1f79b18b6a3a42e73d12b9680e3e3eb48)

247bd122 Changed external wiki query method to prevent attribute caching
---
 app/helpers/projects_helper.rb                        |  2 +-
 .../unreleased/fj-regression-external-wiki-url.yml    |  5 +++++
 spec/helpers/projects_helper_spec.rb                  | 11 +++--------
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 changelogs/unreleased/fj-regression-external-wiki-url.yml

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 85248a16f50..4408cb5145a 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -328,7 +328,7 @@ module ProjectsHelper
   def external_nav_tabs(project)
     [].tap do |tabs|
       tabs << :external_issue_tracker if project.external_issue_tracker
-      tabs << :external_wiki if project.has_external_wiki?
+      tabs << :external_wiki if project.external_wiki
     end
   end
 
diff --git a/changelogs/unreleased/fj-regression-external-wiki-url.yml b/changelogs/unreleased/fj-regression-external-wiki-url.yml
new file mode 100644
index 00000000000..d4f21dab982
--- /dev/null
+++ b/changelogs/unreleased/fj-regression-external-wiki-url.yml
@@ -0,0 +1,5 @@
+---
+title: Changed external wiki query method to prevent attribute caching
+merge_request: 24907
+author:
+type: fixed
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 10f61731206..990750f0b2f 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -372,21 +372,16 @@ describe ProjectsHelper do
     end
 
     context 'when project has external wiki' do
-      before do
-        allow(project).to receive(:has_external_wiki?).and_return(true)
-      end
-
       it 'includes external wiki tab' do
+        project.create_external_wiki_service(active: true, properties: { 'external_wiki_url' => 'https://gitlab.com' })
+
         is_expected.to include(:external_wiki)
       end
     end
 
     context 'when project does not have external wiki' do
-      before do
-        allow(project).to receive(:has_external_wiki?).and_return(false)
-      end
-
       it 'does not include external wiki tab' do
+        expect(project.external_wiki).to be_nil
         is_expected.not_to include(:external_wiki)
       end
     end
-- 
GitLab