diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/features/projects/wiki | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/features/projects/wiki')
-rw-r--r-- | spec/features/projects/wiki/user_views_wiki_empty_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/spec/features/projects/wiki/user_views_wiki_empty_spec.rb b/spec/features/projects/wiki/user_views_wiki_empty_spec.rb index 1f460f39267..ea045ddb6a1 100644 --- a/spec/features/projects/wiki/user_views_wiki_empty_spec.rb +++ b/spec/features/projects/wiki/user_views_wiki_empty_spec.rb @@ -75,7 +75,7 @@ RSpec.describe 'Project > User views empty wiki' do context 'and Confluence is already enabled' do before do - create(:confluence_service, project: project) + create(:confluence_integration, project: project) end it_behaves_like 'empty wiki message', writable: true, issuable: true, confluence: false diff --git a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb index 30b94495e3d..63ee89bd11f 100644 --- a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb +++ b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb @@ -3,15 +3,12 @@ require 'spec_helper' RSpec.describe 'Projects > Wiki > User views wiki in project page' do - let(:user) { create(:user) } - before do - project.add_maintainer(user) - sign_in(user) + sign_in(project.owner) end context 'when repository is disabled for project' do - let(:project) do + let_it_be(:project) do create(:project, :wiki_repo, :repository_disabled, |