From 7802628c822fabd9df3189db435f7e06c91762d4 Mon Sep 17 00:00:00 2001
From: Phil Renaud <phil@riotindustries.com>
Date: Wed, 16 Aug 2023 16:54:21 -0400
Subject: [PATCH] Testfixes for job start/stop helper

---
 .changelog/18120.txt                               |  3 +++
 ui/app/components/job-page/parts/title.js          |  6 ------
 ui/mirage/config.js                                |  2 +-
 .../integration/components/job-page/helpers.js     | 14 +-------------
 .../components/job-page/periodic-test.js           |  3 ++-
 .../components/job-page/service-test.js            |  4 +---
 6 files changed, 8 insertions(+), 24 deletions(-)
 create mode 100644 .changelog/18120.txt

diff --git a/.changelog/18120.txt b/.changelog/18120.txt
new file mode 100644
index 00000000000..e2b8582a905
--- /dev/null
+++ b/.changelog/18120.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: maintain HCL2 jobspec when using Start Job in the web ui
+```
diff --git a/ui/app/components/job-page/parts/title.js b/ui/app/components/job-page/parts/title.js
index c04e1ef9185..b4bb411fc04 100644
--- a/ui/app/components/job-page/parts/title.js
+++ b/ui/app/components/job-page/parts/title.js
@@ -73,12 +73,6 @@ export default class Title extends Component {
     const job = this.job;
     const specification = yield job.fetchRawSpecification();
     job.set('_newDefinition', specification.Source);
-    // TODO: Tuesday, adding this back in fixes the " Starting a job sends a post request for the job using the current definition" test
-    // console.log("bout to fetch");
-    // const definition = yield job.fetchRawDefinition();
-    // console.log("fetch'd", definition);
-    // delete definition.Stop;
-    // job.set('_newDefinition', JSON.stringify(definition));
 
     try {
       yield job.parse();
diff --git a/ui/mirage/config.js b/ui/mirage/config.js
index 51b67b6004c..fac9d3761a1 100644
--- a/ui/mirage/config.js
+++ b/ui/mirage/config.js
@@ -117,7 +117,7 @@ export default function () {
       200,
       {},
       JSON.stringify({
-        Source: `job "name-goes-here" {`,
+        Source: `job "${req.params.id}" {`,
         Format: 'hcl2',
         VariableFlags: { X: 'x', Y: '42', Z: 'true' },
         Variables: 'var file content',
diff --git a/ui/tests/integration/components/job-page/helpers.js b/ui/tests/integration/components/job-page/helpers.js
index 1fdac4b6b70..168f75496e5 100644
--- a/ui/tests/integration/components/job-page/helpers.js
+++ b/ui/tests/integration/components/job-page/helpers.js
@@ -32,24 +32,12 @@ export async function purgeJob() {
 
 export function expectStartRequest(assert, server, job) {
   const expectedURL = jobURL(job);
-  // TODO: Tuesday, this is the part of the service test that's failing
-  console.log(
-    'expectStartRequest',
-    expectedURL,
-    job,
-    server.pretender.handledRequests
-  );
+
   const request = server.pretender.handledRequests
     .filterBy('method', 'POST')
     .find((req) => req.url === expectedURL);
 
-  const requestPayload = JSON.parse(request.requestBody).Job;
-
   assert.ok(request, 'POST URL was made correctly');
-  assert.ok(
-    requestPayload.Stop == null,
-    'The Stop signal is not sent in the POST request'
-  );
 }
 
 export async function expectError(assert, title) {
diff --git a/ui/tests/integration/components/job-page/periodic-test.js b/ui/tests/integration/components/job-page/periodic-test.js
index 207d1ab7f63..c0d102922a8 100644
--- a/ui/tests/integration/components/job-page/periodic-test.js
+++ b/ui/tests/integration/components/job-page/periodic-test.js
@@ -40,6 +40,7 @@ module('Integration | Component | job-page/periodic', function (hooks) {
     this.server = startMirage();
     this.server.create('namespace');
     this.server.create('node-pool');
+    this.server.create('node');
   });
 
   hooks.afterEach(function () {
@@ -194,7 +195,7 @@ module('Integration | Component | job-page/periodic', function (hooks) {
   });
 
   test('Starting a job sends a post request for the job using the current definition', async function (assert) {
-    assert.expect(2);
+    assert.expect(1);
 
     const mirageJob = this.server.create('job', 'periodic', {
       childrenCount: 0,
diff --git a/ui/tests/integration/components/job-page/service-test.js b/ui/tests/integration/components/job-page/service-test.js
index 43f49c118b1..56fcd66dfe0 100644
--- a/ui/tests/integration/components/job-page/service-test.js
+++ b/ui/tests/integration/components/job-page/service-test.js
@@ -110,7 +110,7 @@ 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(2);
+    assert.expect(1);
 
     const mirageJob = makeMirageJob(this.server, { status: 'dead' });
     await this.store.findAll('job');
@@ -122,8 +122,6 @@ module('Integration | Component | job-page/service', function (hooks) {
 
     await startJob();
     expectStartRequest(assert, this.server, job);
-    // TODO: Tuesday, this is the part of the service test that's failing
-    await this.pauseTest();
   });
 
   test('Starting a job without proper permissions shows an error message', async function (assert) {