Fix test hierarchy in xml test reports

karma.conf.js

@@ -55,6 +55,12 @@ module.exports = (config) => {
       outputFile : process.env.KARMA_FILENAME || 'test.xml',
       suite : 'BHIMA-Tests',
       useBrowserName : false,
+      nameFormatter : (browser, result) => {
+        return result.description;
+      },
+      classNameFormatter : (browser, result) => {
+        return result.suite[0];
+      },
     },
 
     // web server port

playwright.config.js

@@ -18,7 +18,7 @@ module.exports = defineConfig({
   // testIgnore : process.env.E2E_DIR ? '' : /\/stock\/|\/account\//,
 
   /* Maximum time one test can run for. */
-  timeout : 40 * 1000, // Need longer value for CI
+  timeout : 50 * 1000, // Need longer value for CI
 
   expect : {
     /**

sh/test-e2e-account.sh

@@ -45,6 +45,9 @@ echo "[test] Running end-to-end account tests using playwright."
 cd ..
 E2E_DIR=account npx playwright test 2>&1 | tee ./results/end-to-end-account-report
 
+# Adjust formatting for Jenkins
+sed -i 's/.spec.js//g' "./results/end-to-end-account-results.xml"
+
 # FYI: Use --workers=1  to limit number of workers
 
 # Clean up any left-over zombie node processes (if not CI)

sh/test-e2e.sh

@@ -48,6 +48,9 @@ cd ..
 
 npx playwright test $TESTS 2>&1 | tee "./results/end-to-end-report-$TEST_NUM"
 
+# Adjust formatting for Jenkins
+sed -i 's/.spec.js//g' "./results/end-to-end-$TEST_NUM-results.xml"
+
 # FYI: Use PWTEST_SKIP_TEST_OUTPUT=1 to skip interactive web debug at the end
 # FYI: Use --workers=1  to limit number of workers
 

test/client-unit/components/bhCardList.spec.js

@@ -1,6 +1,7 @@
 /* eslint no-unused-expressions:off */
 /* global inject expect */
 describe('test/client-unit/components/bhCardList', () => {
+
   let $compile;
   let $rootScope;
   let $templateCache;

test/client-unit/components/bhFindPatient/controller.spec.js

@@ -1,7 +1,7 @@
 /* eslint no-unused-expressions:"off" */
 /* global inject, expect, chai */
 
-describe.skip('bhFindPatient Controller Tests', ControllerTests);
+describe.skip('test/client-unit/components/bhFindPatient Controller Tests', ControllerTests);
 
 /**
  * @todo - finish the DOM tests to compliment this controller test suite.

test/client-unit/components/bhFindPatient/dom.spec.js

@@ -1,6 +1,6 @@
 /* global inject, expect, chai */
 
-describe.skip('bhFindPatient DOM bindings', DomTests);
+describe.skip('test/client-unit/components/bhFindPatient DOM bindings', DomTests);
 
 /**
  * @todo(@jniles) - finish this test suite. At the moment, it is incomplete and

test/client-unit/directives/bhBlur.spec.js

@@ -1,7 +1,7 @@
 /* eslint no-unused-expressions:off, no-continue: off */
 /* global inject, expect, chai */
 
-describe('test/client-unit/directives/(directive) bhBlur', () => {
+describe('test/client-unit/directives/bhBlur directive', () => {
   let $compile;
   let $scope;
   let element;

test/client-unit/directives/bhInteger.spec.js

@@ -1,5 +1,5 @@
 /* global inject, expect */
-describe('test/client-unit/directives/(directive) bhInteger', () => {
+describe('test/client-unit/directives/bhInteger directive', () => {
   let $scope;
   let form;
 

test/client-unit/directives/bhMaxInteger.spec.js

@@ -1,5 +1,5 @@
 /* global inject, expect */
-describe('test/client-unit/directives/(directive) bhMaxInteger', () => {
+describe('test/client-unit/directives/bhMaxInteger directive', () => {
   let $scope;
   let form;
 

test/client-unit/directives/bhSubmit.spec.js

@@ -1,5 +1,5 @@
 /* global inject, expect, chai */
-describe('test/client-unit/directives/(directive) bhSubmit', () => {
+describe('test/client-unit/directives/bhSubmit directive', () => {
   let $scope;
   let element;
   let deferred;
@@ -15,7 +15,7 @@ describe('test/client-unit/directives/(directive) bhSubmit', () => {
     };
   }));
 
-  describe('when the directive is added to a form', () => {
+  context('when the directive is added to a form', () => {
     beforeEach(inject(($compile) => {
       element = angular.element(`
         <form name="form" bh-submit="models.submit(form)" novalidate>
@@ -27,49 +27,49 @@ describe('test/client-unit/directives/(directive) bhSubmit', () => {
       $scope.$digest();
     }));
 
-    it('sets $loading to false on the FormControl', () => {
+    it('when the directive is added to a form - sets $loading to false on the FormControl', () => {
       expect($scope.form.$loading).to.equal(false);
     });
 
-    describe('when the form is submitted', () => {
+    context('when the form is submitted', () => {
       beforeEach(() => {
         angular.element(element).trigger('submit');
       });
 
-      it('sets $loading to true on the FormControl', () => {
+      it('when the form is submitted - sets $loading to true on the FormControl', () => {
         expect($scope.form.$loading).to.equal(true);
       });
 
-      it('calls the submit callback function', () => {
+      it('when the form is submitted - calls the submit callback function', () => {
         expect($scope.models.submit).to.have.been.called.with($scope.form);
       });
 
-      describe('when the submit callback is resolved', () => {
+      context('when the submit callback is resolved', () => {
         beforeEach(() => {
           deferred.resolve();
           $scope.$digest();
         });
 
-        it('sets $loading to false on the FormControl', () => {
+        it('when the submit callback is resolved - sets $loading to false on the FormControl', () => {
           expect($scope.form.$loading).to.equal(false);
         });
       });
 
-      describe('when the submit callback is rejected', () => {
+      context('when the submit callback is rejected', () => {
         beforeEach(() => {
           deferred.reject(new Error('callback rejected'));
           $scope.$digest();
         });
 
-        it('sets $loading to false on the FormControl', () => {
+        it('when the submit callback is rejected - sets $loading to false on the FormControl', () => {
           expect($scope.form.$loading).to.equal(false);
         });
       });
     });
   });
 
-  describe('when the directive is not added to a form', () => {
-    it('the compilation fails', inject(($compile) => {
+  context('when the directive is not added to a form', () => {
+    it('when the directive is not added to a form - the compilation fails', inject(($compile) => {
       element = angular.element(`
         <form name="form">
           <div bh-submit="models.submit(form)">

test/client-unit/directives/bhUnique.spec.js

@@ -1,5 +1,5 @@
 /* global inject, expect */
-describe('test/client-unit/directives/(directive) bhUnique', () => {
+describe('test/client-unit/directives/bhUnique directive', () => {
   let $scope;
   let form;
 

test/client-unit/filters/bytes.spec.js

@@ -1,5 +1,5 @@
 /* global inject, expect */
-describe('test/client-unit/filters/Bytes Filter', () => {
+describe('test/client-unit/filters/bytes filter', () => {
 
   let bytes;
 
@@ -48,4 +48,5 @@ describe('test/client-unit/filters/Bytes Filter', () => {
     expect(bytes(null, 100)).to.equal('-');
     expect(bytes(undefined, 33)).to.equal('-');
   });
+
 });

test/client-unit/filters/currency.spec.js

@@ -1,5 +1,5 @@
 /* global inject, expect */
-describe('test/client-unit/filters/Currency Filter', () => {
+describe('test/client-unit/filters/currency filter', () => {
 
   const FC = 1;
   const USD = 2;

test/client-unit/filters/percentage.spec.js

@@ -1,5 +1,5 @@
 /* global inject, expect */
-describe('test/client-unit/filters/Percentage Filter', () => {
+describe('test/client-unit/filters/percentage filter', () => {
 
   let percentage;
 

test/client-unit/filters/telephone.spec.js

@@ -1,5 +1,5 @@
 /* global inject, expect */
-describe('test/client-unit/filters/Telephone Filter', () => {
+describe('test/client-unit/filters/telephone filter', () => {
 
   let telephone;
 

test/client-unit/services/BaseReportService.spec.js

@@ -23,8 +23,8 @@ describe('test/client-unit/services/BaseReportService', () => {
     parseIcon = SavedReports.parseFileUrlToIcon;
   }));
 
-  describe('#parseUrlToExtension()', () => {
-    it('correctly parses simple paths', () => {
+  context('#parseUrlToExtension()', () => {
+    it('#parseUrlToExtension() correctly parses simple paths', () => {
       expect(parseExtension('image.jpg')).to.equal('jpg');
       expect(parseExtension('image.svg')).to.equal('svg');
       expect(parseExtension('doc.docx')).to.equal('docx');
@@ -34,19 +34,19 @@ describe('test/client-unit/services/BaseReportService', () => {
 
     });
 
-    it('handles error cases', () => {
+    it('#parseUrlToExtension() handles error cases', () => {
       expect(parseExtension('')).to.equal('');
       expect(parseExtension()).to.equal('');
     });
 
-    it('correctly parses complex paths', () => {
+    it('#parseUrlToExtension() correctly parses complex paths', () => {
       expect(parseExtension('a.file.with.decimals.pdf')).to.equal('pdf');
       expect(parseExtension('/more/complex/file.with/decimals.gz')).to.equal('gz');
     });
   });
 
-  describe('#parseUrlToIcon()', () => {
-    it('correctly parses paths to guess their icons', () => {
+  context('#parseUrlToIcon()', () => {
+    it('#parseUrlToIcon() correctly parses paths to guess their icons', () => {
       expect(parseIcon('icon.png')).to.equal('fa-file-image-o');
       expect(parseIcon('icon.svg')).to.equal('fa-file-image-o');
 

test/client-unit/services/PatientInvoiceForm.spec.js

@@ -73,7 +73,7 @@ describe('test/client-unit/services/PatientInvoiceForm', () => {
     httpBackend.verifyNoOutstandingRequest();
   });
 
-  describe('#constructor()', () => {
+  context('#constructor()', () => {
     let constructorForm;
     let setupSpy;
     let inventorySpy;
@@ -84,21 +84,21 @@ describe('test/client-unit/services/PatientInvoiceForm', () => {
       inventorySpy = chai.spy.on(constructorForm.inventory, 'initialize');
     });
 
-    it('calls #setup() on initialization', () => {
+    it('#constructor() calls #setup() on initialization', () => {
       expect(setupSpy).to.have.been.called;
     });
 
-    it('creates a new, empty store for the grid', () => {
+    it('#constructor() creates a new, empty store for the grid', () => {
       expect(constructorForm.store).to.exist;
       expect(constructorForm.store.identifier).to.equal('uuid');
       expect(constructorForm.store.data).to.have.length(0);
     });
 
-    it('initializes the inventory', () => {
+    it('#constructor() initializes the inventory', () => {
       expect(inventorySpy).to.have.been.called;
     });
 
-    it('sets the form to be invalid by default', () => {
+    it('#constructor() sets the form to be invalid by default', () => {
       expect(constructorForm._invalid).to.equal(true);
       expect(constructorForm._valid).to.equal(false);
     });

test/client-unit/services/Pool.spec.js

@@ -1,7 +1,6 @@
 /* global inject, expect */
 describe('test/client-unit/services/Pool', () => {
 
-
   let Pool;
   let data;
 
@@ -18,7 +17,7 @@ describe('test/client-unit/services/Pool', () => {
 
   it('#constructor() runs with sane defaults', () => {
     let pool = new Pool();
-    expect(pool).to.exist;
+    expect(pool).to.exist; // eslint-disable-line
     expect(pool.available.identifier).to.equal('id');
     expect(pool.available.data).to.have.length(0);
 

test/client-unit/services/PrototypeApiService.spec.js

@@ -1,7 +1,6 @@
 /* global inject, expect */
 describe('test/client-unit/services/PrototypeApiService', () => {
 
-
   // shared common data
   let api;
   let httpBackend;

test/client-unit/services/PurchaseOrderFormService.spec.js

@@ -74,7 +74,7 @@ describe('test/client-unit/services/PurchaseOrderForm', () => {
       setupSpy = chai.spy.on(form, 'setup');
     });
 
-    it('calls #setup() on initialization', () => {
+    it('calls #setup() on initialization in the constructor', () => {
       expect(setupSpy).to.have.been.called;
     });
 

test/client-unit/services/UniqueValidatorService.spec.js

@@ -1,6 +1,6 @@
 
 /* global inject, expect */
-describe('test/client-unit/services/(service) UniqueValidatorService', () => {
+describe('test/client-unit/services/UniqueValidatorService', () => {
 
 
   // these will be injected in the beforeEach() calls

test/client-unit/services/VoucherForm.spec.js

@@ -45,7 +45,7 @@ describe('test/client-unit/services/VoucherForm', () => {
     httpBackend.verifyNoOutstandingRequest();
   });
 
-  describe('#constructor()', () => {
+  context('#constructor()', () => {
     let constructorForm;
     let setupSpy;
 
@@ -54,19 +54,19 @@ describe('test/client-unit/services/VoucherForm', () => {
       setupSpy = chai.spy.on(constructorForm, 'setup');
     });
 
-    it('calls #setup() on initialization', () => {
+    it('#constructor() calls #setup() on initialization', () => {
       expect(setupSpy).to.have.been.called;
     });
 
-    it('creates a new store with two items in it', () => {
+    it('#constructor() creates a new store with two items in it', () => {
       expect(constructorForm.store).to.exist;
       expect(constructorForm.store.identifier).to.equal('uuid');
 
       // two rows should be added
       expect(constructorForm.store.data).to.have.length(2);
     });
 
-    it('sets default data based on Session', () => {
+    it('#constructor() sets default data based on Session', () => {
       expect(constructorForm.details).to.exist;
       expect(constructorForm.details.project_id).to.be.equal(Session.project.id);
       expect(constructorForm.details.currency_id).to.be.equal(Session.enterprise.currency_id);
@@ -88,7 +88,6 @@ describe('test/client-unit/services/VoucherForm', () => {
     expect(form.store.data).to.have.length(15);
   });
 
-
   it('#clear() removes all data from the internal store', () => {
     form.clear();
     expect(form.store.data).to.have.length(0);

test/end-to-end/stock/stock.spec.js

@@ -22,7 +22,7 @@ const StockAggregateConsumptionTests = require('./stock.aggregate_consumption');
 const StockImportTests = require('./stock.import');
 
 test.describe('Stock E2E', () => {
-  test.describe('Stock Import', StockImportTests);
+  test.describe('test/end-to-end/stock/stock_import Stock Import', StockImportTests);
   test.describe('Stock Aggregate Consumption', StockAggregateConsumptionTests);
   // ??? test.describe('Stock Assign', StockAssignTests);
   test.describe('Stock Entry', StockEntryTests);

test/integration-stock/depots.js

@@ -2,8 +2,8 @@
 
 const helpers = require('./helpers');
 
-// The /depots API endpoint
-describe('test/integration-stock (/depots) The depots API ', () => {
+// The /depots API
+describe('test/integration-stock/depots The depots API ', () => {
   const { principal } = helpers.data.depots;
 
   /**