Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-16 21:18:33 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-16 21:18:33 +0300
commitf64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch)
treea2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /spec/frontend/diffs/utils
parentbfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff)
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'spec/frontend/diffs/utils')
-rw-r--r--spec/frontend/diffs/utils/file_reviews_spec.js10
-rw-r--r--spec/frontend/diffs/utils/preferences_spec.js35
2 files changed, 19 insertions, 26 deletions
diff --git a/spec/frontend/diffs/utils/file_reviews_spec.js b/spec/frontend/diffs/utils/file_reviews_spec.js
index a58c19a7245..230ec12409c 100644
--- a/spec/frontend/diffs/utils/file_reviews_spec.js
+++ b/spec/frontend/diffs/utils/file_reviews_spec.js
@@ -49,11 +49,11 @@ describe('File Review(s) utilities', () => {
it.each`
mrReviews | files | fileReviews
- ${{}} | ${[file1, file2]} | ${[false, false]}
- ${{ abc: ['123'] }} | ${[file1, file2]} | ${[true, false]}
- ${{ abc: ['098'] }} | ${[file1, file2]} | ${[false, true]}
- ${{ def: ['123'] }} | ${[file1, file2]} | ${[false, false]}
- ${{ abc: ['123'], def: ['098'] }} | ${[]} | ${[]}
+ ${{}} | ${[file1, file2]} | ${{ 123: false, '098': false }}
+ ${{ abc: ['123'] }} | ${[file1, file2]} | ${{ 123: true, '098': false }}
+ ${{ abc: ['098'] }} | ${[file1, file2]} | ${{ 123: false, '098': true }}
+ ${{ def: ['123'] }} | ${[file1, file2]} | ${{ 123: false, '098': false }}
+ ${{ abc: ['123'], def: ['098'] }} | ${[]} | ${{}}
`(
'returns $fileReviews based on the diff files in state and the existing reviews $reviews',
({ mrReviews, files, fileReviews }) => {
diff --git a/spec/frontend/diffs/utils/preferences_spec.js b/spec/frontend/diffs/utils/preferences_spec.js
index b09db2c1003..2dcc71dc188 100644
--- a/spec/frontend/diffs/utils/preferences_spec.js
+++ b/spec/frontend/diffs/utils/preferences_spec.js
@@ -5,32 +5,25 @@ import {
DIFF_VIEW_ALL_FILES,
} from '~/diffs/constants';
import { fileByFile } from '~/diffs/utils/preferences';
-import { getParameterValues } from '~/lib/utils/url_utility';
-
-jest.mock('~/lib/utils/url_utility');
describe('diffs preferences', () => {
describe('fileByFile', () => {
+ afterEach(() => {
+ Cookies.remove(DIFF_FILE_BY_FILE_COOKIE_NAME);
+ });
+
it.each`
- result | preference | cookie | searchParam
- ${false} | ${false} | ${undefined} | ${undefined}
- ${true} | ${true} | ${undefined} | ${undefined}
- ${true} | ${false} | ${DIFF_VIEW_FILE_BY_FILE} | ${undefined}
- ${false} | ${true} | ${DIFF_VIEW_ALL_FILES} | ${undefined}
- ${true} | ${false} | ${undefined} | ${[DIFF_VIEW_FILE_BY_FILE]}
- ${false} | ${true} | ${undefined} | ${[DIFF_VIEW_ALL_FILES]}
- ${true} | ${false} | ${DIFF_VIEW_FILE_BY_FILE} | ${[DIFF_VIEW_FILE_BY_FILE]}
- ${true} | ${true} | ${DIFF_VIEW_ALL_FILES} | ${[DIFF_VIEW_FILE_BY_FILE]}
- ${false} | ${false} | ${DIFF_VIEW_ALL_FILES} | ${[DIFF_VIEW_ALL_FILES]}
- ${false} | ${true} | ${DIFF_VIEW_FILE_BY_FILE} | ${[DIFF_VIEW_ALL_FILES]}
+ result | preference | cookie
+ ${true} | ${false} | ${DIFF_VIEW_FILE_BY_FILE}
+ ${false} | ${true} | ${DIFF_VIEW_ALL_FILES}
+ ${true} | ${false} | ${DIFF_VIEW_FILE_BY_FILE}
+ ${false} | ${true} | ${DIFF_VIEW_ALL_FILES}
+ ${false} | ${false} | ${DIFF_VIEW_ALL_FILES}
+ ${true} | ${true} | ${DIFF_VIEW_FILE_BY_FILE}
`(
- 'should return $result when { preference: $preference, cookie: $cookie, search: $searchParam }',
- ({ result, preference, cookie, searchParam }) => {
- if (cookie) {
- Cookies.set(DIFF_FILE_BY_FILE_COOKIE_NAME, cookie);
- }
-
- getParameterValues.mockReturnValue(searchParam);
+ 'should return $result when { preference: $preference, cookie: $cookie }',
+ ({ result, preference, cookie }) => {
+ Cookies.set(DIFF_FILE_BY_FILE_COOKIE_NAME, cookie);
expect(fileByFile(preference)).toBe(result);
},