From 5586b5c6450f7e26b72b3844c592f6e36c165863 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Wed, 25 Jul 2018 17:11:20 -0400 Subject: [PATCH 1/2] improve test stability for inventory copy and credentials form --- .../test/e2e/tests/test-credentials-add-edit-machine.js | 8 ++++++-- awx/ui/test/e2e/tests/test-inventories-list-actions.js | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/awx/ui/test/e2e/tests/test-credentials-add-edit-machine.js b/awx/ui/test/e2e/tests/test-credentials-add-edit-machine.js index 68507171b0..2912a0d2ab 100644 --- a/awx/ui/test/e2e/tests/test-credentials-add-edit-machine.js +++ b/awx/ui/test/e2e/tests/test-credentials-add-edit-machine.js @@ -197,8 +197,12 @@ module.exports = { credentials.section.list.section.search .waitForElementVisible('@input', AWX_E2E_TIMEOUT_LONG) - .setValue('@input', `name:${store.credential.name}`) - .click('@searchButton'); + .waitForElementVisible('@searchButton', AWX_E2E_TIMEOUT_LONG) + .sendKeys('@input', `name:${store.credential.name}`) + .sendKeys('@input', client.Keys.ENTER); + + client.pause(1000); + client.waitForElementNotVisible('div.spinny'); credentials.waitForElementNotPresent(`${row}:nth-of-type(2)`); credentials.expect.element(row).text.contain(store.credential.name); diff --git a/awx/ui/test/e2e/tests/test-inventories-list-actions.js b/awx/ui/test/e2e/tests/test-inventories-list-actions.js index 97eb260a0f..082e2a1a88 100644 --- a/awx/ui/test/e2e/tests/test-inventories-list-actions.js +++ b/awx/ui/test/e2e/tests/test-inventories-list-actions.js @@ -96,7 +96,7 @@ module.exports = { inventories.expect.element(`#inventories_table tr[id="${data.inventory.id}"]`).visible; inventories.expect.element('#copy-action').visible; - inventories.expect.element('#copy-action[class$="btn-disabled"]').present; + inventories.expect.element('#copy-action[class*="btn-disabled"]').present; client.end(); } From 404950104b6e124f23afe5cc5f1c261be8a9ab57 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Wed, 25 Jul 2018 17:46:24 -0400 Subject: [PATCH 2/2] fix logic error in test --- awx/ui/test/e2e/tests/test-inventories-list-actions.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/awx/ui/test/e2e/tests/test-inventories-list-actions.js b/awx/ui/test/e2e/tests/test-inventories-list-actions.js index 082e2a1a88..55f19438d4 100644 --- a/awx/ui/test/e2e/tests/test-inventories-list-actions.js +++ b/awx/ui/test/e2e/tests/test-inventories-list-actions.js @@ -1,4 +1,8 @@ -import { getInventory, getInventoryNoSource } from '../fixtures'; +import { + getInventory, + getInventoryNoSource, + getInventorySource, +} from '../fixtures'; let data; @@ -7,6 +11,7 @@ module.exports = { const resources = [ getInventory('test-actions'), getInventoryNoSource('test-actions'), + getInventorySource('test-actions'), ]; Promise.all(resources)