fix test assertions

hashicorp · Nov 25, 2020 · 1b5c81c · 1b5c81c
1 parent 3774f7c
commit 1b5c81c
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/ui/tests/acceptance/volumes-list-test.js b/ui/tests/acceptance/volumes-list-test.js
@@ -69,17 +69,19 @@ module('Acceptance | volumes list', function(hooks) {
 
     const volumeRow = VolumesList.volumes.objectAt(0);
 
-    const controllerHealthStr = volume.controllersHealthy > 0 ?
-      `Healthy (${volume.controllersHealthy}/${volume.controllersExpected})` :
-      volume.controllerRequired ?
-        'Unhealthy (${volume.controllersHealthy}/${volume.controllersExpected})' :
-        'Node Only';
+    let controllerHealthStr = 'Node Only';
+    if (volume.controllerRequired || volume.controllersExpected > 0) {
+      const healthy = volume.controllersHealthy;
+      const expected = volume.controllersExpected;
+      const isHealthy = healthy > 0;
+      controllerHealthStr = `${isHealthy ? 'Healthy' : 'Unhealthy'} (${healthy}/${expected})`;
+    }
 
     const nodeHealthStr = volume.nodesHealthy > 0 ? 'Healthy' : 'Unhealthy';
 
     assert.equal(volumeRow.name, volume.id);
     assert.equal(volumeRow.schedulable, volume.schedulable ? 'Schedulable' : 'Unschedulable');
-    assert.equal(volumeRow.controllerHealth, `${controllerHealthStr}`);
+    assert.equal(volumeRow.controllerHealth, controllerHealthStr);
     assert.equal(
       volumeRow.nodeHealth,
       `${nodeHealthStr} (${volume.nodesHealthy}/${volume.nodesExpected})`