fix(operators): cleanup

Author: StephanGerbeth

package-lock.json

@@ -12,26 +12,27 @@ describe('cache', () => {
   });
 
   test('default', () => {
-    const initial = new Response('initial', { status: 200 });
-    const updated = new Response('updated', { status: 200 });
-    const orderedResponses = [initial, updated];
+    const expectedVal = {
+      a: new Response('initial', { status: 200 }),
+      b: new Response('updated', { status: 200 })
+    };
+
+    const triggerVal = [expectedVal.a, expectedVal.b];
 
     testScheduler.run(({ cold, expectObservable }) => {
-      const stream = cold('a', {
-        a: () => orderedResponses.shift()
-      }).pipe(
+      const stream = cold('a', { a: () => triggerVal.shift() }).pipe(
         map(fn => fn()),
         cache(2)
       );
 
       const unsubA = '-^!';
-      expectObservable(stream, unsubA).toBe('-a', { a: initial }, new Error());
+      expectObservable(stream, unsubA).toBe('-a', expectedVal, new Error());
 
       const unsubB = '----^!';
-      expectObservable(stream, unsubB).toBe('----a', { a: initial }, new Error());
+      expectObservable(stream, unsubB).toBe('----a', expectedVal, new Error());
 
       const unsubC = '---------^--!';
-      expectObservable(stream, unsubC).toBe('---------a', { a: updated }, new Error());
+      expectObservable(stream, unsubC).toBe('---------b', expectedVal, new Error());
     });
   });
 });

packages/operators/src/request/cache.test.js

@@ -1,6 +1,6 @@
 import { map } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { afterEach, beforeEach, describe, expect, test } from 'vitest';
+import { beforeEach, describe, expect, test } from 'vitest';
 
 import { log } from '../log';
 import { networkRetry } from './retry';
@@ -12,28 +12,26 @@ describe('request retry', () => {
     testScheduler = new TestScheduler((actual, expected) => expect(actual).deep.equal(expected));
   });
 
-  afterEach(() => {
-    //
-  });
-
   test('2x error -> 1x success', () => {
-    const error = new Response('', { status: 500 });
-    const success = new Response('a', { status: 200 });
-    const orderedResponses = [error, error, success];
+    const expectedVal = {
+      a: new Response('', { status: 500 }),
+      b: new Response('', { status: 500 }),
+      c: new Response('a', { status: 200 })
+    };
+
+    const triggerVal = [expectedVal.a, expectedVal.b, expectedVal.c];
 
     testScheduler.run(({ cold, expectObservable }) => {
       // retry is repeating the sequence
       // if you define a delay, you have to add the delay to the subscribe multiple times (num retries)
-      const stream = cold('a|', {
-        a: () => orderedResponses.shift()
-      }).pipe(
+      const stream = cold('a|', { a: () => triggerVal.shift() }).pipe(
         map(fn => fn()),
         networkRetry({ timeout: () => 5 }),
         log('marble:result')
       );
 
       const unsubA = '^-----------';
-      expectObservable(stream, unsubA).toBe('----------a|', { a: success });
+      expectObservable(stream, unsubA).toBe('----------c|', expectedVal);
     });
   });
 });