diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs index 915e13373..882a76b20 100644 --- a/ui/app/templates/jobs/job/task-group.hbs +++ b/ui/app/templates/jobs/job/task-group.hbs @@ -147,16 +147,16 @@ - {{else}} -
-
- Recent Scaling Events -
-
- -
-
{{/if}} + +
+
+ Recent Scaling Events +
+
+ +
+
{{/if}} {{#if this.model.volumes.length}} diff --git a/ui/tests/acceptance/task-group-detail-test.js b/ui/tests/acceptance/task-group-detail-test.js index 82d42fd72..88c324dbe 100644 --- a/ui/tests/acceptance/task-group-detail-test.js +++ b/ui/tests/acceptance/task-group-detail-test.js @@ -455,7 +455,7 @@ module('Acceptance | task group detail', function(hooks) { }); }); - test('when a task group has at least two count scaling events and the count scaling events outnumber the non-count scaling events, a timeline is shown instead of an accordion', async function(assert) { + test('when a task group has at least two count scaling events and the count scaling events outnumber the non-count scaling events, a timeline is shown in addition to the accordion', async function(assert) { const taskGroupScale = job.jobScale.taskGroupScales.models.find(m => m.name === taskGroup.name); taskGroupScale.update({ events: [ @@ -473,7 +473,7 @@ module('Acceptance | task group detail', function(hooks) { const scaleEvents = taskGroupScale.events.models.sortBy('time').reverse(); await TaskGroup.visit({ id: job.id, name: taskGroup.name }); - assert.notOk(TaskGroup.hasScaleEvents); + assert.ok(TaskGroup.hasScaleEvents); assert.ok(TaskGroup.hasScalingTimeline); assert.equal(