Refactor allocations page as a component

hashicorp · Jul 30, 2018 · 740b6b9 · 740b6b9
1 parent 1b89375
commit 740b6b9
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 42 deletions.
diff --git a/ui/tests/acceptance/client-detail-test.js b/ui/tests/acceptance/client-detail-test.js
@@ -128,7 +128,7 @@ test('each allocation should have high-level details for the allocation', functi
   andThen(() => {
     const allocationRow = ClientDetail.allocations.objectAt(0);
 
-    assert.equal(allocationRow.id, allocation.id.split('-')[0], 'Allocation short ID');
+    assert.equal(allocationRow.shortId, allocation.id.split('-')[0], 'Allocation short ID');
     assert.equal(
       allocationRow.createTime,
       moment(allocation.createTime / 1000000).format('MM/DD HH:mm:ss'),

diff --git a/ui/tests/acceptance/job-deployments-test.js b/ui/tests/acceptance/job-deployments-test.js
@@ -232,7 +232,7 @@ test('when open, a deployment shows a list of all allocations for the deployment
       const allocation = allocations[0];
       const allocationRow = deploymentRow.allocations.objectAt(0);
 
-      assert.equal(allocationRow.id, allocation.id.split('-')[0], 'Allocation is as expected');
+      assert.equal(allocationRow.shortId, allocation.id.split('-')[0], 'Allocation is as expected');
     });
   });
 });

diff --git a/ui/tests/pages/clients/detail.js b/ui/tests/pages/clients/detail.js
@@ -9,6 +9,8 @@ import {
   visitable,
 } from 'ember-cli-page-object';
 
+import allocations from 'nomad-ui/tests/pages/components/allocations';
+
 export default create({
   visit: visitable('/clients/:id'),
 
@@ -36,22 +38,7 @@ export default create({
   eligibilityDefinition: text('[data-test-eligibility]'),
   datacenterDefinition: text('[data-test-datacenter-definition]'),
 
-  allocations: collection('[data-test-allocation]', {
-    id: text('[data-test-short-id]'),
-    createTime: text('[data-test-create-time]'),
-    modifyTime: text('[data-test-modify-time]'),
-    status: text('[data-test-client-status]'),
-    job: text('[data-test-job]'),
-    taskGroup: text('[data-test-task-group]'),
-    jobVersion: text('[data-test-job-version]'),
-    cpu: text('[data-test-cpu]'),
-    cpuTooltip: attribute('aria-label', '[data-test-cpu] .tooltip'),
-    mem: text('[data-test-mem]'),
-    memTooltip: attribute('aria-label', '[data-test-mem] .tooltip'),
-
-    visit: clickable('[data-test-short-id] a'),
-    visitJob: clickable('[data-test-job]'),
-  }),
+  ...allocations(),
 
   attributesTable: isPresent('[data-test-attributes]'),
   metaTable: isPresent('[data-test-meta]'),

diff --git a/ui/tests/pages/components/allocations.js b/ui/tests/pages/components/allocations.js
@@ -0,0 +1,30 @@
+import { attribute, collection, clickable, isPresent, text } from 'ember-cli-page-object';
+
+export default function(selector = '[data-test-allocation]') {
+  return {
+    allocations: collection(selector, {
+      id: attribute('data-test-allocation'),
+      shortId: text('[data-test-short-id]'),
+      createTime: text('[data-test-create-time]'),
+      modifyTime: text('[data-test-modify-time]'),
+      status: text('[data-test-client-status]'),
+      job: text('[data-test-job]'),
+      taskGroup: text('[data-test-task-group]'),
+      client: text('[data-test-client]'),
+      jobVersion: text('[data-test-job-version]'),
+      cpu: text('[data-test-cpu]'),
+      cpuTooltip: attribute('aria-label', '[data-test-cpu] .tooltip'),
+      mem: text('[data-test-mem]'),
+      memTooltip: attribute('aria-label', '[data-test-mem] .tooltip'),
+      rescheduled: isPresent('[data-test-indicators] [data-test-icon="reschedule"]'),
+
+      visit: clickable('[data-test-short-id] a'),
+      visitJob: clickable('[data-test-job]'),
+      visitClient: clickable('[data-test-client] a'),
+    }),
+
+    allocationFor(id) {
+      return this.allocations.toArray().find(allocation => allocation.id === id);
+    },
+  };
+}
diff --git a/ui/tests/pages/jobs/job/deployments.js b/ui/tests/pages/jobs/job/deployments.js
@@ -8,6 +8,8 @@ import {
   visitable,
 } from 'ember-cli-page-object';
 
+import allocations from 'nomad-ui/tests/pages/components/allocations';
+
 export default create({
   visit: visitable('/jobs/:id/deployments'),
 
@@ -46,9 +48,7 @@ export default create({
       progress: text('[data-test-deployment-task-group-progress-deadline]'),
     }),
 
+    ...allocations('[data-test-deployment-allocation]'),
     hasAllocations: isPresent('[data-test-deployment-allocations]'),
-    allocations: collection('[data-test-deployment-allocation]', {
-      id: text('[data-test-short-id]'),
-    }),
   }),
 });
diff --git a/ui/tests/pages/jobs/job/task-group.js b/ui/tests/pages/jobs/job/task-group.js
@@ -9,6 +9,8 @@ import {
   visitable,
 } from 'ember-cli-page-object';
 
+import allocations from 'nomad-ui/tests/pages/components/allocations';
+
 export default create({
   pageSize: 10,
 
@@ -31,27 +33,7 @@ export default create({
     return this.breadcrumbs.toArray().find(crumb => crumb.id === id);
   },
 
-  allocations: collection('[data-test-allocation]', {
-    id: attribute('data-test-allocation'),
-    shortId: text('[data-test-short-id]'),
-    createTime: text('[data-test-create-time]'),
-    modifyTime: text('[data-test-modify-time]'),
-    status: text('[data-test-client-status]'),
-    jobVersion: text('[data-test-job-version]'),
-    client: text('[data-test-client]'),
-    cpu: text('[data-test-cpu]'),
-    cpuTooltip: attribute('aria-label', '[data-test-cpu] .tooltip'),
-    mem: text('[data-test-mem]'),
-    memTooltip: attribute('aria-label', '[data-test-mem] .tooltip'),
-    rescheduled: isPresent('[data-test-indicators] [data-test-icon="reschedule"]'),
-
-    visit: clickable('[data-test-short-id] a'),
-    visitClient: clickable('[data-test-client] a'),
-  }),
-
-  allocationFor(id) {
-    return this.allocations.toArray().find(allocation => allocation.id === id);
-  },
+  ...allocations(),
 
   isEmpty: isPresent('[data-test-empty-allocations-list]'),