Skip to content

fix(3485): v1 -> v2 event redirects navigate to the wrong event in the UI #1571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sagar1312 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(3485): v1 -> v2 event redirects navigate to the wrong event in the UI #1571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/pipeline/events/route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ export default Route.extend({
return;
}

this.replaceWith('v2.pipeline.events', pipeline.id);
const { event_id: eventId } = this.paramsFor('pipeline.events.show');

if (eventId) {
this.replaceWith('v2.pipeline.events.show', pipeline.id, eventId);
} else {
this.replaceWith('v2.pipeline.events', pipeline.id);
}
},
setupController(controller, model = {}) {
this._super(controller, model);
Expand Down
7 changes: 7 additions & 0 deletions tests/acceptance/pipeline/events/events-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ module('Acceptance | pipelines/:id/events', hooks => {
setupApplicationTest(hooks);

const BASE_URL = `/v2/pipelines/${PIPELINE_ID}/events`;
const V1_BASE_URL = `/pipelines/${PIPELINE_ID}/events`;

test('visiting /pipelines/:id/events/:eventId redirects to the same event in v2', async assert => {
await visit(`${V1_BASE_URL}/${DEFAULT_EVENT_ID}`);

assert.strictEqual(currentURL(), `${BASE_URL}/${DEFAULT_EVENT_ID}`);
});

test('visiting /pipelines/:id/events requires being logged in', async assert => {
await invalidateSession();
Expand Down