Просмотр исходного кода

test(server): Fix non-deterministic e2e tests, increase timeout

Michael Bromley 7 лет назад
Родитель
Сommit
3a57914a2e

+ 0 - 14
server/e2e/__snapshots__/role.e2e-spec.ts.snap

@@ -2,13 +2,6 @@
 
 exports[`Role resolver createRole 1`] = `
 Object {
-  "channels": Array [
-    Object {
-      "code": "__default_channel__",
-      "id": "1",
-      "token": "fv7ujes35zmpe1vgkvn8",
-    },
-  ],
   "code": "test",
   "description": "test role",
   "id": "3",
@@ -21,13 +14,6 @@ Object {
 
 exports[`Role resolver updateRole 1`] = `
 Object {
-  "channels": Array [
-    Object {
-      "code": "__default_channel__",
-      "id": "1",
-      "token": "fv7ujes35zmpe1vgkvn8",
-    },
-  ],
   "code": "test-modified",
   "description": "test role modified",
   "id": "3",

+ 1 - 1
server/e2e/administrator.e2e-spec.ts

@@ -31,7 +31,7 @@ describe('Administrator resolver', () => {
             customerCount: 1,
         });
         await client.init();
-    }, 30000);
+    }, 60000);
 
     afterAll(async () => {
         await server.destroy();

+ 1 - 1
server/e2e/auth.e2e-spec.ts

@@ -39,7 +39,7 @@ describe('Authorization & permissions', () => {
             customerCount: 1,
         });
         await client.init();
-    }, 30000);
+    }, 60000);
 
     afterAll(async () => {
         await server.destroy();

+ 1 - 1
server/e2e/product.e2e-spec.ts

@@ -49,7 +49,7 @@ describe('Product resolver', () => {
             customerCount: 1,
         });
         await client.init();
-    }, 30000);
+    }, 60000);
 
     afterAll(async () => {
         await server.destroy();

+ 4 - 3
server/e2e/role.e2e-spec.ts

@@ -10,6 +10,7 @@ import {
     UpdateRole,
     UpdateRoleVariables,
 } from 'shared/generated-types';
+import { omit } from 'shared/omit';
 import { CUSTOMER_ROLE_CODE, SUPER_ADMIN_ROLE_CODE } from 'shared/shared-constants';
 
 import {
@@ -34,7 +35,7 @@ describe('Role resolver', () => {
             customerCount: 1,
         });
         await client.init();
-    }, 30000);
+    }, 60000);
 
     afterAll(async () => {
         await server.destroy();
@@ -58,7 +59,7 @@ describe('Role resolver', () => {
         });
 
         createdRole = result.createRole;
-        expect(createdRole).toMatchSnapshot();
+        expect(omit(createdRole, ['channels'])).toMatchSnapshot();
     });
 
     it('role', async () => {
@@ -76,7 +77,7 @@ describe('Role resolver', () => {
             },
         });
 
-        expect(result.updateRole).toMatchSnapshot();
+        expect(omit(result.updateRole, ['channels'])).toMatchSnapshot();
     });
 
     it('updateRole is not allowed for SuperAdmin role', async () => {