diff options
author | Rémy Coutable <remy@rymai.me> | 2019-02-04 17:35:53 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-02-04 17:35:53 +0000 |
commit | 7ffbfeb1f79b18b6a3a42e73d12b9680e3e3eb48 (patch) | |
tree | fc274561710241cc320e8bd92e851ef42a727d67 | |
parent | 11f9edec0cf8ac5407ebcc38a5969a664fdbcd7d (diff) | |
parent | 247bd122645175087251dda45169e38111dca52f (diff) | |
download | gitlab-ce-7ffbfeb1f79b18b6a3a42e73d12b9680e3e3eb48.tar.gz |
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
-rw-r--r-- | app/helpers/projects_helper.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/fj-regression-external-wiki-url.yml | 5 | ||||
-rw-r--r-- | spec/helpers/projects_helper_spec.rb | 11 |
3 files changed, 9 insertions, 9 deletions
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 |