fix(balance): fix end to end tests

This commit updates the balance report end to end tests to work correctly with the new configuration page.
IMA-WorldHealth · Apr 9, 2018 · abe68cc · abe68cc
1 parent b37808c
commit abe68cc
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 60 deletions.
diff --git a/client/src/modules/reports/generate/balance_report/balance_report.html b/client/src/modules/reports/generate/balance_report/balance_report.html
@@ -30,6 +30,7 @@ <h3 class="text-capitalize" translate>REPORT.BALANCE_REPORT.TITLE</h3>
 
             <bh-yes-no-radios
               label="REPORT.OPTIONS.SEPARATE_DEBITS_AND_CREDITS"
+              id="useSeparateDebitsAndCredits"
               help-text="REPORT.OPTIONS.SEPARATE_DEBITS_AND_CREDITS_HELP"
               name="useSeparateDebitsAndCredits"
               value="ReportConfigCtrl.reportDetails.useSeparateDebitsAndCredits"
@@ -40,6 +41,7 @@ <h3 class="text-capitalize" translate>REPORT.BALANCE_REPORT.TITLE</h3>
               label="REPORT.OPTIONS.REMOVE_ZERO_ROWS"
               help-text="REPORT.OPTIONS.REMOVE_ZERO_ROWS_HELP"
               name="shouldPruneEmptyRows"
+              id="shouldPruneEmptyRows"
               value="ReportConfigCtrl.reportDetails.shouldPruneEmptyRows"
               on-change-callback="ReportConfigCtrl.onChangeEmptyRows(value)">
             </bh-yes-no-radios>

diff --git a/client/src/modules/templates/bhYesNoRadios.tmpl.html b/client/src/modules/templates/bhYesNoRadios.tmpl.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group" data-bh-yes-no-radios>
   <label class="control-label" translate>
     {{$ctrl.label}}
   </label>

diff --git a/server/controllers/finance/reports/balance/report.handlebars b/server/controllers/finance/reports/balance/report.handlebars
@@ -143,39 +143,39 @@
             <th>{{translate "FORM.LABELS.TOTAL"}}</th>
             {{#if useSeparateDebitsAndCredits}}
               {{#gt totals.before 0}}
-                <th>{{currency totals.before totals.currencyId }}</th>
-                <th></th>
+                <th class="text-right">{{currency totals.before totals.currencyId }}</th>
+                <th class="text-right">{{currency 0 totals.currencyId }}</th>
               {{else}}
-                <th></th>
-                <th>{{currency totals.before totals.currencyId }}</th>
+                <th class="text-right">{{currency 0 totals.currencyId }}</th>
+                <th class="text-right">{{currency totals.before totals.currencyId }}</th>
               {{/gt}}
             {{else}}
-              <th>{{debcred totals.before totals.currencyId }}</th>
+              <th class="text-right">{{debcred totals.before totals.currencyId }}</th>
             {{/if}}
 
             {{#if useSeparateDebitsAndCredits}}
               {{#gt totals.during 0}}
-                <th>{{currency totals.during totals.currencyId }}</th>
-                <th></th>
+                <th class="text-right">{{currency totals.during totals.currencyId }}</th>
+                <th class="text-right">{{currency 0 totals.currencyId }}</th>
               {{else}}
-                <th></th>
-                <th>{{currency totals.during totals.currencyId }}</th>
+                <th class="text-right">{{currency 0 totals.currencyId }}</th>
+                <th class="text-right">{{currency totals.during totals.currencyId }}</th>
               {{/gt}}
             {{else}}
-              <th>{{debcred totals.during totals.currencyId }}</th>
+              <th class="text-right">{{debcred totals.during totals.currencyId }}</th>
             {{/if}}
 
 
             {{#if useSeparateDebitsAndCredits}}
               {{#gt totals.after 0}}
-                <th>{{currency totals.after totals.currencyId }}</th>
-                <th></th>
+                <th class="text-right">{{currency totals.after totals.currencyId }}</th>
+                <th class="text-right">{{currency 0 totals.currencyId }}</th>
               {{else}}
-                <th></th>
-                <th>{{currency totals.after totals.currencyId }}</th>
+                <th class="text-right">{{currency 0 totals.currencyId }}</th>
+                <th class="text-right">{{currency totals.after totals.currencyId }}</th>
               {{/gt}}
             {{else}}
-              <th>{{debcred totals.after totals.currencyId }}</th>
+              <th class="text-right">{{debcred totals.after totals.currencyId }}</th>
             {{/if}}
           </tr>
         </tfoot>

diff --git a/test/end-to-end/reports/balance_report/balance_report.page.js b/test/end-to-end/reports/balance_report/balance_report.page.js
@@ -1,10 +1,3 @@
-/* global browser, element, by */
-
-const chai = require('chai');
-const helpers = require('../../shared/helpers');
-
-helpers.configure(chai);
-
 const FU = require('../../shared/FormUtils');
 const ReportPage = require('../page');
 const components = require('../../shared/components');
@@ -15,14 +8,16 @@ class BalanceReportPage {
   }
 
   // preview an account report
-  showBalanceReportPreview(date) {
-    components.dateEditor.set(date);
+  showBalanceReportPreview(period) {
+    components.reportPeriodSelect.set(period);
+    components.yesNoRadios.set('yes', 'useSeparateDebitsAndCredits');
+    components.yesNoRadios.set('yes', 'shouldPruneEmptyRows');
     this.page.preview();
   }
 
   // save an account report
-  saveBalanceReport(date, reportName, reportFormat) {
-    this.showBalanceReportPreview(date);
+  saveBalanceReport(period, reportName, reportFormat) {
+    this.showBalanceReportPreview(period);
 
     // save report as PDF
     this.page.saveAs();

diff --git a/test/end-to-end/reports/balance_report/balance_report.spec.js b/test/end-to-end/reports/balance_report/balance_report.spec.js
@@ -1,23 +1,14 @@
-/* global browser, element, by */
-
-const chai = require('chai');
 const helpers = require('../../shared/helpers');
 
-helpers.configure(chai);
-
 const BalanceReportPage = require('./balance_report.page');
 
-describe('Balance report ::', () => {
+describe('Balance Report', () => {
   let Page;
   const key = 'balance_report';
 
   const dataset = {
-    dateFrom   : '01/01/2016',
-    dateTo     : '31/12/2016',
-    date       : new Date('2016-12-31 12:00'),
-    dateOption : 0,
-    classe     : '*',
-    report_name : 'Balance Report Saved by E2E',
+    period : '2018',
+    reportName : 'Balance Report Saved by E2E',
     renderer : 'PDF',
   };
 
@@ -27,22 +18,22 @@ describe('Balance report ::', () => {
   });
 
   it('preview a new balance report', () => {
-    Page.showBalanceReportPreview(dataset.date);
+    Page.showBalanceReportPreview(dataset.period);
   });
 
   it('close the previewed report', () => {
     Page.closeBalanceReportPreview();
   });
 
   it('save a previewed report', () => {
-    Page.saveBalanceReport(dataset.date, dataset.report_name, dataset.renderer);
+    Page.saveBalanceReport(dataset.period, dataset.reportName, dataset.renderer);
   });
 
   it('report has been saved into archive', () => {
-    Page.checkSavedBalanceReport(dataset.report_name);
+    Page.checkSavedBalanceReport(dataset.reportName);
   });
 
   it('print the previewed report', () => {
-    Page.printBalanceReport(dataset.date);
+    Page.printBalanceReport(dataset.period);
   });
 });
diff --git a/test/end-to-end/shared/components/bhFiscalPeriodSelect.js b/test/end-to-end/shared/components/bhFiscalPeriodSelect.js
@@ -1,25 +1,19 @@
-/* global browser, element, by */
-
-const FU = require('../FormUtils');
+/* global element, by */
 
 module.exports = {
   mainSelector : '[bh-fiscal-period-select]',
-  set : function set(fiscal_year_id, periodFrom_id, periodTo_id, id) {
-      var opts;
-    /** return selector for an option element */
-    function getValue(id) {
-      return by.css('option[value="number:?"]'.replace('?', id));
-    }
+  set : function set(fiscalYearId, periodFromId, periodToId, id) {
+    const getValue = ident => by.css(`option[value="number:${ident}"]`);
 
     const bhFiscalPeriod = (id) ? element(by.id(id)) : element(by.css(this.mainSelector));
 
-    opts = bhFiscalPeriod.element(by.model('$ctrl.selectedFiscal'));
-    opts.element(getValue(fiscal_year_id)).click();
+    let opts = bhFiscalPeriod.element(by.model('$ctrl.selectedFiscal'));
+    opts.element(getValue(fiscalYearId)).click();
 
     opts = bhFiscalPeriod.element(by.model('$ctrl.selectedPeriodFrom'));
-    opts.element(getValue(periodFrom_id)).click();
+    opts.element(getValue(periodFromId)).click();
 
     opts = bhFiscalPeriod.element(by.model('$ctrl.selectedPeriodTo'));
-    opts.element(getValue(periodTo_id)).click();
+    opts.element(getValue(periodToId)).click();
   },
-};
+};
diff --git a/test/end-to-end/shared/components/bhReportPeriodSelect.js b/test/end-to-end/shared/components/bhReportPeriodSelect.js
@@ -1,4 +1,4 @@
-/* global browser, element, by */
+/* global element, by */
 
 const FU = require('../FormUtils');
 
@@ -14,4 +14,4 @@ module.exports = {
 
     FU.uiSelect('$ctrl.periodId', period, target);
   },
-};
+};
diff --git a/test/end-to-end/shared/components/bhYesNoRadios.js b/test/end-to-end/shared/components/bhYesNoRadios.js
@@ -0,0 +1,21 @@
+/* global element, by */
+
+module.exports = {
+  selector : '[data-bh-yes-no-radios]',
+
+  set : (value, id) => {
+
+    // get the root value of the
+    const root = element(id ? by.id(id) : by.css(this.selector));
+
+    // construct a locator for the value
+    const locator = `[data-choice="${value}"]`;
+
+    // get the appropriate option by the locator
+    const option = root.element(by.css(locator));
+
+    // click it!
+    option.click();
+  },
+};
+
diff --git a/test/end-to-end/shared/components/index.js b/test/end-to-end/shared/components/index.js
@@ -49,5 +49,6 @@ module.exports = {
   iprConfigSelect             : require('./bhIprConfigSelect'),
   rubricConfigSelect          : require('./bhRubricConfigSelect'),
   accountConfigSelect         : require('./bhAccountConfigSelect'),
-  weekConfigSelect            : require('./bhWeekConfigSelect'), 
+  weekConfigSelect            : require('./bhWeekConfigSelect'),
+  yesNoRadios : require('./bhYesNoRadios'),
 };