Added tests for promise rejection

e-mission · Oct 31, 2023 · aa34ac3 · aa34ac3
1 parent 772f508
commit aa34ac3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/www/__tests__/unifiedDataLoader.test.ts b/www/__tests__/unifiedDataLoader.test.ts
@@ -49,13 +49,25 @@ describe('combineWithDedup can', () => {
 const promiseGenerator = (values: Array<ServerData<any>>) => {
   return Promise.resolve(values);
 };
+const badPromiseGenerator = (input: string) => {
+  return Promise.reject(input);
+}
 
 it('throws an error on an empty input', async () => {
   expect(() => {
     combinedPromises([], combineWithDedup);
   }).toThrow();
 });
 
+it('catches when all promises fails', async () => {
+  expect(combinedPromises([badPromiseGenerator('')], combineWithDedup)).rejects.toEqual(['']);
+  expect(combinedPromises([badPromiseGenerator('bad'), badPromiseGenerator('promise')], combineWithDedup)).rejects.toEqual(['bad','promise']);
+  expect(combinedPromises([badPromiseGenerator('very'), badPromiseGenerator('bad'), badPromiseGenerator('promise')], combineWithDedup)).rejects.toEqual(['very','bad','promise']);
+
+  expect(combinedPromises([badPromiseGenerator('bad'), promiseGenerator([testOne])], combineWithDedup)).resolves.toEqual([testOne]);
+  expect(combinedPromises([promiseGenerator([testOne]), badPromiseGenerator('bad')], combineWithDedup)).resolves.toEqual([testOne]);
+});
+
 it('work with arrays of len 1', async () => {
   const promiseArrayOne = [promiseGenerator([testOne])];
   const promiseArrayTwo = [promiseGenerator([testOne, testTwo])];

diff --git a/www/js/services/unifiedDataLoader.ts b/www/js/services/unifiedDataLoader.ts
@@ -42,7 +42,7 @@ export const combinedPromises = function(promiseList: Array<Promise<any>>,
       const checkAndResolve = function() {
         if (firstPromiseDone && nextPromiseDone) {
           if (firstError && nextError) {
-            reject([firstError, nextError]);
+            reject([firstError].concat(nextError));
           } else {
             logDebug(`About to dedup firstResult = ${firstResult.length}` +
               ` nextResult = ${nextResult.length}`);