Skip to content

Commit 1f5cccd

Browse files
committed
Fix broken tests after rename mongooseModelToTypeComposer to composeWithMongoose.
1 parent 9dedb80 commit 1f5cccd

15 files changed

+50
-49
lines changed

src/__tests__/modelConverter-test.js

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,40 @@
22

33
import { expect } from 'chai';
44
import { UserModel } from '../__mocks__/userModel.js';
5-
import { mongooseModelToTypeComposer as mm2tc } from '../modelConverter';
5+
import { composeWithMongoose } from '../composeWithMongoose';
66
import { TypeComposer, InputTypeComposer } from 'graphql-compose';
77

88

99
describe('modelConverter', () => {
1010
describe('mongooseModelToTypeComposer()', () => {
1111
describe('basics', () => {
1212
it('should return TypeComposer', () => {
13-
expect(mm2tc(UserModel)).instanceof(TypeComposer);
14-
expect(mm2tc(UserModel, { name: 'Ok' })).instanceof(TypeComposer);
13+
expect(composeWithMongoose(UserModel)).instanceof(TypeComposer);
14+
expect(composeWithMongoose(UserModel, { name: 'Ok' })).instanceof(TypeComposer);
1515
});
1616

1717
it('should set type name from model or opts.name', () => {
18-
expect(mm2tc(UserModel).getTypeName())
18+
expect(composeWithMongoose(UserModel).getTypeName())
1919
.equal(UserModel.modelName);
20-
expect(mm2tc(UserModel, { name: 'Ok' }).getTypeName())
20+
expect(composeWithMongoose(UserModel, { name: 'Ok' }).getTypeName())
2121
.equal('Ok');
2222
});
2323

2424
it('should set description from opts.description', () => {
25-
expect(mm2tc(UserModel, { description: 'This is model from mongoose' }).getDescription())
26-
.equal('This is model from mongoose');
25+
const description = 'This is model from mongoose';
26+
expect(composeWithMongoose(UserModel, { description }).getDescription())
27+
.equal(description);
2728
});
2829

2930
it('should get fields from mongoose model', () => {
30-
const tc = mm2tc(UserModel);
31+
const tc = composeWithMongoose(UserModel);
3132
expect(tc.getFields()).to.contain.keys(['_id', 'name', 'gender', 'age']);
3233
});
3334
});
3435

3536
describe('filterFields()', () => {
3637
it('should proceed opts.fields.remove', () => {
37-
const tc = mm2tc(UserModel, {
38+
const tc = composeWithMongoose(UserModel, {
3839
fields: {
3940
remove: ['name', 'gender'],
4041
},
@@ -44,7 +45,7 @@ describe('modelConverter', () => {
4445
});
4546

4647
it('should proceed opts.fields.only', () => {
47-
const tc = mm2tc(UserModel, {
48+
const tc = composeWithMongoose(UserModel, {
4849
fields: {
4950
only: ['name', 'gender'],
5051
},
@@ -55,12 +56,12 @@ describe('modelConverter', () => {
5556

5657
describe('createInputType()', () => {
5758
it('should be availiable InputTypeComposer', () => {
58-
const inputTypeComposer = mm2tc(UserModel).getInputTypeComposer();
59+
const inputTypeComposer = composeWithMongoose(UserModel).getInputTypeComposer();
5960
expect(inputTypeComposer).instanceof(InputTypeComposer);
6061
});
6162

6263
it('should set type name opts.inputType.name', () => {
63-
const inputTypeComposer = mm2tc(UserModel, {
64+
const inputTypeComposer = composeWithMongoose(UserModel, {
6465
inputType: {
6566
name: 'GreatUserInput',
6667
},
@@ -71,7 +72,7 @@ describe('modelConverter', () => {
7172
});
7273

7374
it('should set description from opts.inputType.name', () => {
74-
const inputTypeComposer = mm2tc(UserModel, {
75+
const inputTypeComposer = composeWithMongoose(UserModel, {
7576
inputType: {
7677
description: 'type for input data',
7778
},
@@ -82,7 +83,7 @@ describe('modelConverter', () => {
8283
});
8384

8485
it('should proceed opts.inputType.fields.remove', () => {
85-
const inputTypeComposer = mm2tc(UserModel, {
86+
const inputTypeComposer = composeWithMongoose(UserModel, {
8687
inputType: {
8788
fields: {
8889
remove: ['name', 'gender'],
@@ -95,7 +96,7 @@ describe('modelConverter', () => {
9596
});
9697

9798
it('should proceed opts.inputType.fields.only', () => {
98-
const inputTypeComposer = mm2tc(UserModel, {
99+
const inputTypeComposer = composeWithMongoose(UserModel, {
99100
inputType: {
100101
fields: {
101102
only: ['name', 'gender'],
@@ -107,7 +108,7 @@ describe('modelConverter', () => {
107108
});
108109

109110
it('should proceed opts.inputType.fields.required', () => {
110-
const inputTypeComposer = mm2tc(UserModel, {
111+
const inputTypeComposer = composeWithMongoose(UserModel, {
111112
inputType: {
112113
fields: {
113114
required: ['name', 'gender'],
@@ -123,19 +124,19 @@ describe('modelConverter', () => {
123124

124125
describe('createResolvers()', () => {
125126
it('should not be called if opts.resolvers === false', () => {
126-
const tc = mm2tc(UserModel, { resolvers: false });
127+
const tc = composeWithMongoose(UserModel, { resolvers: false });
127128
expect(tc.getResolvers().getKeys()).is.empty;
128129
});
129130

130131
it('should be called if opts.resolvers not exists or has value', () => {
131-
const tc = mm2tc(UserModel);
132+
const tc = composeWithMongoose(UserModel);
132133
expect(tc.getResolvers().getKeys()).is.not.empty;
133-
const tc2 = mm2tc(UserModel, { resolvers: {} });
134+
const tc2 = composeWithMongoose(UserModel, { resolvers: {} });
134135
expect(tc2.getResolvers().getKeys()).is.not.empty;
135136
});
136137

137138
it('should not provide resolver if opts.resolvers.[resolverName] === false', () => {
138-
const tc2 = mm2tc(UserModel, {
139+
const tc2 = composeWithMongoose(UserModel, {
139140
resolvers: {
140141
count: false,
141142
removeById: false,
@@ -155,7 +156,7 @@ describe('modelConverter', () => {
155156

156157
describe('complex situations', () => {
157158
it('required input fields, should be passed down to resolvers', () => {
158-
const typeComposer = mm2tc(UserModel, {
159+
const typeComposer = composeWithMongoose(UserModel, {
159160
inputType: {
160161
fields: {
161162
required: ['age'],

src/resolvers/__tests__/count-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { expect } from 'chai';
44
import { UserModel } from '../../__mocks__/userModel.js';
55
import count from '../count';
66
import { Resolver } from 'graphql-compose';
7-
import { mongooseModelToTypeComposer } from '../../modelConverter';
7+
import { composeWithMongoose } from '../../composeWithMongoose';
88
import { GraphQLInt } from 'graphql';
99

10-
const UserTypeComposer = mongooseModelToTypeComposer(UserModel);
10+
const UserTypeComposer = composeWithMongoose(UserModel);
1111

1212
describe('count() ->', () => {
1313
let user1;

src/resolvers/__tests__/createOne-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { expect } from 'chai';
44
import { UserModel } from '../../__mocks__/userModel.js';
55
import createOne from '../createOne';
66
import { Resolver, TypeComposer } from 'graphql-compose';
7-
import { mongooseModelToTypeComposer } from '../../modelConverter';
7+
import { composeWithMongoose } from '../../composeWithMongoose';
88
import GraphQLMongoID from '../../types/mongoid';
99
import { GraphQLNonNull } from 'graphql';
1010

11-
const UserTypeComposer = mongooseModelToTypeComposer(UserModel);
11+
const UserTypeComposer = composeWithMongoose(UserModel);
1212

1313
describe('createOne() ->', () => {
1414
before('clear UserModel collection', (done) => {

src/resolvers/__tests__/findById-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import findById from '../findById';
66
import { Resolver } from 'graphql-compose';
77
import { GraphQLNonNull } from 'graphql';
88
import GraphQLMongoID from '../../types/mongoid';
9-
import { mongooseModelToTypeComposer } from '../../modelConverter';
9+
import { composeWithMongoose } from '../../composeWithMongoose';
1010

11-
const UserTypeComposer = mongooseModelToTypeComposer(UserModel);
11+
const UserTypeComposer = composeWithMongoose(UserModel);
1212

1313
describe('findById() ->', () => {
1414
let user;

src/resolvers/__tests__/findByIds-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import findByIds from '../findByIds';
66
import { Resolver } from 'graphql-compose';
77
import { GraphQLNonNull, GraphQLList } from 'graphql';
88
import GraphQLMongoID from '../../types/mongoid';
9-
import { mongooseModelToTypeComposer } from '../../modelConverter';
9+
import { composeWithMongoose } from '../../composeWithMongoose';
1010

11-
const UserTypeComposer = mongooseModelToTypeComposer(UserModel);
11+
const UserTypeComposer = composeWithMongoose(UserModel);
1212

1313
describe('findByIds() ->', () => {
1414
let user1;

src/resolvers/__tests__/findMany-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { expect } from 'chai';
44
import { UserModel } from '../../__mocks__/userModel.js';
55
import findMany from '../findMany';
66
import { Resolver } from 'graphql-compose';
7-
import { mongooseModelToTypeComposer } from '../../modelConverter';
7+
import { composeWithMongoose } from '../../composeWithMongoose';
88

9-
const UserTypeComposer = mongooseModelToTypeComposer(UserModel);
9+
const UserTypeComposer = composeWithMongoose(UserModel);
1010

1111
describe('findMany() ->', () => {
1212
let user1;

src/resolvers/__tests__/findOne-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { UserModel } from '../../__mocks__/userModel.js';
55
import findOne from '../findOne';
66
import { Resolver } from 'graphql-compose';
77
import { GraphQLNonNull } from 'graphql';
8-
import { mongooseModelToTypeComposer } from '../../modelConverter';
8+
import { composeWithMongoose } from '../../composeWithMongoose';
99

10-
const UserTypeComposer = mongooseModelToTypeComposer(UserModel);
10+
const UserTypeComposer = composeWithMongoose(UserModel);
1111

1212
describe('findOne() ->', () => {
1313
let user1;

src/resolvers/__tests__/removeById-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import removeById from '../removeById';
66
import { Resolver, TypeComposer } from 'graphql-compose';
77
import { GraphQLNonNull } from 'graphql';
88
import GraphQLMongoID from '../../types/mongoid';
9-
import { mongooseModelToTypeComposer } from '../../modelConverter';
9+
import { composeWithMongoose } from '../../composeWithMongoose';
1010

11-
const UserTypeComposer = mongooseModelToTypeComposer(UserModel);
11+
const UserTypeComposer = composeWithMongoose(UserModel);
1212

1313
describe('removeById() ->', () => {
1414
let user;

src/resolvers/__tests__/removeMany-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import removeMany from '../removeMany';
66
import Resolver from 'graphql-compose/lib/resolver/resolver';
77
import TypeComposer from 'graphql-compose/lib/typeComposer';
88
import { GraphQLInt, GraphQLNonNull } from 'graphql';
9-
import { mongooseModelToTypeComposer } from '../../modelConverter';
9+
import { composeWithMongoose } from '../../composeWithMongoose';
1010

11-
const UserTypeComposer = mongooseModelToTypeComposer(UserModel);
11+
const UserTypeComposer = composeWithMongoose(UserModel);
1212

1313
describe('removeMany() ->', () => {
1414
let user1;

src/resolvers/__tests__/removeOne-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import removeOne from '../removeOne';
66
import { Resolver, TypeComposer } from 'graphql-compose';
77
import GraphQLMongoID from '../../types/mongoid';
88
import { mongoose } from '../../__mocks__/mongooseCommon';
9-
import { mongooseModelToTypeComposer } from '../../modelConverter';
9+
import { composeWithMongoose } from '../../composeWithMongoose';
1010

11-
const UserTypeComposer = mongooseModelToTypeComposer(UserModel);
11+
const UserTypeComposer = composeWithMongoose(UserModel);
1212

1313
describe('removeOne() ->', () => {
1414
let user1;

0 commit comments

Comments
 (0)