Move deleting to a top level feature

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

@@ -64,7 +64,7 @@
 {{# if (and item.ID (not-eq item.ID 'anonymous')) }}
         {{#confirmation-dialog message='Are you sure you want to delete this Intention?'}}
             {{#block-slot 'action' as |confirm|}}
-                <button type="button" class="type-delete" {{action confirm 'delete' item parent}}>Delete</button>
+                <button data-test-delete type="button" class="type-delete" {{action confirm 'delete' item parent}}>Delete</button>
             {{/block-slot}}
             {{#block-slot 'dialog' as |execute cancel message|}}
                 <p>

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

@@ -58,7 +58,7 @@
                                     <a href={{href-to 'dc.intentions.edit' item.ID}}>Edit</a>
                                 </li>
                                 <li>
-                                    <a onclick={{action confirm 'delete' item}}>Delete</a>
+                                    <a data-test-delete onclick={{action confirm 'delete' item}}>Delete</a>
                                 </li>
                             </ul>
                         {{/action-group}}

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

@@ -33,7 +33,7 @@
     <button type="reset" {{ action "cancel" item parent}}>Cancel changes</button>
     {{#confirmation-dialog message='Are you sure you want to delete this key?'}}
         {{#block-slot 'action' as |confirm|}}
-            <button type="button" class="type-delete" {{action confirm 'delete' item parent}}>Delete</button>
+            <button data-test-delete type="button" class="type-delete" {{action confirm 'delete' item parent}}>Delete</button>
         {{/block-slot}}
         {{#block-slot 'dialog' as |execute cancel message|}}
             <p>

ui-v2/package.json

@@ -2,7 +2,7 @@
   "name": "consul-ui",
   "version": "2.2.0",
   "private": true,
-  "description": "The web ui for Consul, by HashiCorp.",
+  "description": "The web UI for Consul, by HashiCorp.",
   "directories": {
     "doc": "doc",
     "test": "tests"

ui-v2/tests/acceptance/dc/acls/delete.feature

@@ -1,32 +0,0 @@
-@setupApplicationTest
-Feature: dc / acls / delete: ACL Delete
-  Scenario: Deleting an ACL from the ACL listing page
-    Given 1 datacenter model with the value "datacenter"
-    And 1 acl model from yaml
-    ---
-      Name: something
-      ID: key
-    ---
-    When I visit the acls page for yaml
-    ---
-      dc: datacenter
-    ---
-    And I click actions on the acls
-    And I click delete on the acls
-    And I click confirmDelete on the acls
-    Then a PUT request is made to "/v1/acl/destroy/key?dc=datacenter"
-  Scenario: Deleting an ACL from the ACL detail page
-    Given 1 datacenter model with the value "datacenter"
-    And 1 acl model from yaml
-    ---
-      Name: something
-      ID: key
-    ---
-    When I visit the acl page for yaml
-    ---
-      dc: datacenter
-      acl: something
-    ---
-    And I click delete
-    And I click confirmDelete
-    Then a PUT request is made to "/v1/acl/destroy/something?dc=datacenter"

ui-v2/tests/acceptance/dc/kvs/delete.feature

@@ -1,16 +0,0 @@
-@setupApplicationTest
-Feature: dc / kvs / delete: KV Delete
-  Scenario: Delete ACL
-    Given 1 datacenter model with the value "datacenter"
-    And 1 kv model from yaml
-    ---
-      - key-name
-    ---
-    When I visit the kvs page for yaml
-    ---
-      dc: datacenter
-    ---
-    And I click actions on the kvs
-    And I click delete on the kvs
-    And I click confirmDelete on the kvs
-    Then a DELETE request is made to "/v1/kv/key-name?dc=datacenter"

ui-v2/tests/acceptance/deleting.feature

@@ -0,0 +1,34 @@
+@setupApplicationTest
+Feature: deleting: Deleting form the listing and the detail page with confirmation
+  Scenario: Deleting a [Model] from the [Model] listing page
+    Given 1 datacenter model with the value "datacenter"
+    And 1 [Model] model from json
+    ---
+      [Data]
+    ---
+    When I visit the [Model]s page for yaml
+    ---
+      dc: datacenter
+    ---
+    And I click actions on the [Model]s
+    And I click delete on the [Model]s
+    And I click confirmDelete on the [Model]s
+    Then a [Method] request is made to "[URL]"
+    When I visit the [Model] page for yaml
+    ---
+      dc: datacenter
+      [Slug]
+    ---
+    And I click delete
+    And I click confirmDelete
+    Then a [Method] request is made to "[URL]"
+  Where:
+    ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+    | Model     | Method | URL                                                                       | Data                                                                 | Slug                                            |
+    | acl       | PUT    | /v1/acl/destroy/something?dc=datacenter                                   | {"Name": "something", "ID": "something"}                             | acl: something                                  |
+    | kv        | DELETE | /v1/kv/key-name?dc=datacenter                                             | ["key-name"]                                                         | kv: key-name                                    |
+    | intention | DELETE | /v1/connect/intentions/ee52203d-989f-4f7a-ab5a-2bef004164ca?dc=datacenter | {"SourceName": "name", "ID": "ee52203d-989f-4f7a-ab5a-2bef004164ca"} | intention: ee52203d-989f-4f7a-ab5a-2bef004164ca |
+    ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+@ignore
+  Scenario: Sort out the wide tables ^
+    Then ok

ui-v2/tests/acceptance/steps/dc/kvs/delete-steps.js

@@ -1,10 +0,0 @@
-import steps from '../../steps';
-
-// step definitions that are shared between features should be moved to the
-// tests/acceptance/steps/steps.js file
-
-export default function(assert) {
-  return steps(assert).then('I should find a file', function() {
-    assert.ok(true, this.step);
-  });
-}

ui-v2/tests/acceptance/steps/deleting-steps.js

@@ -1,10 +1,11 @@
-import steps from '../../steps';
+import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
 // tests/acceptance/steps/steps.js file
 
 export default function(assert) {
-  return steps(assert).then('I should find a file', function() {
+  return steps(assert)
-    assert.ok(true, this.step);
+    .then('I should find a file', function() {
-  });
+      assert.ok(true, this.step);
+    });
 }