From 1efdb977ae5a9afc4394cb792a76fbd7d2c1abb9 Mon Sep 17 00:00:00 2001 From: Phil Renaud Date: Fri, 13 May 2022 16:04:43 -0400 Subject: [PATCH] Tests updated to reflect namespace on links --- ui/tests/acceptance/allocation-detail-test.js | 2 +- ui/tests/acceptance/jobs-list-test.js | 4 ++-- ui/tests/acceptance/regions-test.js | 6 +++++- ui/tests/acceptance/task-detail-test.js | 2 +- ui/tests/acceptance/topology-test.js | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ui/tests/acceptance/allocation-detail-test.js b/ui/tests/acceptance/allocation-detail-test.js index 9a55aa2a9eb3..fecebd6e53e5 100644 --- a/ui/tests/acceptance/allocation-detail-test.js +++ b/ui/tests/acceptance/allocation-detail-test.js @@ -503,7 +503,7 @@ module('Acceptance | allocation detail (preemptions)', function (hooks) { await Allocation.preempter.visitJob(); assert.equal( currentURL(), - `/jobs/${preempterJob.id}`, + `/jobs/${preempterJob.id}@default`, 'Clicking the preempter job link navigates to the preempter job page' ); diff --git a/ui/tests/acceptance/jobs-list-test.js b/ui/tests/acceptance/jobs-list-test.js index 6614258ddd84..59ea143a31bc 100644 --- a/ui/tests/acceptance/jobs-list-test.js +++ b/ui/tests/acceptance/jobs-list-test.js @@ -64,7 +64,7 @@ module('Acceptance | jobs list', function (hooks) { assert.equal(jobRow.name, job.name, 'Name'); assert.notOk(jobRow.hasNamespace); - assert.equal(jobRow.link, `/ui/jobs/${job.id}`, 'Detail Link'); + assert.equal(jobRow.link, `/ui/jobs/${job.id}@default`, 'Detail Link'); assert.equal(jobRow.status, job.status, 'Status'); assert.equal(jobRow.type, typeForJob(job), 'Type'); assert.equal(jobRow.priority, job.priority, 'Priority'); @@ -78,7 +78,7 @@ module('Acceptance | jobs list', function (hooks) { await JobsList.visit(); await JobsList.jobs.objectAt(0).clickName(); - assert.equal(currentURL(), `/jobs/${job.id}`); + assert.equal(currentURL(), `/jobs/${job.id}@default`); }); test('the new job button transitions to the new job page', async function (assert) { diff --git a/ui/tests/acceptance/regions-test.js b/ui/tests/acceptance/regions-test.js index fc3ba70268fa..d81af2c08513 100644 --- a/ui/tests/acceptance/regions-test.js +++ b/ui/tests/acceptance/regions-test.js @@ -54,7 +54,11 @@ module('Acceptance | regions (only one)', function (hooks) { const jobId = JobsList.jobs.objectAt(0).id; await JobsList.jobs.objectAt(0).clickRow(); - assert.equal(currentURL(), `/jobs/${jobId}`, 'No region query param'); + assert.equal( + currentURL(), + `/jobs/${jobId}@default`, + 'No region query param' + ); await ClientsList.visit(); assert.equal(currentURL(), '/clients', 'No region query param'); diff --git a/ui/tests/acceptance/task-detail-test.js b/ui/tests/acceptance/task-detail-test.js index ab3f8c16766c..37b6c7fdead1 100644 --- a/ui/tests/acceptance/task-detail-test.js +++ b/ui/tests/acceptance/task-detail-test.js @@ -104,7 +104,7 @@ module('Acceptance | task detail', function (hooks) { await Layout.breadcrumbFor('jobs.job.index').visit(); assert.equal( currentURL(), - `/jobs/${job.id}`, + `/jobs/${job.id}@default`, 'Job breadcrumb links correctly' ); diff --git a/ui/tests/acceptance/topology-test.js b/ui/tests/acceptance/topology-test.js index 31548c338142..e4f5ba81ff45 100644 --- a/ui/tests/acceptance/topology-test.js +++ b/ui/tests/acceptance/topology-test.js @@ -184,7 +184,7 @@ module('Acceptance | topology', function (hooks) { await reset(); await Topology.allocInfoPanel.visitJob(); - assert.equal(currentURL(), `/jobs/${job.id}`); + assert.equal(currentURL(), `/jobs/${job.id}@default`); await reset();