From 93eaaab77e4bfb1ef69fe468e3c5de4964d44777 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Fri, 6 Dec 2019 23:45:00 -0800 Subject: [PATCH] New test coverage for the drain capabilities --- ui/app/adapters/node.js | 2 +- ui/app/templates/clients/client.hbs | 1 + ui/app/templates/components/drain-popover.hbs | 12 +- ui/tests/acceptance/client-detail-test.js | 344 +++++++++++++++++- ui/tests/pages/clients/detail.js | 24 +- ui/tests/unit/adapters/node-test.js | 4 +- 6 files changed, 372 insertions(+), 15 deletions(-) diff --git a/ui/app/adapters/node.js b/ui/app/adapters/node.js index 51da5b6bd..d541d70ad 100644 --- a/ui/app/adapters/node.js +++ b/ui/app/adapters/node.js @@ -42,7 +42,7 @@ export default Watchable.extend({ return this.drain( node, Object.assign({}, drainSpec, { - Deadline: -1000 * 1000000, + Deadline: -1, }) ); }, diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs index 94d98a117..0ef78793e 100644 --- a/ui/app/templates/clients/client.hbs +++ b/ui/app/templates/clients/client.hbs @@ -110,6 +110,7 @@
{{#if model.isDraining}} {{two-step-button + data-test-drain-stop idleText="Stop Drain" cancelText="Cancel" confirmText="Yes, Stop" diff --git a/ui/app/templates/components/drain-popover.hbs b/ui/app/templates/components/drain-popover.hbs index 176ff00f4..e900c928e 100644 --- a/ui/app/templates/components/drain-popover.hbs +++ b/ui/app/templates/components/drain-popover.hbs @@ -1,8 +1,8 @@ {{#popover-menu data-test-drain-popover - label=(if client.isDraining "Update" "Drain") + label=(if client.isDraining "Update Drain" "Drain") triggerClass=(concat "is-small " (if drain.isRunning "is-loading")) as |m|}} -
+

Drain Options