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>2023-06-03 00:59:19 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-06-03 00:59:19 +0300
commit1385478346704d03ab9d3a9bf8ae3812cea0b6b5 (patch)
treec2b68728119200c48fbfe09bb09397d4e31659b7 /spec/frontend
parent361d9dae8bafae8c830d68d16ea0f76482ba9343 (diff)
Add latest changes from gitlab-org/security/gitlab@16-0-stable-ee
Diffstat (limited to 'spec/frontend')
-rw-r--r--spec/frontend/single_file_diff_spec.js15
1 files changed, 15 insertions, 0 deletions
diff --git a/spec/frontend/single_file_diff_spec.js b/spec/frontend/single_file_diff_spec.js
index ff2a4e31e0b..572fd3810ab 100644
--- a/spec/frontend/single_file_diff_spec.js
+++ b/spec/frontend/single_file_diff_spec.js
@@ -67,6 +67,21 @@ describe('SingleFileDiff', () => {
expect(mock.history.get.length).toBe(1);
});
+ it('ignores user-defined diff path attributes', () => {
+ setHTMLFixture(`
+ <div class="diff-file">
+ <div class="diff-content">
+ <div class="diff-viewer" data-type="simple">
+ <div class="note-text"><a data-diff-for-path="test/note/path">Test note</a></div>
+ <div data-diff-for-path="${blobDiffPath}">MOCK CONTENT</div>
+ </div>
+ </div>
+ </div>
+`);
+ const { diffForPath } = new SingleFileDiff(document.querySelector('.diff-file'));
+ expect(diffForPath).toEqual(blobDiffPath);
+ });
+
it('does not load diffs via axios for already expanded diffs', async () => {
setHTMLFixture(`
<div class="diff-file">