[ui, tests] Various acceptance test fixups

ui/mirage/factories/job.js

@@ -175,6 +175,9 @@ export default Factory.extend({
   // When true, the job will have no versions or deployments (and in turn no latest deployment)
   noDeployments: false,
 
+  // When true, the job will have a previous stable version. Useful for testing "start job" loop.
+  withPreviousStableVersion: false,
+
   // When true, an evaluation with a high modify index and placement failures is created
   failedPlacements: false,
 
@@ -317,8 +320,20 @@ export default Factory.extend({
             version: index,
             noActiveDeployment: job.noActiveDeployment,
             activeDeployment: job.activeDeployment,
+            stable: true,
           });
         });
+
+      if (job.withPreviousStableVersion) {
+        server.create('job-version', {
+          job,
+          namespace: job.namespace,
+          version: 1,
+          noActiveDeployment: job.noActiveDeployment,
+          activeDeployment: job.activeDeployment,
+          stable: true,
+        });
+      }
     }
 
     if (job.activeDeployment) {

ui/tests/acceptance/job-detail-test.js

@@ -27,6 +27,7 @@
     allocStatusDistribution: {
       running: 1,
     },
+    withPreviousStableVersion: true,
   })
 );
 
@@ -39,6 +40,7 @@
     allocStatusDistribution: {
       running: 1,
     },
+    withPreviousStableVersion: true,
   })
 );
 
@@ -52,6 +54,7 @@
       running: 1,
       failed: 1,
     },
+    withPreviousStableVersion: true,
   })
 );
 
@@ -65,6 +68,7 @@
       type: 'sysbatch',
       createAllocations: false,
       noActiveDeployment: true,
+      withPreviousStableVersion: true,
     });
   }
 );
@@ -80,6 +84,7 @@
       namespaceId: namespace.name,
       createAllocations: false,
       noActiveDeployment: true,
+      withPreviousStableVersion: true,
     });
   }
 );
@@ -95,6 +100,7 @@
       namespaceId: namespace.name,
       createAllocations: false,
       noActiveDeployment: true,
+      withPreviousStableVersion: true,
     });
   }
 );
@@ -109,6 +115,7 @@
       running: 1,
     },
     noActiveDeployment: true,
+    withPreviousStableVersion: true,
   });
   return server.db.jobs.where({ parentId: parent.id })[0];
 });
@@ -212,6 +219,7 @@
     server.create('job', 'parameterized', {
       shallow: true,
       noActiveDeployment: true,
+      withPreviousStableVersion: true,
     }),
   {
     'the default sort is submitTime descending': async (job, assert) => {
@@ -292,7 +300,7 @@
 moduleForJob(
   'Acceptance | job detail (service)',
   'allocations',
-  () => server.create('job', { type: 'service', noActiveDeployment: true }),
+  () => server.create('job', { type: 'service', noActiveDeployment: true, withPreviousStableVersion: true }),
   {
     'the subnav links to deployment': async (job, assert) => {
       await JobDetail.tabFor('deployments').visit();

ui/tests/acceptance/task-logs-test.js

@@ -62,9 +62,8 @@
 
   test('the stdout log immediately starts streaming', async function (assert) {
     await TaskLogs.visit({ id: allocation.id, name: task.name });
-    const node = server.db.nodes.find(allocation.nodeId);
     const logUrlRegex = new RegExp(
-      `${node.httpAddr}/v1/client/fs/logs/${allocation.id}`
+      `/v1/client/fs/logs/${allocation.id}`
     );
     assert.ok(
       server.pretender.handledRequests.filter((req) =>

ui/tests/helpers/module-for-job.js

@@ -92,7 +92,11 @@ export default function moduleForJob(
 
     test('the title buttons are dependent on job status', async function (assert) {
       if (job.status === 'dead') {
-        assert.ok(JobDetail.start.isPresent);
+        if (job.stopped) {
+          assert.ok(JobDetail.start.isPresent);
+        } else {
+          assert.ok(JobDetail.revert.isPresent);
+        }
         assert.ok(JobDetail.purge.isPresent);
         assert.notOk(JobDetail.stop.isPresent);
         assert.notOk(JobDetail.execButton.isPresent);

ui/tests/integration/components/job-page/periodic-test.js

@@ -202,6 +202,8 @@ module('Integration | Component | job-page/periodic', function (hooks) {
       childrenCount: 0,
       createAllocations: false,
       status: 'dead',
+      withPreviousStableVersion: true,
+      stopped: true,
     });
     await this.store.findAll('job');
 
@@ -223,6 +225,8 @@ module('Integration | Component | job-page/periodic', function (hooks) {
       childrenCount: 0,
       createAllocations: false,
       status: 'dead',
+      withPreviousStableVersion: true,
+      stopped: true,
     });
     await this.store.findAll('job');
 
@@ -243,6 +247,8 @@ module('Integration | Component | job-page/periodic', function (hooks) {
       childrenCount: 0,
       createAllocations: false,
       status: 'dead',
+      withPreviousStableVersion: true,
+      stopped: true,
     });
     await this.store.findAll('job');
 

ui/tests/integration/components/job-page/service-test.js

@@ -112,7 +112,11 @@ module('Integration | Component | job-page/service', function (hooks) {
   test('Starting a job sends a post request for the job using the current definition', async function (assert) {
     assert.expect(1);
 
-    const mirageJob = makeMirageJob(this.server, { status: 'dead' });
+    const mirageJob = makeMirageJob(this.server, {
+      status: 'dead',
+      withPreviousStableVersion: true,
+      stopped: true,
+    });
     await this.store.findAll('job');
 
     const job = this.store.peekAll('job').findBy('plainId', mirageJob.id);
@@ -129,7 +133,11 @@ module('Integration | Component | job-page/service', function (hooks) {
 
     this.server.pretender.post('/v1/job/:id', () => [403, {}, '']);
 
-    const mirageJob = makeMirageJob(this.server, { status: 'dead' });
+    const mirageJob = makeMirageJob(this.server, {
+      status: 'dead',
+      withPreviousStableVersion: true,
+      stopped: true,
+    });
     await this.store.findAll('job');
 
     const job = this.store.peekAll('job').findBy('plainId', mirageJob.id);
@@ -144,7 +152,10 @@ module('Integration | Component | job-page/service', function (hooks) {
   test('Purging a job sends a purge request for the job', async function (assert) {
     assert.expect(1);
 
-    const mirageJob = makeMirageJob(this.server, { status: 'dead' });
+    const mirageJob = makeMirageJob(this.server, {
+      status: 'dead',
+      withPreviousStableVersion: true,
+    });
     await this.store.findAll('job');
 
     const job = this.store.peekAll('job').findBy('plainId', mirageJob.id);