diff --git a/package.json b/package.json index 13a07a0fe9..ef5ba7104e 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "dashboard": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --progress --watch", "pig": "http-server ./PIG -p 4041 -s & webpack --config webpack/PIG.config.js --progress --watch", "build": "cross-env NODE_ENV=production webpack --config webpack/production.config.js && webpack --config webpack/PIG.config.js", - "test": "cross-env NODE_PATH=./node_modules jest", + "test": "jest", "lint": "eslint . --ignore-path .gitignore --cache", "pretest": "npm run lint", "generate": "node scripts/generate.js", diff --git a/src/lib/tests/Authentication.test.js b/src/lib/tests/Authentication.test.js index 0cf381abc1..71a7249cd4 100644 --- a/src/lib/tests/Authentication.test.js +++ b/src/lib/tests/Authentication.test.js @@ -54,7 +54,9 @@ function createAuthenticationResult(isAuthenticated, matchingUsername, appsUserH isAuthenticated, matchingUsername, appsUserHasAccessTo, - isReadOnly + isReadOnly, + otpMissing: false, + otpValid: true } } diff --git a/src/lib/tests/ColumnPreferences.test.js b/src/lib/tests/ColumnPreferences.test.js index 626433358a..93f77d24e9 100644 --- a/src/lib/tests/ColumnPreferences.test.js +++ b/src/lib/tests/ColumnPreferences.test.js @@ -43,17 +43,17 @@ describe('ColumnPreferences', () => { it('can retrive column orderings', () => { ColumnPreferences.updatePreferences([{ name: 'objectId', width: 100 }, { name: 'createdAt', width: 150 }], 'testapp', 'Klass'); expect(ColumnPreferences.getOrder({ objectId: {}, createdAt: {} }, 'testapp', 'Klass')).toEqual( - [{ name: 'objectId', width: 100, visible: true }, { name: 'createdAt', width: 150, visible: true }] + [{ cached: true, required: false, name: 'objectId', width: 100, visible: true }, { cached: true, required: false, name: 'createdAt', width: 150, visible: true }] ); }); it('tacks unknown columns onto the end', () => { ColumnPreferences.updatePreferences([{ name: 'objectId', width: 100 }, { name: 'createdAt', width: 150 }], 'testapp', 'Klass'); expect(ColumnPreferences.getOrder({ objectId: {}, updatedAt: {}, createdAt: {}, someField: {} }, 'testapp', 'Klass')).toEqual( - [{ name: 'objectId', width: 100, visible: true }, { name: 'createdAt', width: 150, visible: true }, { name: 'updatedAt', width: 150, visible: true }, { name: 'someField', width: 150, visible: true }] + [{ cached: true, required: false, name: 'objectId', width: 100, visible: true }, { cached: true, required: false, name: 'createdAt', width: 150, visible: true }, { cached: true, required: false, name: 'updatedAt', width: 150, visible: true }, { cached: true, required: false, name: 'someField', width: 150, visible: true }] ); expect(ColumnPreferences.getPreferences('testapp', 'Klass')).toEqual( - [{ name: 'objectId', width: 100, visible: true }, { name: 'createdAt', width: 150, visible: true }, { name: 'updatedAt', width: 150, visible: true }, { name: 'someField', width: 150, visible: true }] + [{ cached: true, required: false, name: 'objectId', width: 100, visible: true }, { cached: true, required: false, name: 'createdAt', width: 150, visible: true }, { cached: true, required: false, name: 'updatedAt', width: 150, visible: true }, { cached: true, required: false, name: 'someField', width: 150, visible: true }] ); }); @@ -64,17 +64,17 @@ describe('ColumnPreferences', () => { 'Klass' ); expect(ColumnPreferences.getOrder({ objectId: {}, createdAt: {}, updatedAt: {} }, 'testapp', 'Klass')).toEqual( - [{ name: 'objectId', width: 100, visible: true }, { name: 'createdAt', width: 150, visible: true }, { name: 'updatedAt', width: 150, visible: true }] + [{ cached: true, required: false, name: 'objectId', width: 100, visible: true }, { cached: true, required: false, name: 'createdAt', width: 150, visible: true }, { cached: true, required: false, name: 'updatedAt', width: 150, visible: true }] ); expect(ColumnPreferences.getPreferences('testapp', 'Klass')).toEqual( - [{ name: 'objectId', width: 100, visible: true }, { name: 'createdAt', width: 150, visible: true }, { name: 'updatedAt', width: 150, visible: true }] + [{ cached: true, required: false, name: 'objectId', width: 100, visible: true }, { cached: true, required: false, name: 'createdAt', width: 150, visible: true }, { cached: true, required: false, name: 'updatedAt', width: 150, visible: true }] ); expect(ColumnPreferences.getOrder({ objectId: {}, updatedAt: {}, someField: {} }, 'testapp', 'Klass')).toEqual( - [{ name: 'objectId', width: 100, visible: true }, { name: 'updatedAt', width: 150, visible: true }, { name: 'someField', width: 150, visible: true }] + [{ cached: true, required: false, name: 'objectId', width: 100, visible: true }, { cached: true, required: false, name: 'updatedAt', width: 150, visible: true }, { cached: true, required: false, name: 'someField', width: 150, visible: true }] ); expect(ColumnPreferences.getPreferences('testapp', 'Klass')).toEqual( - [{ name: 'objectId', width: 100, visible: true }, { name: 'updatedAt', width: 150, visible: true }, { name: 'someField', width: 150, visible: true }] + [{ cached: true, required: false, name: 'objectId', width: 100, visible: true }, { cached: true, required: false, name: 'updatedAt', width: 150, visible: true }, { cached: true, required: false, name: 'someField', width: 150, visible: true }] ); }); });