Skip to content

Commit d582e56

Browse files
committed
Simplified the code further
1 parent 63b4f9b commit d582e56

File tree

1 file changed

+14
-36
lines changed

1 file changed

+14
-36
lines changed

spec/ParseUser.spec.js

Lines changed: 14 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4431,23 +4431,13 @@ describe('allowClientClassCreation option', () => {
44314431
});
44324432
});
44334433

4434-
describe('custom log levels for username already exists error', () => {
4435-
const logger = require('../lib/logger').logger;
4436-
let warnSpy, errorSpy, infoSpy;
4437-
4438-
beforeEach(() => {
4439-
warnSpy = spyOn(logger, 'warn').and.callThrough();
4440-
errorSpy = spyOn(logger, 'error').and.callThrough();
4441-
infoSpy = spyOn(logger, 'info').and.callThrough();
4442-
});
4443-
4444-
afterEach(() => {
4445-
warnSpy.calls.reset();
4446-
errorSpy.calls.reset();
4447-
infoSpy.calls.reset();
4448-
});
4449-
4434+
describe('custom log levels for user errors', () => {
44504435
it('should respect custom log levels for username already exists error', async () => {
4436+
const logger = require('../lib/logger').logger;
4437+
const warnSpy = spyOn(logger, 'warn').and.callThrough();
4438+
const errorSpy = spyOn(logger, 'error').and.callThrough();
4439+
const infoSpy = spyOn(logger, 'info').and.callThrough();
4440+
44514441
const logLevels = ['warn', 'info'];
44524442

44534443
for (const logLevel of logLevels) {
@@ -4458,32 +4448,20 @@ describe('custom log levels for username already exists error', () => {
44584448
});
44594449

44604450
const username = `existingUser_${logLevel}`;
4461-
4462-
const user = new Parse.User();
4463-
user.setUsername(username);
4464-
user.setPassword('password');
4465-
await user.signUp();
4466-
4467-
const duplicateUser = new Parse.User();
4468-
duplicateUser.setUsername(username);
4469-
duplicateUser.setPassword('password');
4451+
await Parse.User.signUp(username, 'password');
44704452

44714453
try {
4472-
await duplicateUser.signUp();
4473-
fail('Should have thrown an error');
4454+
await Parse.User.signUp(username, 'password');
44744455
} catch (error) {
44754456
expect(error.code).toBe(Parse.Error.USERNAME_TAKEN);
4476-
if (logLevel === 'warn') {
4477-
expect(warnSpy).toHaveBeenCalled();
4478-
expect(infoSpy).not.toHaveBeenCalled();
4479-
} else if (logLevel === 'info') {
4480-
expect(infoSpy).toHaveBeenCalled();
4481-
expect(warnSpy).not.toHaveBeenCalled();
4482-
}
4483-
expect(errorSpy).not.toHaveBeenCalled();
4457+
expect(logger[logLevel]).toHaveBeenCalled();
4458+
['warn', 'error', 'info'].forEach(level => {
4459+
if (level !== logLevel) {
4460+
expect(logger[level]).not.toHaveBeenCalled();
4461+
}
4462+
});
44844463
}
44854464

4486-
// Reset spies for the next iteration
44874465
warnSpy.calls.reset();
44884466
errorSpy.calls.reset();
44894467
infoSpy.calls.reset();

0 commit comments

Comments
 (0)