Revert "ui: update pull request icons (#4455)" (partial)
This reverts commit 8e56f61d0f.
Refs: https://codeberg.org/forgejo/discussions/issues/192
This commit is contained in:
Earl Warren
parent
a0676486dd
commit
c349da723c
2 changed files with 25 additions and 408 deletions
|
|
@ -1,166 +1,39 @@
|
|||
// Copyright 2024 The Forgejo Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import {flushPromises, mount} from '@vue/test-utils';
|
||||
import {mount, flushPromises} from '@vue/test-utils';
|
||||
import ContextPopup from './ContextPopup.vue';
|
||||
|
||||
async function assertPopup(popupData, expectedIconColor, expectedIcon) {
|
||||
const date = new Date('2024-07-13T22:00:00Z');
|
||||
|
||||
test('renders a issue info popup', async () => {
|
||||
const owner = 'user2';
|
||||
const repo = 'repo1';
|
||||
const index = 1;
|
||||
vi.spyOn(global, 'fetch').mockResolvedValue({
|
||||
json: vi.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
created_at: date.toISOString(),
|
||||
repository: {full_name: 'user2/repo1'},
|
||||
...popupData,
|
||||
}),
|
||||
ok: true,
|
||||
});
|
||||
|
||||
const popup = mount(ContextPopup);
|
||||
popup.vm.$el.dispatchEvent(new CustomEvent('ce-load-context-popup', {
|
||||
detail: {owner: 'user2', repo: 'repo1', index: popupData.number},
|
||||
}));
|
||||
await flushPromises();
|
||||
|
||||
expect(popup.get('p:nth-of-type(1)').text()).toEqual(`user2/repo1 on ${date.toLocaleDateString(undefined, {year: 'numeric', month: 'short', day: 'numeric'})}`);
|
||||
expect(popup.get('p:nth-of-type(2)').text()).toEqual(`${popupData.title} #${popupData.number}`);
|
||||
expect(popup.get('p:nth-of-type(3)').text()).toEqual(popupData.body);
|
||||
|
||||
expect(popup.get('svg').classes()).toContain(expectedIcon);
|
||||
expect(popup.get('svg').classes()).toContain(expectedIconColor);
|
||||
|
||||
for (const l of popupData.labels) {
|
||||
expect(popup.findAll('.ui.label').map((x) => x.text())).toContain(l.name);
|
||||
}
|
||||
}
|
||||
|
||||
test('renders an open issue popup', async () => {
|
||||
await assertPopup({
|
||||
title: 'Open Issue',
|
||||
body: 'Open Issue Body',
|
||||
number: 1,
|
||||
labels: [{color: 'd21b1fff', name: 'Bug'}, {color: 'aaff00', name: 'Confirmed'}],
|
||||
state: 'open',
|
||||
pull_request: null,
|
||||
}, 'green', 'octicon-issue-opened');
|
||||
});
|
||||
|
||||
test('renders a closed issue popup', async () => {
|
||||
await assertPopup({
|
||||
title: 'Closed Issue',
|
||||
body: 'Closed Issue Body',
|
||||
number: 1,
|
||||
labels: [{color: 'd21b1fff', name: 'Bug'}, {color: 'aaff00', name: 'Confirmed'}],
|
||||
state: 'closed',
|
||||
pull_request: null,
|
||||
}, 'red', 'octicon-issue-closed');
|
||||
});
|
||||
|
||||
test('renders an open PR popup', async () => {
|
||||
await assertPopup({
|
||||
title: 'Open PR',
|
||||
body: 'Open PR Body',
|
||||
number: 1,
|
||||
labels: [{color: 'd21b1fff', name: 'Bug'}, {color: 'aaff00', name: 'Confirmed'}],
|
||||
state: 'open',
|
||||
pull_request: {merged: false, draft: false},
|
||||
}, 'green', 'octicon-git-pull-request');
|
||||
});
|
||||
|
||||
test('renders an open WIP PR popup', async () => {
|
||||
await assertPopup({
|
||||
title: 'WIP: Open PR',
|
||||
body: 'WIP Open PR Body',
|
||||
number: 1,
|
||||
labels: [{color: 'd21b1fff', name: 'Bug'}, {color: 'aaff00', name: 'Confirmed'}],
|
||||
state: 'open',
|
||||
pull_request: {merged: false, draft: true},
|
||||
}, 'grey', 'octicon-git-pull-request-draft');
|
||||
});
|
||||
|
||||
test('renders a closed PR popup', async () => {
|
||||
await assertPopup({
|
||||
title: 'Closed PR',
|
||||
body: 'Closed PR Body',
|
||||
number: 1,
|
||||
labels: [{color: 'd21b1fff', name: 'Bug'}, {color: 'aaff00', name: 'Confirmed'}],
|
||||
state: 'closed',
|
||||
pull_request: {merged: false, draft: false},
|
||||
}, 'red', 'octicon-git-pull-request-closed');
|
||||
});
|
||||
|
||||
test('renders a closed WIP PR popup', async () => {
|
||||
await assertPopup({
|
||||
title: 'WIP: Closed PR',
|
||||
body: 'WIP Closed PR Body',
|
||||
number: 1,
|
||||
labels: [{color: 'd21b1fff', name: 'Bug'}, {color: 'aaff00', name: 'Confirmed'}],
|
||||
state: 'closed',
|
||||
pull_request: {merged: false, draft: true},
|
||||
}, 'red', 'octicon-git-pull-request-closed');
|
||||
});
|
||||
|
||||
test('renders a merged PR popup', async () => {
|
||||
await assertPopup({
|
||||
title: 'Merged PR',
|
||||
body: 'Merged PR Body',
|
||||
number: 1,
|
||||
labels: [{color: 'd21b1fff', name: 'Bug'}, {color: 'aaff00', name: 'Confirmed'}],
|
||||
state: 'closed',
|
||||
pull_request: {merged: true, draft: false},
|
||||
}, 'purple', 'octicon-git-merge');
|
||||
});
|
||||
|
||||
test('renders an issue popup with escaped HTML', async () => {
|
||||
const evil = '<a class="evil">evil link</a>';
|
||||
|
||||
vi.spyOn(global, 'fetch').mockResolvedValue({
|
||||
json: vi.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
created_at: '2024-07-13T22:00:00Z',
|
||||
repository: {full_name: evil},
|
||||
title: evil,
|
||||
body: evil,
|
||||
labels: [{color: '000666', name: evil}],
|
||||
state: 'open',
|
||||
created_at: '2023-09-30T19:00:00Z',
|
||||
repository: {full_name: owner},
|
||||
pull_request: null,
|
||||
}),
|
||||
ok: true,
|
||||
});
|
||||
|
||||
const popup = mount(ContextPopup);
|
||||
popup.vm.$el.dispatchEvent(new CustomEvent('ce-load-context-popup', {
|
||||
detail: {owner: evil, repo: evil, index: 1},
|
||||
}));
|
||||
await flushPromises();
|
||||
|
||||
expect(() => popup.get('.evil')).toThrowError();
|
||||
expect(popup.get('p:nth-of-type(1)').text()).toContain(evil);
|
||||
expect(popup.get('p:nth-of-type(2)').text()).toContain(evil);
|
||||
expect(popup.get('p:nth-of-type(3)').text()).toContain(evil);
|
||||
});
|
||||
|
||||
test('renders an issue popup with emojis', async () => {
|
||||
vi.spyOn(global, 'fetch').mockResolvedValue({
|
||||
json: vi.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
created_at: '2024-07-13T22:00:00Z',
|
||||
repository: {full_name: 'user2/repo1'},
|
||||
title: 'Title',
|
||||
body: 'Body',
|
||||
labels: [{color: '000666', name: 'Tag :+1:'}],
|
||||
state: 'open',
|
||||
pull_request: null,
|
||||
title: 'Normal issue',
|
||||
body: 'Lorem ipsum...',
|
||||
number: index,
|
||||
labels: [{color: 'ee0701', name: "Bug :+1: <script class='evil'>alert('Oh no!');</script>"}],
|
||||
}),
|
||||
ok: true,
|
||||
});
|
||||
|
||||
const popup = mount(ContextPopup);
|
||||
popup.vm.$el.dispatchEvent(new CustomEvent('ce-load-context-popup', {
|
||||
detail: {owner: 'user2', repo: 'repo1', index: 1},
|
||||
}));
|
||||
const wrapper = mount(ContextPopup);
|
||||
wrapper.vm.$el.dispatchEvent(new CustomEvent('ce-load-context-popup', {detail: {owner, repo, index}}));
|
||||
await flushPromises();
|
||||
|
||||
expect(popup.get('.ui.label').text()).toEqual('Tag 👍');
|
||||
// Header
|
||||
expect(wrapper.get('p:nth-of-type(1)').text()).toEqual('user2 on Sep 30, 2023');
|
||||
// Title
|
||||
expect(wrapper.get('p:nth-of-type(2)').text()).toEqual('Normal issue #1');
|
||||
// Body
|
||||
expect(wrapper.get('p:nth-of-type(3)').text()).toEqual('Lorem ipsum...');
|
||||
// Check that the state is correct.
|
||||
expect(wrapper.get('svg').classes()).toContain('octicon-issue-opened');
|
||||
// Ensure that script is not an element.
|
||||
expect(() => wrapper.get('.evil')).toThrowError();
|
||||
// Check content of label
|
||||
expect(wrapper.get('.ui.label').text()).toContain("Bug 👍 <script class='evil'>alert('Oh no!');</script>");
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue