fix: tests, make them independent from each other

Author: tilman

test/integration/nextjs-cache-handler.integration.test.ts

@@ -324,8 +324,11 @@ describe('Next.js Turbo Redis Cache Integration', () => {
       });
     });
 
-    describe('DEVELOPMENT should cache a nested fetch request inside a uncached API route', () => {
+    describe('should cache a nested fetch request inside a uncached API route', () => {
       describe('should cache the nested fetch request (but not the API route itself)', () => {
+        let counter: number;
+        let subCounter: number;
+
         it('should deduplicate requests to the sub-fetch-request, but not to the API route itself', async () => {
           // make two requests, both should return the same subFetchData but different counter
           const res1 = await fetch(
@@ -342,16 +345,16 @@ describe('Next.js Turbo Redis Cache Integration', () => {
           // API route counter itself increments for each request
           // But we do not know which request is first and which is second
           if (data1.counter < data2.counter) {
-            expect(data1.counter).toBe(1);
-            expect(data2.counter).toBe(2);
+            expect(data2.counter).toBeGreaterThan(data1.counter);
+            counter = data2.counter;
           } else {
-            expect(data1.counter).toBe(2);
-            expect(data2.counter).toBe(1);
+            expect(data1.counter).toBeGreaterThan(data2.counter);
+            counter = data1.counter;
           }
 
           // API route counter of revalidated sub-fetch-request should be the same (request deduplication)
-          expect(data1.subFetchData.counter).toBe(1);
-          expect(data2.subFetchData.counter).toBe(1);
+          expect(data1.subFetchData.counter).toBe(data1.subFetchData.counter);
+          subCounter = data1.subFetchData.counter;
         });
 
         if (process.env.SKIP_OPTIONAL_LONG_RUNNER_TESTS !== 'true') {
@@ -363,8 +366,8 @@ describe('Next.js Turbo Redis Cache Integration', () => {
                 '/api/nested-fetch-in-api-route/revalidated-fetch',
             );
             const data: any = await res.json();
-            expect(data.counter).toBe(3);
-            expect(data.subFetchData.counter).toBe(1);
+            expect(data.counter).toBe(counter + 1);
+            expect(data.subFetchData.counter).toBe(subCounter);
           });
 
           it('should return the same subFetchData after 2 seconds and new data after another 2 seconds (caching while revalidation works)', async () => {
@@ -375,8 +378,8 @@ describe('Next.js Turbo Redis Cache Integration', () => {
                 '/api/nested-fetch-in-api-route/revalidated-fetch',
             );
             const data1: any = await res1.json();
-            expect(data1.counter).toBe(4);
-            expect(data1.subFetchData.counter).toBe(1);
+            expect(data1.counter).toBe(counter + 2);
+            expect(data1.subFetchData.counter).toBe(subCounter);
 
             // make another request after another 2 seconds, it should return new data (caching while revalidation works)
             await delay(2000);
@@ -385,8 +388,8 @@ describe('Next.js Turbo Redis Cache Integration', () => {
                 '/api/nested-fetch-in-api-route/revalidated-fetch',
             );
             const data2: any = await res2.json();
-            expect(data2.counter).toBe(5);
-            expect(data2.subFetchData.counter).toBe(2);
+            expect(data2.counter).toBe(counter + 3);
+            expect(data2.subFetchData.counter).toBe(subCounter + 1);
           });
 
           it('A request to revalidatePage API should remove the route from redis (string and hashmap)', async () => {
@@ -417,9 +420,9 @@ describe('Next.js Turbo Redis Cache Integration', () => {
                 '/api/nested-fetch-in-api-route/revalidated-fetch',
             );
             const data: any = await res.json();
-            expect(data.counter).toBe(6);
+            expect(data.counter).toBe(counter + 4);
             // subFetchData counter should be 3 because the sub-fetch-request was re-evaluated. If revalidate would not work, it would be 2.
-            expect(data.subFetchData.counter).toBe(3);
+            expect(data.subFetchData.counter).toBe(subCounter + 2);
           });
 
           it('After the new request was made the redis key and hashmap should be set again', async () => {
@@ -472,9 +475,9 @@ describe('Next.js Turbo Redis Cache Integration', () => {
                 '/api/nested-fetch-in-api-route/revalidated-fetch',
             );
             const data: any = await res.json();
-            expect(data.counter).toBe(7);
+            expect(data.counter).toBe(counter + 5);
             // subFetchData counter should be 4 because the sub-fetch-request was re-evaluated. If revalidate would not work, it would be 3.
-            expect(data.subFetchData.counter).toBe(4);
+            expect(data.subFetchData.counter).toBe(subCounter + 3);
           });
 
           it('After the new request was made the redis key and hashmap should be set again', async () => {