diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /spec/frontend_integration/test_helpers/mock_server/index.js | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/frontend_integration/test_helpers/mock_server/index.js')
-rw-r--r-- | spec/frontend_integration/test_helpers/mock_server/index.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/frontend_integration/test_helpers/mock_server/index.js b/spec/frontend_integration/test_helpers/mock_server/index.js index 2aebdefaafb..20cb441daa7 100644 --- a/spec/frontend_integration/test_helpers/mock_server/index.js +++ b/spec/frontend_integration/test_helpers/mock_server/index.js @@ -4,6 +4,8 @@ import { getEmptyProject, getBranch, getMergeRequests, + getMergeRequestWithChanges, + getMergeRequestVersions, getRepositoryFiles, getBlobReadme, getBlobImage, @@ -16,6 +18,8 @@ export const createMockServerOptions = () => ({ project: Model, branch: Model, mergeRequest: Model, + mergeRequestChange: Model, + mergeRequestVersion: Model, file: Model, userPermission: Model, }, @@ -30,6 +34,8 @@ export const createMockServerOptions = () => ({ projects: [getProject(), getEmptyProject()], branches: [getBranch()], mergeRequests: getMergeRequests(), + mergeRequestChanges: [getMergeRequestWithChanges()], + mergeRequestVersions: getMergeRequestVersions(), filesRaw: [ { raw: getBlobReadme(), |