Test wrangling

ui/packages/consul-ui/app/components/modal-dialog/index.js

@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import Slotted from 'block-slots';
-import A11yDialog from 'a11y-dialog'
+import A11yDialog from 'a11y-dialog';
 
 export default Component.extend(Slotted, {
   tagName: '',
@@ -9,14 +9,8 @@ export default Component.extend(Slotted, {
   actions: {
     connect: function($el) {
       this.dialog = new A11yDialog($el);
-      this.dialog.on(
-        'hide',
-        () => this.onclose()
-      );
-      this.dialog.on(
-        'show',
-        () => this.onopen()
-      );
+      this.dialog.on('hide', () => this.onclose({ target: $el }));
+      this.dialog.on('show', () => this.onopen({ target: $el }));
     },
     disconnect: function($el) {
       this.dialog.destroy();

ui/packages/consul-ui/app/components/policy-selector/index.hbs

@@ -9,6 +9,7 @@
     {{else}}
       <label
         class="type-dialog"
+        data-test-policy-create
         {{on "click" (optional this.modal.open)}}
       >
         <span>Create new policy</span>

ui/packages/consul-ui/app/components/policy-selector/pageobject.js

@@ -1,6 +1,6 @@
 export default (clickable, deletable, collection, alias, policyForm) => (
   scope = '#policies',
-  createSelector = '[for="new-policy-toggle"]'
+  createSelector = '[data-test-policy-create]'
 ) => {
   return {
     scope: scope,

ui/packages/consul-ui/app/components/role-selector/index.hbs

@@ -65,6 +65,7 @@ as |modal|>
   </BlockSlot>
   <BlockSlot @name="create">
     <label class="type-dialog"
+      data-test-role-create
       {{on "click" (optional this.modal.open)}}
     >
       <span>Create new role</span>

ui/packages/consul-ui/app/components/role-selector/pageobject.js

@@ -1,7 +1,7 @@
 export default (clickable, deletable, collection, alias, roleForm) => (scope = '#roles') => {
   return {
     scope: scope,
-    create: clickable('[for="new-role-toggle"]'),
+    create: clickable('[data-test-role-create]'),
     form: roleForm(),
     roles: alias('selectedOptions'),
     selectedOptions: collection(

ui/packages/consul-ui/tests/acceptance/dc/intentions/create.feature

@@ -32,7 +32,7 @@ Feature: dc / intentions / create: Intention Create
     And I click ".ember-power-select-option:first-child"
     Then I see the text "db" in "[data-test-destination-element] .ember-power-select-selected-item"
     # Specifically set deny
-    And I click "[value=deny]"
+    And I click ".value-deny"
     And I submit
     # TODO: When namespace is empty we expect *
     # Then a PUT request was made to "/v1/connect/intentions/exact?source=@namespace%2Fweb&destination=@namespace%2Fdb&dc=datacenter" from yaml
@@ -75,7 +75,7 @@ Feature: dc / intentions / create: Intention Create
     And I click ".ember-power-select-option:first-child"
     Then I see the text "db" in "[data-test-destination-element] .ember-power-select-selected-item"
     # Specifically set deny
-    And I click "[value=deny]"
+    And I click ".value-deny"
     And I submit
     Then a PUT request was made to "/v1/connect/intentions/exact?source=default%2Fweb&destination=default%2Fdb&dc=datacenter" from yaml
     ---

ui/packages/consul-ui/tests/acceptance/dc/intentions/permissions/create.feature

@@ -9,7 +9,7 @@ Feature: dc / intentions / permissions / create: Intention Permission Create
     Then the url should be /datacenter/intentions/create
     And the title should be "New Intention - Consul"
     # Specifically set L7
-    And I click "[value='']"
+    And I click ".value-"
 
     And I click the permissions.create object
     And I click the permissions.form.Action.option.Deny object

ui/packages/consul-ui/tests/acceptance/dc/intentions/permissions/warn.feature

@@ -20,12 +20,12 @@ Feature: dc / intentions / permissions / warn: Intention Permission Warn
       intention: intention-id
     ---
     Then the url should be /datacenter/intentions/intention-id
-    And I click "[value='deny']"
+    And I click ".value-deny"
     And I submit
-    And the warning object is present
+    And I see the warning object
     And I click the warning.cancel object
-    And the warning object isn't present
+    And I don't see the warning object
     And I submit
-    And the warning object is present
+    And I see the warning object
     And I click the warning.confirm object
     Then a PUT request was made to "/v1/connect/intentions/exact?source=default%2Fweb&destination=default%2Fdb&dc=datacenter" from yaml

ui/packages/consul-ui/tests/pages.js

@@ -6,6 +6,7 @@ import {
   collection,
   text,
   isPresent,
+  isVisible,
 } from 'ember-cli-page-object';
 
 import { alias } from 'ember-cli-page-object/macros';
@@ -204,7 +205,7 @@ export default {
     intention(
       visitable,
       clickable,
-      isPresent,
+      isVisible,
       submitable,
       deletable,
       cancelable,

ui/packages/consul-ui/tests/pages/dc/intentions/edit.js

@@ -1,7 +1,7 @@
 export default function(
   visitable,
   clickable,
-  isPresent,
+  isVisible,
   submitable,
   deletable,
   cancelable,
@@ -22,7 +22,7 @@ export default function(
     warning: {
       scope: '[data-test-action-warning]',
       resetScope: true,
-      present: isPresent(),
+      see: isVisible(),
       confirm: {
         scope: '[data-test-action-warning-confirm]',
         click: clickable(),

ui/packages/consul-ui/tests/steps/assertions/page.js

@@ -34,7 +34,11 @@ const dont = `( don't| shouldn't| can't)?`;
 export default function(scenario, assert, find, currentPage, $) {
   scenario
     .then([`I${dont} $verb the $pageObject object`], function(negative, verb, element, next) {
-      assert[negative ? 'notOk' : 'ok'](element[verb]());
+      let res = element[verb];
+      if (typeof res === 'function') {
+        res = res.call(element);
+      }
+      assert[negative ? 'notOk' : 'ok'](res, this.step);
       setTimeout(() => next());
     })
     .then(