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

1 files changed, 3 insertions, 8 deletions

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