From 21a973752b480f4bc7838759685d97bfe857b900 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Thu, 3 May 2018 13:41:12 -0400 Subject: [PATCH 1/2] remove redundant navbar checks --- awx/ui/test/e2e/tests/smoke.js | 42 ++++++---------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/awx/ui/test/e2e/tests/smoke.js b/awx/ui/test/e2e/tests/smoke.js index cce3e052ea..5e6487742f 100644 --- a/awx/ui/test/e2e/tests/smoke.js +++ b/awx/ui/test/e2e/tests/smoke.js @@ -136,10 +136,11 @@ module.exports = { client.expect.element('#hosts_tab').css('background-color').contain('132, 137, 146'); - client.useCss(); + client.useXpath(); client.waitForElementVisible(addHost); client.expect.element(addHost).enabled; client.click(addHost); + client.useCss(); client.waitForElementVisible('#host_name'); client.sendKeys('#host_name', 'localhost'); @@ -160,16 +161,7 @@ module.exports = { const credentials = client.page.credentials(); const { details } = credentials.section.add.section; - credentials.section.navigation.waitForElementVisible('@credentials'); - credentials.section.navigation.expect.element('@credentials').enabled; - credentials.section.navigation.click('@credentials'); - - credentials.waitForElementVisible('div.spinny'); - credentials.waitForElementNotVisible('div.spinny'); - - credentials.section.list.waitForElementVisible('@add'); - credentials.section.list.expect.element('@add').enabled; - credentials.section.list.click('@add'); + client.navigateTo(`${credentials.url()}/add`); details.waitForElementVisible('@save'); details.clearAndSelectType('Vault'); @@ -185,13 +177,7 @@ module.exports = { credentials.waitForElementVisible('div.spinny'); credentials.waitForElementNotVisible('div.spinny'); - credentials.section.navigation.waitForElementVisible('@credentials'); - credentials.section.navigation.expect.element('@credentials').enabled; - credentials.section.navigation.click('@credentials'); - - credentials.section.list.waitForElementVisible('@add'); - credentials.section.list.expect.element('@add').enabled; - credentials.section.list.click('@add'); + client.navigateTo(`${credentials.url()}/add`); details.waitForElementVisible('@save'); details.clearAndSelectType('Vault'); @@ -211,15 +197,7 @@ module.exports = { const credentials = client.page.credentials(); const { details } = credentials.section.add.section; - credentials.section.navigation.waitForElementVisible('@credentials'); - credentials.section.navigation.expect.element('@credentials').enabled; - credentials.section.navigation.click('@credentials'); - - credentials.waitForElementNotVisible('div.spinny'); - - credentials.section.list.waitForElementVisible('@add'); - credentials.section.list.expect.element('@add').enabled; - credentials.section.list.click('@add'); + client.navigateTo(`${credentials.url()}/add`); details.waitForElementVisible('@save'); details.clearAndSelectType('Machine'); @@ -235,12 +213,7 @@ module.exports = { 'create job template': client => { const templates = client.page.templates(); - templates.section.navigation.waitForElementVisible('@templates'); - templates.section.navigation.expect.element('@templates').enabled; - templates.section.navigation.click('@templates'); - - templates.waitForElementVisible('div.spinny'); - templates.waitForElementNotVisible('div.spinny'); + client.navigateTo(templates.url()); templates.selectAdd('Job Template'); templates.selectInventory(INVENTORY_NAME); @@ -295,10 +268,9 @@ module.exports = { client.waitForElementNotPresent(running, 60000); client.waitForElementVisible(success, 60000); - client.useXpath(); + client.useCss(); client.waitForElementVisible(output1, 60000); client.waitForElementVisible(output2, 60000); - client.useCss(); client.end(); } From 6f9da515b15f819663b360848bd4fe9ec3c6cf6b Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Thu, 3 May 2018 13:43:47 -0400 Subject: [PATCH 2/2] Update smoke.js --- awx/ui/test/e2e/tests/smoke.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/ui/test/e2e/tests/smoke.js b/awx/ui/test/e2e/tests/smoke.js index 5e6487742f..deb80a857f 100644 --- a/awx/ui/test/e2e/tests/smoke.js +++ b/awx/ui/test/e2e/tests/smoke.js @@ -136,11 +136,10 @@ module.exports = { client.expect.element('#hosts_tab').css('background-color').contain('132, 137, 146'); - client.useXpath(); + client.useCss(); client.waitForElementVisible(addHost); client.expect.element(addHost).enabled; client.click(addHost); - client.useCss(); client.waitForElementVisible('#host_name'); client.sendKeys('#host_name', 'localhost'); @@ -268,9 +267,10 @@ module.exports = { client.waitForElementNotPresent(running, 60000); client.waitForElementVisible(success, 60000); - client.useCss(); + client.useXpath(); client.waitForElementVisible(output1, 60000); client.waitForElementVisible(output2, 60000); + client.useCss(); client.end(); }