From 8559db72f4a3d5581cdbb7c528fbc2278796f165 Mon Sep 17 00:00:00 2001
From: Estefi <estefi@camba.coop>
Date: Fri, 11 Jan 2019 11:09:02 -0300
Subject: [PATCH 1/5] Seted the default delete content

---
 src/components/Actions/Delete/Delete.vue | 11 +++++++++--
 src/constants/ui.content.default.js      |  5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/Actions/Delete/Delete.vue b/src/components/Actions/Delete/Delete.vue
index 3c9432c9..cfa4ebd5 100644
--- a/src/components/Actions/Delete/Delete.vue
+++ b/src/components/Actions/Delete/Delete.vue
@@ -2,10 +2,13 @@
   <div>
     <v-tooltip bottom>
       <v-btn
+        :name="`${name}`"
         @click="onDelete()"
         slot="activator"
         icon>
-        <i class="v-icon material-icons">delete</i>
+        <i class="v-icon material-icons">
+          {{UI_CONTENT.RESOURCE_DELETE_BUTTON}}
+        </i>
       </v-btn>
       <span>Delete</span>
     </v-tooltip>
@@ -13,6 +16,8 @@
 </template>
 
 <script>
+import UI_CONTENT from '../../../constants/ui.content.default'
+
 export default {
   name: "Delete",
 
@@ -31,7 +36,9 @@ export default {
   },
 
   data() {
-    return {}
+    return {
+      UI_CONTENT
+    }
   },
 
   methods: {
diff --git a/src/constants/ui.content.default.js b/src/constants/ui.content.default.js
index 0c088e30..40cc709b 100644
--- a/src/constants/ui.content.default.js
+++ b/src/constants/ui.content.default.js
@@ -22,9 +22,12 @@ export default {
   // Create action button
   RESOURCE_CREATE_BUTTON: 'add',
 
-  // Create action button
+  // Edit action button
   RESOURCE_EDIT_BUTTON: 'edit',
 
+  // Delete action button
+  RESOURCE_DELETE_BUTTON: 'delete',
+
   // Create Save button
   CREATE_SUBMIT_BUTTON: 'save',
 

From 7a3d55212047a26eb2d7589c31ef425e84766580 Mon Sep 17 00:00:00 2001
From: Estefi <estefi@camba.coop>
Date: Fri, 11 Jan 2019 11:11:04 -0300
Subject: [PATCH 2/5] Seted the delete button name in the show view

---
 src/components/Actions/Show/Show.vue | 5 +++++
 src/constants/ui.element.names.js    | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/components/Actions/Show/Show.vue b/src/components/Actions/Show/Show.vue
index 82c358ac..668f4913 100644
--- a/src/components/Actions/Show/Show.vue
+++ b/src/components/Actions/Show/Show.vue
@@ -7,6 +7,7 @@
           :resourceName="name">
         </EditButton>
         <Delete
+          :name="deleteButtonName()"
           :resourceId="$route.params.id"
           :resourceName="name">
         </Delete>
@@ -111,6 +112,10 @@ export default {
 
     editButtonName() {
       return UI_NAMES.RESOURCE_ID_EDIT_BUTTON.with({ resourceName: this.resourceName })
+    },
+
+    deleteButtonName() {
+      return UI_NAMES.RESOURCE_ID_DELETE_BUTTON.with({ resourceName: this.resourceName })
     }
   },
 
diff --git a/src/constants/ui.element.names.js b/src/constants/ui.element.names.js
index a3a69b01..d2195695 100644
--- a/src/constants/ui.element.names.js
+++ b/src/constants/ui.element.names.js
@@ -58,5 +58,13 @@ export default {
   // The form submit buttons
   RESOURCE_VIEW_SUBMIT_BUTTON: {
     with: ({ resourceName, view }) => `${resourceName}-${view}-submit-button`
+  },
+
+  RESOURCE_ID_DELETE_BUTTON: {
+    with: ({ resourceName, index }) => {
+      return index !== undefined
+      ? `${resourceName}-delete-button-${index}`
+      : `${resourceName}-delete-button`
+    }
   }
 }

From e0c7c71a32d0bf412f60701bddfd8a45c630a39c Mon Sep 17 00:00:00 2001
From: Estefi <estefi@camba.coop>
Date: Fri, 11 Jan 2019 11:11:58 -0300
Subject: [PATCH 3/5] Tested the Delete action

---
 tests/e2e/specs/articles/delete.spec.js | 39 +++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 tests/e2e/specs/articles/delete.spec.js

diff --git a/tests/e2e/specs/articles/delete.spec.js b/tests/e2e/specs/articles/delete.spec.js
new file mode 100644
index 00000000..55afbce3
--- /dev/null
+++ b/tests/e2e/specs/articles/delete.spec.js
@@ -0,0 +1,39 @@
+// https://docs.cypress.io/api/introduction/api.html
+
+const Factory = require('../../factory')
+const { queryElementByProp } = require('../../helpers')
+
+const UI_NAMES = require('../../../../src/constants/ui.element.names')
+const UI_CONTENT = require('../../../../src/constants/ui.content.default')
+
+describe('Articles: Delete Test', () => {
+  let article = {}
+
+  before('Search the Show view url', () => {
+    const url = Factory.apiUrl({ route: 'api/articles/' })
+    cy.request('POST',url , Factory.createArticle())
+      .then((res) => { article = res.body })
+    cy.visit('/#/articles')
+    cy.wait(2000)
+  })
+
+  before('Visits the Show view url', () => {
+    const url = `articles/show/${article.id}`
+    cy.visit(`/#/${url}`)
+    cy.url().should('include', url)
+  })
+
+  it('Press the delete button in the Show view', () => {
+    const deleteButtonName = UI_NAMES.RESOURCE_ID_DELETE_BUTTON.with({
+      resourceName: 'articles',
+    })
+    const deleteButtonElement = queryElementByProp({
+      type: 'button',
+      prop: 'name',
+      value: deleteButtonName
+    })
+    cy.get(deleteButtonElement).should((deleteButton) => {
+     expect(deleteButton).to.contain(UI_CONTENT.RESOURCE_DELETE_BUTTON)
+   }).click()
+  })
+})

From cdd014da7c0bc8bc1df814b018b16449349e03b9 Mon Sep 17 00:00:00 2001
From: Estefi <estefi@camba.coop>
Date: Mon, 14 Jan 2019 12:02:55 -0300
Subject: [PATCH 4/5] Refactored the delete test

---
 tests/e2e/specs/articles/delete.spec.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/e2e/specs/articles/delete.spec.js b/tests/e2e/specs/articles/delete.spec.js
index 55afbce3..b2a80240 100644
--- a/tests/e2e/specs/articles/delete.spec.js
+++ b/tests/e2e/specs/articles/delete.spec.js
@@ -3,6 +3,7 @@
 const Factory = require('../../factory')
 const { queryElementByProp } = require('../../helpers')
 
+
 const UI_NAMES = require('../../../../src/constants/ui.element.names')
 const UI_CONTENT = require('../../../../src/constants/ui.content.default')
 
@@ -24,15 +25,14 @@ describe('Articles: Delete Test', () => {
   })
 
   it('Press the delete button in the Show view', () => {
-    const deleteButtonName = UI_NAMES.RESOURCE_ID_DELETE_BUTTON.with({
-      resourceName: 'articles',
-    })
-    const deleteButtonElement = queryElementByProp({
-      type: 'button',
-      prop: 'name',
-      value: deleteButtonName
+    const deleteButtonElement = cy.getElement({
+      constant: UI_NAMES.RESOURCE_DELETE_BUTTON,
+      constantParams: { resourceName: 'articles' },
+      elementType: 'button',
+      elementProp: 'name',
     })
-    cy.get(deleteButtonElement).should((deleteButton) => {
+
+    deleteButtonElement.should((deleteButton) => {
      expect(deleteButton).to.contain(UI_CONTENT.RESOURCE_DELETE_BUTTON)
    }).click()
   })

From dff8b5389cf791ca6ea09f1b525160898cbc89dd Mon Sep 17 00:00:00 2001
From: Estefi <estefi@camba.coop>
Date: Mon, 14 Jan 2019 12:17:57 -0300
Subject: [PATCH 5/5] Refactored the delete and edit button UI name props

---
 src/components/Actions/Delete/Delete.vue         |  8 +++++---
 src/components/Actions/EditButton/EditButton.vue |  8 +++++---
 src/components/Actions/Show/Show.vue             | 10 ----------
 src/constants/ui.element.names.js                | 16 ++++++----------
 tests/e2e/specs/articles/edit.spec.js            |  4 ++--
 5 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/src/components/Actions/Delete/Delete.vue b/src/components/Actions/Delete/Delete.vue
index cfa4ebd5..8a2b6e69 100644
--- a/src/components/Actions/Delete/Delete.vue
+++ b/src/components/Actions/Delete/Delete.vue
@@ -2,7 +2,7 @@
   <div>
     <v-tooltip bottom>
       <v-btn
-        :name="`${name}`"
+        :name="`${UI_NAMES.RESOURCE_DELETE_BUTTON.with({ resourceName: this.resourceName })}`"
         @click="onDelete()"
         slot="activator"
         icon>
@@ -16,7 +16,8 @@
 </template>
 
 <script>
-import UI_CONTENT from '../../../constants/ui.content.default'
+import UI_CONTENT from '@constants/ui.content.default'
+import UI_NAMES from '@constants/ui.element.names'
 
 export default {
   name: "Delete",
@@ -37,7 +38,8 @@ export default {
 
   data() {
     return {
-      UI_CONTENT
+      UI_CONTENT,
+      UI_NAMES
     }
   },
 
diff --git a/src/components/Actions/EditButton/EditButton.vue b/src/components/Actions/EditButton/EditButton.vue
index a02f0451..235aae12 100644
--- a/src/components/Actions/EditButton/EditButton.vue
+++ b/src/components/Actions/EditButton/EditButton.vue
@@ -3,7 +3,7 @@
     <v-tooltip
     bottom>
       <v-btn
-      :name="`${name}`"
+      :name="`${UI_NAMES.RESOURCE_EDIT_BUTTON.with({ resourceName: this.resourceName })}`"
       @click="onEdit()"
       slot="activator"
       icon>
@@ -17,7 +17,8 @@
 </template>
 
 <script>
-import UI_CONTENT from '../../../constants/ui.content.default'
+import UI_CONTENT from '@constants/ui.content.default'
+import UI_NAMES from '@constants/ui.element.names'
 
 export default {
   name: "EditButton",
@@ -36,7 +37,8 @@ export default {
   },
   data() {
     return {
-      UI_CONTENT
+      UI_CONTENT,
+      UI_NAMES
     }
   },
   methods: {
diff --git a/src/components/Actions/Show/Show.vue b/src/components/Actions/Show/Show.vue
index 668f4913..1ed6766f 100644
--- a/src/components/Actions/Show/Show.vue
+++ b/src/components/Actions/Show/Show.vue
@@ -2,12 +2,10 @@
   <v-card :name="`${UI_NAMES.RESOURCE_VIEW_CONTAINER.with({ resourceName, view })}`">
     <div class="text-xs-center d-flex right" :name="`${UI_NAMES.RESOURCE_VIEW_ACTIONS_CONTAINER.with({ resourceName, view })}`">
         <EditButton
-          :name="editButtonName()"
           :resourceId="$route.params.id"
           :resourceName="name">
         </EditButton>
         <Delete
-          :name="deleteButtonName()"
           :resourceId="$route.params.id"
           :resourceName="name">
         </Delete>
@@ -108,14 +106,6 @@ export default {
 
     componentName(field) {
       return UI_NAMES.RESOURCE_VIEW_CONTAINER_FIELD.with({ resourceName: this.resourceName, view: this.view, field: this.label(field) })
-    },
-
-    editButtonName() {
-      return UI_NAMES.RESOURCE_ID_EDIT_BUTTON.with({ resourceName: this.resourceName })
-    },
-
-    deleteButtonName() {
-      return UI_NAMES.RESOURCE_ID_DELETE_BUTTON.with({ resourceName: this.resourceName })
     }
   },
 
diff --git a/src/constants/ui.element.names.js b/src/constants/ui.element.names.js
index d2195695..5fef43ee 100644
--- a/src/constants/ui.element.names.js
+++ b/src/constants/ui.element.names.js
@@ -40,11 +40,9 @@ export default {
     with: ({ resourceName }) => `${resourceName}-create-button`
   },
   // The button that redirects to a Edit view
-  RESOURCE_ID_EDIT_BUTTON: {
-    with: ({ resourceName, index }) => {
-      return index !== undefined
-      ? `${resourceName}-edit-button-${index}`
-      : `${resourceName}-edit-button`
+  RESOURCE_EDIT_BUTTON: {
+    with: ({ resourceName }) => {
+      return `${resourceName}-edit-button`
     }
   },
   // A specific container of a Resource field inside an element of List
@@ -60,11 +58,9 @@ export default {
     with: ({ resourceName, view }) => `${resourceName}-${view}-submit-button`
   },
 
-  RESOURCE_ID_DELETE_BUTTON: {
-    with: ({ resourceName, index }) => {
-      return index !== undefined
-      ? `${resourceName}-delete-button-${index}`
-      : `${resourceName}-delete-button`
+  RESOURCE_DELETE_BUTTON: {
+    with: ({ resourceName }) => {
+      return `${resourceName}-delete-button`
     }
   }
 }
diff --git a/tests/e2e/specs/articles/edit.spec.js b/tests/e2e/specs/articles/edit.spec.js
index 000fb070..a88356a1 100644
--- a/tests/e2e/specs/articles/edit.spec.js
+++ b/tests/e2e/specs/articles/edit.spec.js
@@ -29,7 +29,7 @@ describe('Articles: Edit Test', () => {
   })
 
   before('Click in the Edit button of the Show view', () => {
-    const editButtonName = UI_NAMES.RESOURCE_ID_EDIT_BUTTON.with({
+    const editButtonName = UI_NAMES.RESOURCE_EDIT_BUTTON.with({
       resourceName: 'articles'
     })
     const editButtonElement = queryElementByProp({
@@ -42,7 +42,7 @@ describe('Articles: Edit Test', () => {
     }).click()
   })
 
-  it('Articles Show Edit should render title: Articles', () => {
+  it('Articles Edit should render title: Articles', () => {
     cy.get(editViewDivContainerQuery('RESOURCE_VIEW_CONTAINER')).should((editViewContainer) => {
       const editViewTitleContainer = editViewContainer.find(editViewDivContainerQuery('RESOURCE_VIEW_CONTAINER_TITLE'))
       const editViewTitleText = UI_CONTENT.RESOURCE_VIEW_TITLE.with({