diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-24 18:07:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-24 18:07:28 +0300 |
commit | 8a37720edff0c74579bba2f8f985f37ed49ffa49 (patch) | |
tree | 5939d623b38cad881b10da15d8ecf9a7879d4b5d /spec/frontend/fixtures | |
parent | b4e7d9d8392d80b20acd29959c51e488220fd1e2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/fixtures')
-rw-r--r-- | spec/frontend/fixtures/api_markdown.rb | 5 | ||||
-rw-r--r-- | spec/frontend/fixtures/api_markdown.yml | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/spec/frontend/fixtures/api_markdown.rb b/spec/frontend/fixtures/api_markdown.rb index d2497a571e4..94db262e4fd 100644 --- a/spec/frontend/fixtures/api_markdown.rb +++ b/spec/frontend/fixtures/api_markdown.rb @@ -12,10 +12,8 @@ RSpec.describe API::MergeRequests, '(JavaScript fixtures)', type: :request do let_it_be(:group) { create(:group, :public) } let_it_be(:project) { create(:project, :public, :repository, group: group) } - let_it_be(:group_wiki) { create(:group_wiki, user: user) } let_it_be(:project_wiki) { create(:project_wiki, user: user) } - let(:group_wiki_page) { create(:wiki_page, wiki: group_wiki) } let(:project_wiki_page) { create(:wiki_page, wiki: project_wiki) } fixture_subdir = 'api/markdown' @@ -28,7 +26,6 @@ RSpec.describe API::MergeRequests, '(JavaScript fixtures)', type: :request do end before do - stub_group_wikis(true) sign_in(user) end @@ -55,8 +52,6 @@ RSpec.describe API::MergeRequests, '(JavaScript fixtures)', type: :request do "/groups/#{group.full_path}/preview_markdown" when 'project_wiki' "/#{project.full_path}/-/wikis/#{project_wiki_page.slug}/preview_markdown" - when 'group_wiki' - "/groups/#{group.full_path}/-/wikis/#{group_wiki_page.slug}/preview_markdown" else api "/markdown" end diff --git a/spec/frontend/fixtures/api_markdown.yml b/spec/frontend/fixtures/api_markdown.yml index 421b87c6840..e660a99a2e7 100644 --- a/spec/frontend/fixtures/api_markdown.yml +++ b/spec/frontend/fixtures/api_markdown.yml @@ -21,9 +21,6 @@ context: project markdown: '[test-file](/uploads/aa45a38ec2cfe97433281b10bbff042c/test-file.zip)' - name: attachment_link - context: group_wiki - markdown: '[test-file](test-file.zip)' -- name: attachment_link context: group markdown: '[test-file](/uploads/aa45a38ec2cfe97433281b10bbff042c/test-file.zip)' - name: code_block |