test(beforeEach): Correct tests isolation from previous executions

Author: nodkz

src/resolvers/__tests__/count-test.js

@@ -6,11 +6,17 @@ import { Resolver } from 'graphql-compose';
 import { UserModel } from '../../__mocks__/userModel';
 import count from '../count';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
+describe('count() ->', () => {
+  let UserTypeComposer;
 
-const UserTypeComposer = composeWithMongoose(UserModel);
+  beforeEach(() => {
+    typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
+    UserTypeComposer = composeWithMongoose(UserModel);
+  });
 
-describe('count() ->', () => {
   let user1;
   let user2;
 

src/resolvers/__tests__/createOne-test.js

@@ -10,9 +10,16 @@ import { composeWithMongoose } from '../../composeWithMongoose';
 import GraphQLMongoID from '../../types/mongoid';
 import typeStorage from '../../typeStorage';
 
-const UserTypeComposer = composeWithMongoose(UserModel);
 
 describe('createOne() ->', () => {
+  let UserTypeComposer;
+
+  beforeEach(() => {
+    typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
+    UserTypeComposer = composeWithMongoose(UserModel);
+  });
+
   beforeEach('clear UserModel collection', (done) => {
     UserModel.collection.drop(() => {
       done();

src/resolvers/__tests__/findById-test.js

@@ -8,11 +8,22 @@ import { PostModel } from '../../__mocks__/postModel';
 import findById from '../findById';
 import GraphQLMongoID from '../../types/mongoid';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
-const UserTypeComposer = composeWithMongoose(UserModel);
-const PostTypeComposer = composeWithMongoose(PostModel);
 
 describe('findById() ->', () => {
+  let UserTypeComposer;
+  let PostTypeComposer;
+
+  beforeEach(() => {
+    typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
+    UserTypeComposer = composeWithMongoose(UserModel);
+
+    PostModel.schema._gqcTypeComposer = undefined;
+    PostTypeComposer = composeWithMongoose(PostModel);
+  });
+
   let user;
   let post;
 

src/resolvers/__tests__/findByIds-test.js

@@ -8,11 +8,22 @@ import { PostModel } from '../../__mocks__/postModel';
 import findByIds from '../findByIds';
 import GraphQLMongoID from '../../types/mongoid';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
-const UserTypeComposer = composeWithMongoose(UserModel);
-const PostTypeComposer = composeWithMongoose(PostModel);
 
 describe('findByIds() ->', () => {
+  let UserTypeComposer;
+  let PostTypeComposer;
+
+  beforeEach(() => {
+    typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
+    UserTypeComposer = composeWithMongoose(UserModel);
+
+    PostModel.schema._gqcTypeComposer = undefined;
+    PostTypeComposer = composeWithMongoose(PostModel);
+  });
+
   let user1;
   let user2;
   let user3;

src/resolvers/__tests__/findMany-test.js

@@ -5,10 +5,18 @@ import { Resolver } from 'graphql-compose';
 import { UserModel } from '../../__mocks__/userModel';
 import findMany from '../findMany';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
-const UserTypeComposer = composeWithMongoose(UserModel);
 
 describe('findMany() ->', () => {
+  let UserTypeComposer;
+
+  beforeEach(() => {
+    typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
+    UserTypeComposer = composeWithMongoose(UserModel);
+  });
+
   let user1;
   let user2;
 

src/resolvers/__tests__/findOne-test.js

@@ -6,10 +6,18 @@ import { Resolver } from 'graphql-compose';
 import { UserModel } from '../../__mocks__/userModel';
 import findOne from '../findOne';
 import { composeWithMongoose } from '../../composeWithMongoose';
+import typeStorage from '../../typeStorage';
 
-const UserTypeComposer = composeWithMongoose(UserModel);
 
 describe('findOne() ->', () => {
+  let UserTypeComposer;
+
+  beforeEach(() => {
+    typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
+    UserTypeComposer = composeWithMongoose(UserModel);
+  });
+
   let user1;
   let user2;
 

src/resolvers/__tests__/removeById-test.js

@@ -10,9 +10,16 @@ import GraphQLMongoID from '../../types/mongoid';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import typeStorage from '../../typeStorage';
 
-const UserTypeComposer = composeWithMongoose(UserModel);
 
 describe('removeById() ->', () => {
+  let UserTypeComposer;
+
+  beforeEach(() => {
+    typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
+    UserTypeComposer = composeWithMongoose(UserModel);
+  });
+
   let user;
 
   beforeEach('clear UserModel collection', (done) => {

src/resolvers/__tests__/removeMany-test.js

@@ -9,9 +9,16 @@ import removeMany from '../removeMany';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import typeStorage from '../../typeStorage';
 
-const UserTypeComposer = composeWithMongoose(UserModel);
 
 describe('removeMany() ->', () => {
+  let UserTypeComposer;
+
+  beforeEach(() => {
+    typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
+    UserTypeComposer = composeWithMongoose(UserModel);
+  });
+
   let user1;
   let user2;
   let user3;

src/resolvers/__tests__/removeOne-test.js

@@ -11,9 +11,16 @@ import { mongoose } from '../../__mocks__/mongooseCommon';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import typeStorage from '../../typeStorage';
 
-const UserTypeComposer = composeWithMongoose(UserModel);
 
 describe('removeOne() ->', () => {
+  let UserTypeComposer;
+
+  beforeEach(() => {
+    typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
+    UserTypeComposer = composeWithMongoose(UserModel);
+  });
+
   let user1;
   let user2;
   let user3;

src/resolvers/__tests__/updateById-test.js

@@ -15,9 +15,16 @@ import GraphQLMongoID from '../../types/mongoid';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import typeStorage from '../../typeStorage';
 
-const UserTypeComposer = composeWithMongoose(UserModel);
 
 describe('updateById() ->', () => {
+  let UserTypeComposer;
+
+  beforeEach(() => {
+    typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
+    UserTypeComposer = composeWithMongoose(UserModel);
+  });
+
   let user1;
   let user2;