Skip to content

Commit 70382e8

Browse files
coratgerlcoratgerl
committed
fix: feedbacks
1 parent 7f282c3 commit 70382e8

File tree

7 files changed

+60
-98
lines changed

7 files changed

+60
-98
lines changed

‎spec/AudienceRouter.spec.js‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ const request = require('../lib/request');
55
const AudiencesRouter = require('../lib/Routers/AudiencesRouter').AudiencesRouter;
66

77
describe('AudiencesRouter', () => {
8+
let loggerErrorSpy;
9+
10+
beforeEach(() => {
11+
const logger = require('../lib/logger').default;
12+
loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
13+
});
14+
815
it('uses find condition from request.body', done => {
916
const config = Config.get('test');
1017
const androidAudienceRequest = {
@@ -263,8 +270,6 @@ describe('AudiencesRouter', () => {
263270
});
264271

265272
it('should only create with master key', done => {
266-
const logger = require('../lib/logger').default;
267-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
268273
loggerErrorSpy.calls.reset();
269274
Parse._request('POST', 'push_audiences', {
270275
name: 'My Audience',
@@ -280,8 +285,6 @@ describe('AudiencesRouter', () => {
280285
});
281286

282287
it('should only find with master key', done => {
283-
const logger = require('../lib/logger').default;
284-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
285288
loggerErrorSpy.calls.reset();
286289
Parse._request('GET', 'push_audiences', {}).then(
287290
() => {},
@@ -294,8 +297,6 @@ describe('AudiencesRouter', () => {
294297
});
295298

296299
it('should only get with master key', done => {
297-
const logger = require('../lib/logger').default;
298-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
299300
loggerErrorSpy.calls.reset();
300301
Parse._request('GET', `push_audiences/someId`, {}).then(
301302
() => {},
@@ -308,8 +309,6 @@ describe('AudiencesRouter', () => {
308309
});
309310

310311
it('should only update with master key', done => {
311-
const logger = require('../lib/logger').default;
312-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
313312
loggerErrorSpy.calls.reset();
314313
Parse._request('PUT', `push_audiences/someId`, {
315314
name: 'My Audience 2',
@@ -324,8 +323,6 @@ describe('AudiencesRouter', () => {
324323
});
325324

326325
it('should only delete with master key', done => {
327-
const logger = require('../lib/logger').default;
328-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
329326
loggerErrorSpy.calls.reset();
330327
Parse._request('DELETE', `push_audiences/someId`, {}).then(
331328
() => {},

‎spec/ParseFile.spec.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ for (let i = 0; i < str.length; i++) {
1313
}
1414

1515
describe('Parse.File testing', () => {
16+
let loggerErrorSpy;
17+
18+
beforeEach(() => {
19+
const logger = require('../lib/logger').default;
20+
loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
21+
});
22+
1623
describe('creating files', () => {
1724
it('works with Content-Type', done => {
1825
const headers = {
@@ -132,9 +139,6 @@ describe('Parse.File testing', () => {
132139
});
133140

134141
it('blocks file deletions with missing or incorrect master-key header', done => {
135-
const logger = require('../lib/logger').default;
136-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
137-
138142
const headers = {
139143
'Content-Type': 'image/jpeg',
140144
'X-Parse-Application-Id': 'test',
@@ -763,8 +767,6 @@ describe('Parse.File testing', () => {
763767

764768
describe('getting files', () => {
765769
it('does not crash on file request with invalid app ID', async () => {
766-
const logger = require('../lib/logger').default;
767-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
768770
loggerErrorSpy.calls.reset();
769771
const res1 = await request({
770772
url: 'http://localhost:8378/1/files/invalid-id/invalid-file.txt',

‎spec/ParseGraphQLServer.spec.js‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ function handleError(e) {
4747
describe('ParseGraphQLServer', () => {
4848
let parseServer;
4949
let parseGraphQLServer;
50+
let loggerErrorSpy;
51+
5052

5153
beforeEach(async () => {
5254
parseServer = await global.reconfigureServer({
@@ -58,6 +60,9 @@ describe('ParseGraphQLServer', () => {
5860
playgroundPath: '/playground',
5961
subscriptionsPath: '/subscriptions',
6062
});
63+
64+
const logger = require('../lib/logger').default;
65+
loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
6166
});
6267

6368
describe('constructor', () => {
@@ -3488,8 +3493,6 @@ describe('ParseGraphQLServer', () => {
34883493
});
34893494

34903495
it('should require master key to create a new class', async () => {
3491-
const logger = require('../lib/logger').default;
3492-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
34933496
loggerErrorSpy.calls.reset();
34943497
try {
34953498
await apolloClient.mutate({
@@ -3862,8 +3865,6 @@ describe('ParseGraphQLServer', () => {
38623865
handleError(e);
38633866
}
38643867

3865-
const logger = require('../lib/logger').default;
3866-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
38673868
loggerErrorSpy.calls.reset();
38683869
try {
38693870
await apolloClient.mutate({
@@ -4091,8 +4092,6 @@ describe('ParseGraphQLServer', () => {
40914092
handleError(e);
40924093
}
40934094

4094-
const logger = require('../lib/logger').default;
4095-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
40964095
loggerErrorSpy.calls.reset();
40974096
try {
40984097
await apolloClient.mutate({
@@ -4136,8 +4135,6 @@ describe('ParseGraphQLServer', () => {
41364135
});
41374136

41384137
it('should require master key to get an existing class', async () => {
4139-
const logger = require('../lib/logger').default;
4140-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
41414138
loggerErrorSpy.calls.reset();
41424139
try {
41434140
await apolloClient.query({
@@ -4158,8 +4155,6 @@ describe('ParseGraphQLServer', () => {
41584155
});
41594156

41604157
it('should require master key to find the existing classes', async () => {
4161-
const logger = require('../lib/logger').default;
4162-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
41634158
loggerErrorSpy.calls.reset();
41644159
try {
41654160
await apolloClient.query({
@@ -7801,8 +7796,6 @@ describe('ParseGraphQLServer', () => {
78017796
});
78027797

78037798
it('should fail due to empty session token', async () => {
7804-
const logger = require('../lib/logger').default;
7805-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
78067799
try {
78077800
await apolloClient.query({
78087801
query: gql`
@@ -7835,9 +7828,6 @@ describe('ParseGraphQLServer', () => {
78357828

78367829
await parseGraphQLServer.parseGraphQLSchema.schemaCache.clear();
78377830

7838-
const logger = require('../lib/logger').default;
7839-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
7840-
78417831
try {
78427832
await apolloClient.query({
78437833
query: gql`

‎spec/ParseUser.spec.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ describe('allowExpiredAuthDataToken option', () => {
3939
});
4040

4141
describe('Parse.User testing', () => {
42+
let loggerErrorSpy;
43+
beforeEach(() => {
44+
const logger = require('../lib/logger').default;
45+
loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
46+
});
47+
4248
it('user sign up class method', async done => {
4349
const user = await Parse.User.signUp('asdf', 'zxcv');
4450
ok(user.getSessionToken());
@@ -2633,9 +2639,6 @@ describe('Parse.User testing', () => {
26332639
});
26342640

26352641
it('cannot delete session if no sessionToken', done => {
2636-
const logger = require('../lib/logger').default;
2637-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
2638-
26392642
Promise.resolve()
26402643
.then(() => {
26412644
return Parse.User.signUp('test1', 'test', { foo: 'bar' });
@@ -4292,6 +4295,12 @@ describe('Security Advisory GHSA-8w3j-g983-8jh5', function () {
42924295
});
42934296

42944297
describe('login as other user', () => {
4298+
let loggerErrorSpy;
4299+
beforeEach(() => {
4300+
const logger = require('../lib/logger').default;
4301+
loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
4302+
});
4303+
42954304
it('allows creating a session for another user with the master key', async done => {
42964305
await Parse.User.signUp('some_user', 'some_password');
42974306
const userId = Parse.User.current().id;
@@ -4387,9 +4396,6 @@ describe('login as other user', () => {
43874396
});
43884397

43894398
it('rejects creating a session for another user without the master key', async done => {
4390-
const logger = require('../lib/logger').default;
4391-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
4392-
43934399
await Parse.User.signUp('some_user', 'some_password');
43944400
const userId = Parse.User.current().id;
43954401
await Parse.User.logOut();

‎spec/Schema.spec.js‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ const hasAllPODobject = () => {
2020
};
2121

2222
describe('SchemaController', () => {
23+
let loggerErrorSpy;
24+
2325
beforeEach(() => {
2426
config = Config.get('test');
27+
const logger = require('../lib/logger').default;
28+
loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
2529
});
2630

2731
it('can validate one object', done => {
@@ -249,9 +253,6 @@ describe('SchemaController', () => {
249253
});
250254

251255
it('class-level permissions test count', done => {
252-
const logger = require('../lib/logger').default;
253-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
254-
255256
let obj;
256257
return (
257258
config.database
@@ -1433,8 +1434,12 @@ describe('SchemaController', () => {
14331434
});
14341435

14351436
describe('Class Level Permissions for requiredAuth', () => {
1437+
let loggerErrorSpy;
1438+
14361439
beforeEach(() => {
14371440
config = Config.get('test');
1441+
const logger = require('../lib/logger').default;
1442+
loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
14381443
});
14391444

14401445
function createUser() {
@@ -1445,9 +1450,6 @@ describe('Class Level Permissions for requiredAuth', () => {
14451450
}
14461451

14471452
it('required auth test find', done => {
1448-
const logger = require('../lib/logger').default;
1449-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
1450-
14511453
config.database
14521454
.loadSchema()
14531455
.then(schema => {
@@ -1548,8 +1550,6 @@ describe('Class Level Permissions for requiredAuth', () => {
15481550
});
15491551

15501552
it('required auth should reject create when not authenticated', done => {
1551-
const logger = require('../lib/logger').default;
1552-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
15531553
config.database
15541554
.loadSchema()
15551555
.then(schema => {
@@ -1634,9 +1634,6 @@ describe('Class Level Permissions for requiredAuth', () => {
16341634
});
16351635

16361636
it('required auth test get not authenticated', done => {
1637-
const logger = require('../lib/logger').default;
1638-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
1639-
16401637
config.database
16411638
.loadSchema()
16421639
.then(schema => {
@@ -1676,9 +1673,6 @@ describe('Class Level Permissions for requiredAuth', () => {
16761673
});
16771674

16781675
it('required auth test find not authenticated', done => {
1679-
const logger = require('../lib/logger').default;
1680-
const loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
1681-
16821676
config.database
16831677
.loadSchema()
16841678
.then(schema => {

0 commit comments

Comments
 (0)