Commit de25e22c authored by Peter Hegman's avatar Peter Hegman

Merge branch '354681-group-import-history-incorrect-new-group-url' into 'master'

Fix incorrect new group url in import history

See merge request gitlab-org/gitlab!83491
parents dbb6b275 6b307488
...@@ -111,7 +111,7 @@ export default { ...@@ -111,7 +111,7 @@ export default {
}, },
getFullDestinationUrl(params) { getFullDestinationUrl(params) {
return joinPaths(gon.relative_url_root || '', this.getDestinationUrl(params)); return joinPaths(gon.relative_url_root || '', '/', this.getDestinationUrl(params));
}, },
}, },
......
...@@ -137,6 +137,16 @@ describe('BulkImportsHistoryApp', () => { ...@@ -137,6 +137,16 @@ describe('BulkImportsHistoryApp', () => {
); );
}); });
it('renders correct url for destination group when relative_url is empty', async () => {
mock.onGet(API_URL).reply(200, DUMMY_RESPONSE, DEFAULT_HEADERS);
createComponent({ shallow: false });
await axios.waitForAll();
expect(wrapper.find('tbody tr a').attributes().href).toBe(
`/${DUMMY_RESPONSE[0].destination_namespace}/${DUMMY_RESPONSE[0].destination_name}`,
);
});
describe('details button', () => { describe('details button', () => {
beforeEach(() => { beforeEach(() => {
mock.onGet(API_URL).reply(200, DUMMY_RESPONSE, DEFAULT_HEADERS); mock.onGet(API_URL).reply(200, DUMMY_RESPONSE, DEFAULT_HEADERS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment