From be0f66fd94622dbb4169d2895ddb60848b91dc32 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Sun, 10 Dec 2017 11:36:14 -0500 Subject: [PATCH 1/2] fix linting error in stored xss test --- awx/ui/test/e2e/tests/test-xss.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/ui/test/e2e/tests/test-xss.js b/awx/ui/test/e2e/tests/test-xss.js index 0ea5382289..9eef2487c6 100644 --- a/awx/ui/test/e2e/tests/test-xss.js +++ b/awx/ui/test/e2e/tests/test-xss.js @@ -217,8 +217,8 @@ module.exports = { client.expect.element('[class=xss]').not.present; }, 'check user roles list for unsanitized content': client => { - const { admin_role } = data.jobTemplate.summary_fields.object_roles; - const itemDelete = `#permissions_table tr[id="${admin_role.id}"] #delete-action`; + const adminRole = data.jobTemplate.summary_fields.object_roles.admin_role; + const itemDelete = `#permissions_table tr[id="${adminRole.id}"] #delete-action`; client.expect.element('#permissions_tab').visible; client.expect.element('#permissions_tab').enabled; @@ -234,7 +234,7 @@ module.exports = { client.expect.element('div[ui-view="related"]').visible; client.expect.element('div[ui-view="related"] smart-search input').enabled; - client.sendKeys('div[ui-view="related"] smart-search input', `id:${admin_role.id}`); + client.sendKeys('div[ui-view="related"] smart-search input', `id:${adminRole.id}`); client.sendKeys('div[ui-view="related"] smart-search input', client.Keys.ENTER); client.expect.element('div.spinny').not.visible; From 9dcdf20fb037cfcdcd9834a5a62f6224c265713c Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Sun, 10 Dec 2017 11:41:41 -0500 Subject: [PATCH 2/2] stabilize template form stored xss test case --- awx/ui/test/e2e/tests/test-xss.js | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/ui/test/e2e/tests/test-xss.js b/awx/ui/test/e2e/tests/test-xss.js index 9eef2487c6..d5a1767696 100644 --- a/awx/ui/test/e2e/tests/test-xss.js +++ b/awx/ui/test/e2e/tests/test-xss.js @@ -158,6 +158,7 @@ module.exports = { // client.expect.element('div.spinny').visible; client.expect.element('div.spinny').not.visible; + client.waitForAngular(); client.expect.element('#job_template_tab').enabled;