From 9fe08c03323a7cb68b4db9aeb6a90d635b262f33 Mon Sep 17 00:00:00 2001 From: Gabriel Ramos Date: Wed, 3 Oct 2018 12:16:55 -0300 Subject: [PATCH 1/4] feat(mocked-provider): insert dynamicVariables at mocked provider --- src/test-links.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test-links.ts b/src/test-links.ts index 2e4651da05..b84c624dca 100644 --- a/src/test-links.ts +++ b/src/test-links.ts @@ -58,7 +58,8 @@ export class MockLink extends ApolloLink { const response = (this.mockedResponsesByKey[key] || []).find((res, index) => { const requestVariables = operation.variables || {}; const mockedResponseVariables = res.request.variables || {}; - if (!isEqual(requestVariables, mockedResponseVariables)) { + const dynamicVariables = res.request.dynamicVariables || false; + if (!dynamicVariables && !isEqual(requestVariables, mockedResponseVariables)) { return false; } responseIndex = index; From 58122495ab57a7f7ff1a68fcb370c767d36fb606 Mon Sep 17 00:00:00 2001 From: Gabriel Ramos Date: Wed, 3 Oct 2018 12:38:42 -0300 Subject: [PATCH 2/4] refactor(type): update dynamicVariables location at mock request and add type --- src/test-links.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test-links.ts b/src/test-links.ts index b84c624dca..7b183a5a41 100644 --- a/src/test-links.ts +++ b/src/test-links.ts @@ -17,6 +17,7 @@ export interface MockedResponse { error?: Error; delay?: number; newData?: () => FetchResult; + dynamicVariables: boolean; } export interface MockedSubscriptionResult { @@ -58,7 +59,7 @@ export class MockLink extends ApolloLink { const response = (this.mockedResponsesByKey[key] || []).find((res, index) => { const requestVariables = operation.variables || {}; const mockedResponseVariables = res.request.variables || {}; - const dynamicVariables = res.request.dynamicVariables || false; + const dynamicVariables = res.dynamicVariables || false; if (!dynamicVariables && !isEqual(requestVariables, mockedResponseVariables)) { return false; } From fc886bfbf47fb423e63707b46ab428e553e0de43 Mon Sep 17 00:00:00 2001 From: Gabriel Ramos Date: Wed, 3 Oct 2018 12:41:48 -0300 Subject: [PATCH 3/4] refactor(mock): update mock type --- package-lock.json | 41 +++++++++++----------------------------- test/test-utils.test.tsx | 1 + 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0d981e92f2..b2761019ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3286,8 +3286,7 @@ "version": "2.1.1", "resolved": false, "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -3311,15 +3310,13 @@ "version": "1.0.0", "resolved": false, "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "resolved": false, "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3336,22 +3333,19 @@ "version": "1.1.0", "resolved": false, "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "resolved": false, "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "resolved": false, "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -3482,8 +3476,7 @@ "version": "2.0.3", "resolved": false, "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -3497,7 +3490,6 @@ "resolved": false, "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3514,7 +3506,6 @@ "resolved": false, "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3523,15 +3514,13 @@ "version": "0.0.8", "resolved": false, "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "resolved": false, "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -3552,7 +3541,6 @@ "resolved": false, "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -3641,8 +3629,7 @@ "version": "1.0.1", "resolved": false, "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -3656,7 +3643,6 @@ "resolved": false, "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3752,8 +3738,7 @@ "version": "5.1.1", "resolved": false, "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -3795,7 +3780,6 @@ "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3817,7 +3801,6 @@ "resolved": false, "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3866,15 +3849,13 @@ "version": "1.0.2", "resolved": false, "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.2", "resolved": false, "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", - "dev": true, - "optional": true + "dev": true } } }, diff --git a/test/test-utils.test.tsx b/test/test-utils.test.tsx index ad3be3d2c2..3d1cc920ba 100644 --- a/test/test-utils.test.tsx +++ b/test/test-utils.test.tsx @@ -61,6 +61,7 @@ const mocks: ReadonlyArray = [ variables, }, result: { data: { user } }, + dynamicVariables: false, }, ]; From 72dde6e79896d13b2a9d88f05c77da341eb8e7b5 Mon Sep 17 00:00:00 2001 From: Gabriel Ramos Date: Wed, 3 Oct 2018 14:24:37 -0300 Subject: [PATCH 4/4] fix(type): fix typo on type --- src/test-links.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test-links.ts b/src/test-links.ts index 7b183a5a41..ef93c36d52 100644 --- a/src/test-links.ts +++ b/src/test-links.ts @@ -17,7 +17,7 @@ export interface MockedResponse { error?: Error; delay?: number; newData?: () => FetchResult; - dynamicVariables: boolean; + dynamicVariables?: boolean; } export interface MockedSubscriptionResult {