From b71a8af62d885633dc68b7b32399c2a70c478ad1 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Mon, 30 Apr 2018 13:41:14 -0400
Subject: [PATCH] patch smoke test

---
 awx/ui/test/e2e/tests/smoke.js | 36 ++++------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/awx/ui/test/e2e/tests/smoke.js b/awx/ui/test/e2e/tests/smoke.js
index b77b23d69d..44c8c959ab 100644
--- a/awx/ui/test/e2e/tests/smoke.js
+++ b/awx/ui/test/e2e/tests/smoke.js
@@ -161,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');
@@ -186,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');
@@ -212,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');
@@ -236,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);