From e339966d85adc88355477dcfb5f18fe29fcc8cd7 Mon Sep 17 00:00:00 2001
From: Jonathan Niles <jonathanwniles@imaworldhealth.org>
Date: Tue, 31 Jan 2017 18:37:04 +0100
Subject: [PATCH] fix(account): typo in edit modal

This commit fixes a typo that resulted in a broken angular translate
key.  It also removes the id for the delete button and uses FormUtils to
click on the delete button.
---
 .../accounts/edit/accounts.edit.modal.html         |  3 +--
 test/end-to-end/accounts/accounts.spec.js          | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/client/src/partials/accounts/edit/accounts.edit.modal.html b/client/src/partials/accounts/edit/accounts.edit.modal.html
index cb9fa4bcfb..ef7b4e9033 100644
--- a/client/src/partials/accounts/edit/accounts.edit.modal.html
+++ b/client/src/partials/accounts/edit/accounts.edit.modal.html
@@ -26,7 +26,7 @@
   <div ng-show="AccountEditCtrl.account || AccountEditCtrl.isCreateState">
 
     <div ng-if="!AccountEditCtrl.isCreateState" class="form-group">
-      <label class="control-label" translate>{ACCOUNT.NUMBER</label>
+      <label class="control-label" translate>ACCOUNT.NUMBER</label>
       <p class="form-control-static" id="number-static">{{AccountEditCtrl.account.number}}</p>
     </div>
 
@@ -126,7 +126,6 @@
   <button
     type="button"
     ng-if="!AccountEditCtrl.isCreateState"
-    id="delete_account"
     class="btn btn-danger btn-sm"
     data-method="delete"
     ng-click="AccountEditCtrl.deleteAccount(AccountEditCtrl.account)">
diff --git a/test/end-to-end/accounts/accounts.spec.js b/test/end-to-end/accounts/accounts.spec.js
index f53230d28b..0a91d5845a 100644
--- a/test/end-to-end/accounts/accounts.spec.js
+++ b/test/end-to-end/accounts/accounts.spec.js
@@ -1,5 +1,4 @@
 /* global element, by, browser */
-
 'use strict';
 
 const chai = require('chai');
@@ -35,7 +34,8 @@ describe('Account Management', function () {
       number : 40000
     }
   };
-  const deletingAccount = "3647";
+
+  const deletingAccount = '3647';
 
   const page = new AccountsPage();
 
@@ -143,18 +143,18 @@ describe('Account Management', function () {
   }
 
   // Delete a specific Account
-  it('Delete specific account', function () {
+  it('can delete a specific account', function () {
     page.openEdit(deletingAccount);
-    element(by.id('delete_account')).click();
+
+    FU.buttons.delete();
     components.modalAction.confirm();
 
     components.notification.hasSuccess();
   });
 
-  // Delete a specific Account
-  it('Impossible to remove an account parent who have children', function () {
+  it('cannot delete an account with children', function () {
     page.openEdit(accountGroup.id);
-    element(by.id('delete_account')).click();
+    FU.buttons.delete();
     components.modalAction.confirm();
     expect(element.all(by.css('[alert alert-danger]')));
   });