Add some navigation testing for back buttons and create buttons

ui-v2/app/templates/dc/acls/edit.hbs

@@ -1,7 +1,7 @@
 {{#app-view class="acl edit" loading=isLoading}}
     {{#block-slot 'breadcrumbs'}}
         <ol>
-            <li><a href={{href-to 'dc.acls'}}>All Tokens</a></li>
+            <li><a data-test-back href={{href-to 'dc.acls'}}>All Tokens</a></li>
         </ol>
     {{/block-slot}}
     {{#block-slot 'header'}}

ui-v2/app/templates/dc/acls/index.hbs

@@ -5,7 +5,7 @@
         </h1>
     {{/block-slot}}
     {{#block-slot 'actions'}}
-        <a href="{{href-to 'dc.acls.create'}}" class="type-create">Create</a>
+        <a data-test-create href="{{href-to 'dc.acls.create'}}" class="type-create">Create</a>
     {{/block-slot}}
     {{#block-slot 'toolbar'}}
 {{#if (gt items.length 0) }}

ui-v2/app/templates/dc/intentions/edit.hbs

@@ -1,7 +1,7 @@
 {{#app-view class="acl edit" loading=isLoading}}
     {{#block-slot 'breadcrumbs'}}
         <ol>
-            <li><a href={{href-to 'dc.intentions'}}>All Intentions</a></li>
+            <li><a data-test-back href={{href-to 'dc.intentions'}}>All Intentions</a></li>
         </ol>
     {{/block-slot}}
     {{#block-slot 'header'}}

ui-v2/app/templates/dc/intentions/index.hbs

@@ -5,7 +5,7 @@
         </h1>
     {{/block-slot}}
     {{#block-slot 'actions'}}
-        <a href="{{href-to 'dc.intentions.create'}}" class="type-create">Create</a>
+        <a data-test-create href="{{href-to 'dc.intentions.create'}}" class="type-create">Create</a>
     {{/block-slot}}
     {{#block-slot 'toolbar'}}
 {{#if (gt items.length 0) }}

ui-v2/app/templates/dc/kv/edit.hbs

@@ -1,7 +1,7 @@
 {{#app-view class="kv edit" loading=isLoading}}
     {{#block-slot 'breadcrumbs'}}
         <ol>
-            <li><a href={{href-to 'dc.kv.index'}}>Key / Values</a></li>
+            <li><a data-test-back href={{href-to 'dc.kv.index'}}>Key / Values</a></li>
 {{#if (not-eq parent.Key '/') }}
 {{#each (slice 0 -1 (split parent.Key '/')) as |breadcrumb index|}}
             <li><a href={{href-to 'dc.kv.folder' (join '/' (append (slice 0 (add index 1) (split parent.Key '/')) ''))}}>{{breadcrumb}}</a></li>

ui-v2/app/templates/dc/kv/index.hbs

@@ -27,9 +27,9 @@
     {{/block-slot}}
     {{#block-slot 'actions'}}
 {{#if (not-eq parent.Key '/') }}
-        <a href="{{href-to 'dc.kv.create' parent.Key}}" class="type-create">Create</a>
+        <a data-test-create href="{{href-to 'dc.kv.create' parent.Key}}" class="type-create">Create</a>
 {{else}}
-        <a href="{{href-to 'dc.kv.root-create'}}" class="type-create">Create</a>
+        <a data-test-create href="{{href-to 'dc.kv.root-create'}}" class="type-create">Create</a>
 {{/if}}
     {{/block-slot}}
     {{#block-slot 'content'}}

ui-v2/app/templates/dc/nodes/show.hbs

@@ -1,7 +1,7 @@
 {{#app-view class="node show"}}
     {{#block-slot 'breadcrumbs'}}
         <ol>
-            <li><a href={{href-to 'dc.nodes'}}>All Nodes</a></li>
+            <li><a data-test-back href={{href-to 'dc.nodes'}}>All Nodes</a></li>
         </ol>
     {{/block-slot}}
     {{#block-slot 'header'}}

ui-v2/app/templates/dc/services/show.hbs

@@ -1,7 +1,7 @@
 {{#app-view class="service show"}}
     {{#block-slot 'breadcrumbs'}}
         <ol>
-            <li><a href={{href-to 'dc.services'}}>All Services</a></li>
+            <li><a data-test-back href={{href-to 'dc.services'}}>All Services</a></li>
         </ol>
     {{/block-slot}}
     {{#block-slot 'header'}}

ui-v2/tests/acceptance/page-navigation.feature

@@ -8,38 +8,58 @@ Feature: Page Navigation
       dc: dc-1
     ---
     Then the url should be /dc-1/services
-  Scenario: Clicking [Link] in the navigation takes me to [Url]
+  Scenario: Clicking [Link] in the navigation takes me to [URL]
     When I visit the services page for yaml
     ---
       dc: dc-1
     ---
     When I click [Link] on the navigation
-    Then the url should be [Url]
+    Then the url should be [URL]
   Where:
     ----------------------------------------
-    | Link       | Url                     |
+    | Link       | URL                     |
     | nodes      | /dc-1/nodes             |
     | kvs        | /dc-1/kv                |
     | acls       | /dc-1/acls              |
     | intentions | /dc-1/intentions        |
     | settings   | /settings               |
     ----------------------------------------
-  Scenario: Clicking a [Item] in the [Model] listing
+  Scenario: Clicking a [Item] in the [Model] listing and back again
     When I visit the [Model] page for yaml
     ---
       dc: dc-1
     ---
     When I click [Item] on the [Model]
-    Then the url should be [Url]
+    Then the url should be [URL]
+    # This should be a page object function
+    And I click "[data-test-back]"
+    Then the url should be [Back]
   Where:
-    -------------------------------------------------------------------------------------
+    --------------------------------------------------------------------------------------------------------
-    | Item      | Model      | Url                                                      |
+    | Item      | Model      | URL                                                      | Back             |
-    | service   | services   | /dc-1/services/service-0                                 |
+    | service   | services   | /dc-1/services/service-0                                 | /dc-1/services   |
-    | node      | nodes      | /dc-1/nodes/node-0                                       |
+    | node      | nodes      | /dc-1/nodes/node-0                                       | /dc-1/nodes      |
-    | kv        | kvs        | /dc-1/kv/necessitatibus-0/edit                           |
+    | kv        | kvs        | /dc-1/kv/necessitatibus-0/edit                           | /dc-1/kv         |
-    | intention | intentions | /dc-1/intentions/ee52203d-989f-4f7a-ab5a-2bef004164ca    |
+    | acl       | acls       | /dc-1/acls/anonymous                                     | /dc-1/acls       |
-    | acl       | acls       | /dc-1/acls/anonymous                                     |
+    | intention | intentions | /dc-1/intentions/ee52203d-989f-4f7a-ab5a-2bef004164ca    | /dc-1/intentions |
-    -------------------------------------------------------------------------------------
+    --------------------------------------------------------------------------------------------------------
 @ignore
   Scenario: Clicking items in the listings, without depending on the salt ^
     Then ok
+  Scenario: Clicking create in the [Model] listing
+    When I visit the [Model] page for yaml
+    ---
+      dc: dc-1
+    ---
+    When I click create
+    Then the url should be [URL]
+    # This should be a page object function
+    And I click "[data-test-back]"
+    Then the url should be [Back]
+  Where:
+    ------------------------------------------------------------------------
+    | Item      | Model      | URL                      | Back             |
+    | kv        | kvs        | /dc-1/kv/create          | /dc-1/kv         |
+    | acl       | acls       | /dc-1/acls/create        | /dc-1/acls       |
+    | intention | intentions | /dc-1/intentions/create  | /dc-1/intentions |
+    ------------------------------------------------------------------------

ui-v2/tests/lib/page-object/createCreatable.js

@@ -0,0 +1,11 @@
+export default function(clickable, is) {
+  return function(obj) {
+    return {
+      ...obj,
+      ...{
+        create: clickable('[data-test-create]'),
+        createIsEnabled: is(':not(:disabled)', '[data-test-create]'),
+      },
+    };
+  };
+}

ui-v2/tests/pages.js

@@ -2,6 +2,7 @@ import { create, clickable, is, attribute, collection, text } from 'ember-cli-pa
 import { visitable } from 'consul-ui/tests/lib/page-object/visitable';
 import createDeletable from 'consul-ui/tests/lib/page-object/createDeletable';
 import createSubmitable from 'consul-ui/tests/lib/page-object/createSubmitable';
+import createCreatable from 'consul-ui/tests/lib/page-object/createCreatable';
 
 import page from 'consul-ui/tests/pages/components/page';
 import radiogroup from 'consul-ui/tests/lib/page-object/radiogroup';
@@ -25,6 +26,7 @@ import intention from 'consul-ui/tests/pages/dc/intentions/edit';
 
 const deletable = createDeletable(clickable);
 const submitable = createSubmitable(clickable, is);
+const creatable = createCreatable(clickable, is);
 export default {
   index: create(index(visitable, collection)),
   dcs: create(dcs(visitable, clickable, attribute, collection)),
@@ -32,12 +34,12 @@ export default {
   service: create(service(visitable, attribute, collection, text, catalogFilter)),
   nodes: create(nodes(visitable, clickable, attribute, collection, catalogFilter)),
   node: create(node(visitable, deletable, clickable, attribute, collection, radiogroup)),
-  kvs: create(kvs(visitable, deletable, clickable, attribute, collection)),
+  kvs: create(kvs(visitable, deletable, creatable, clickable, attribute, collection)),
   kv: create(kv(visitable, submitable, deletable)),
-  acls: create(acls(visitable, deletable, clickable, attribute, collection, aclFilter)),
+  acls: create(acls(visitable, deletable, creatable, clickable, attribute, collection, aclFilter)),
   acl: create(acl(visitable, submitable, deletable, clickable)),
   intentions: create(
-    intentions(visitable, deletable, clickable, attribute, collection, intentionFilter)
+    intentions(visitable, deletable, creatable, clickable, attribute, collection, intentionFilter)
   ),
   intention: create(intention(visitable, submitable, deletable)),
   settings: create(settings(visitable, submitable)),

ui-v2/tests/pages/dc/acls/index.js

@@ -1,5 +1,5 @@
-export default function(visitable, deletable, clickable, attribute, collection, filter) {
+export default function(visitable, deletable, creatable, clickable, attribute, collection, filter) {
-  return {
+  return creatable({
     visit: visitable('/:dc/acls'),
     acls: collection(
       '[data-test-tabular-row]',
@@ -12,5 +12,5 @@ export default function(visitable, deletable, clickable, attribute, collection,
       })
     ),
     filter: filter,
-  };
+  });
 }

ui-v2/tests/pages/dc/intentions/index.js

@@ -1,5 +1,5 @@
-export default function(visitable, deletable, clickable, attribute, collection, filter) {
+export default function(visitable, deletable, creatable, clickable, attribute, collection, filter) {
-  return {
+  return creatable({
     visit: visitable('/:dc/intentions'),
     intentions: collection(
       '[data-test-tabular-row]',
@@ -15,5 +15,5 @@ export default function(visitable, deletable, clickable, attribute, collection,
       })
     ),
     filter: filter,
-  };
+  });
 }

ui-v2/tests/pages/dc/kv/index.js

@@ -1,5 +1,5 @@
-export default function(visitable, deletable, clickable, attribute, collection) {
+export default function(visitable, deletable, creatable, clickable, attribute, collection) {
-  return {
+  return creatable({
     visit: visitable('/:dc/kv'),
     kvs: collection(
       '[data-test-tabular-row]',
@@ -9,5 +9,5 @@ export default function(visitable, deletable, clickable, attribute, collection)
         actions: clickable('label'),
       })
     ),
-  };
+  });
 }