joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(package): update jasmine to version 3.0.0 (#4553)

Browse Source 
* chore(package): update jasmine to version 3.0.0

Closes #4547

* Fixes failing tests for jasmine 3.0

Starting 3.0, done(something) will fail

* Update tests so they dont leverage var, but let and const

With jasmine 3.0, the randomization engine was making the test fails because of the scope of `var`

* Remove randomizer

* Use same adapter for PG tests, drop table to ensure the tests dont side effect
This commit is contained in:
Florent Vilmart
2018-02-17 09:55:30 -05:00
committed by GitHub
parent 8ec7785d53
commit b754d51e8e
81 changed files with 2698 additions and 2704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spec/Auth.spec.js
View File

@@ -1,11 +1,11 @@
describe('Auth', () => {
var Auth = require('../src/Auth.js').Auth;
const Auth = require('../src/Auth.js').Auth;
describe('getUserRoles', () => {
var auth;
var config;
var currentRoles = null;
var currentUserId = 'userId';
let auth;
let config;
let currentRoles = null;
const currentUserId = 'userId';
beforeEach(() => {
currentRoles = ['role:userId'];
@@ -33,10 +33,10 @@ describe('Auth', () => {
it('should get user roles from the cache', (done) => {
auth.getUserRoles()
.then((roles) => {
var firstSet = config.cacheController.role.set.calls.first();
const firstSet = config.cacheController.role.set.calls.first();
expect(firstSet).toEqual(undefined);
var firstGet = config.cacheController.role.get.calls.first();
const firstGet = config.cacheController.role.get.calls.first();
expect(firstGet.args[0]).toEqual(currentUserId);
expect(roles).toEqual(currentRoles);
done();
@@ -44,7 +44,7 @@ describe('Auth', () => {
});
it('should only query the roles once', (done) => {
var loadRolesSpy = spyOn(auth, '_loadRoles').and.callThrough();
const loadRolesSpy = spyOn(auth, '_loadRoles').and.callThrough();
auth.getUserRoles()
.then((roles) => {
expect(roles).toEqual(currentRoles);
@@ -57,7 +57,7 @@ describe('Auth', () => {
expect(config.cacheController.role.get.calls.count()).toEqual(1);
expect(loadRolesSpy.calls.count()).toEqual(1);
var firstGet = config.cacheController.role.get.calls.first();
const firstGet = config.cacheController.role.get.calls.first();
expect(firstGet.args[0]).toEqual(currentUserId);
expect(roles).toEqual(currentRoles);
done();
@@ -79,8 +79,8 @@ describe('Auth', () => {
});
it('should properly handle bcrypt upgrade', (done) => {
var bcryptOriginal = require('bcrypt-nodejs');
var bcryptNew = require('bcryptjs');
const bcryptOriginal = require('bcrypt-nodejs');
const bcryptNew = require('bcryptjs');
bcryptOriginal.hash('my1Long:password', null, null, function(err, res) {
bcryptNew.compare('my1Long:password', res, function(err, res) {
expect(res).toBeTruthy();