Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"eslint-plugin-flowtype": "^2.39.1",
"flow-bin": "^0.65.0",
"gaze": "1.1.2",
"jasmine": "2.9.0",
"jasmine": "3.0.0",
"jasmine-spec-reporter": "^4.1.0",
"mongodb-runner": "3.6.1",
"nodemon": "1.14.12",
Expand Down
3 changes: 2 additions & 1 deletion spec/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"arrayContains": true
},
"rules": {
"no-console": [0]
"no-console": [0],
"no-var": "error"
}
}
12 changes: 6 additions & 6 deletions spec/AccountLockoutPolicy.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const Config = require("../src/Config");

var loginWithWrongCredentialsShouldFail = function(username, password) {
const loginWithWrongCredentialsShouldFail = function(username, password) {
return new Promise((resolve, reject) => {
Parse.User.logIn(username, password)
.then(() => reject('login should have failed'))
Expand All @@ -16,7 +16,7 @@ var loginWithWrongCredentialsShouldFail = function(username, password) {
});
};

var isAccountLockoutError = function(username, password, duration, waitTime) {
const isAccountLockoutError = function(username, password, duration, waitTime) {
return new Promise((resolve, reject) => {
setTimeout(() => {
Parse.User.logIn(username, password)
Expand All @@ -40,7 +40,7 @@ describe("Account Lockout Policy: ", () => {
publicServerURL: 'http://localhost:1337/1',
})
.then(() => {
var user = new Parse.User();
const user = new Parse.User();
user.setUsername('username1');
user.setPassword('password');
return user.signUp(null);
Expand Down Expand Up @@ -215,7 +215,7 @@ describe("Account Lockout Policy: ", () => {
publicServerURL: "http://localhost:8378/1"
})
.then(() => {
var user = new Parse.User();
const user = new Parse.User();
user.setUsername("username2");
user.setPassword("failedLoginAttemptsThreshold");
return user.signUp();
Expand Down Expand Up @@ -248,7 +248,7 @@ describe("Account Lockout Policy: ", () => {
publicServerURL: "http://localhost:8378/1"
})
.then(() => {
var user = new Parse.User();
const user = new Parse.User();
user.setUsername("username3");
user.setPassword("failedLoginAttemptsThreshold");
return user.signUp();
Expand Down Expand Up @@ -285,7 +285,7 @@ describe("Account Lockout Policy: ", () => {
publicServerURL: "http://localhost:8378/1"
})
.then(() => {
var user = new Parse.User();
const user = new Parse.User();
user.setUsername("username4");
user.setPassword("correct password");
return user.signUp();
Expand Down
26 changes: 13 additions & 13 deletions spec/AdaptableController.spec.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@

var AdaptableController = require("../src/Controllers/AdaptableController").AdaptableController;
var FilesAdapter = require("../src/Adapters/Files/FilesAdapter").default;
var FilesController = require("../src/Controllers/FilesController").FilesController;
const AdaptableController = require("../src/Controllers/AdaptableController").AdaptableController;
const FilesAdapter = require("../src/Adapters/Files/FilesAdapter").default;
const FilesController = require("../src/Controllers/FilesController").FilesController;

var MockController = function(options) {
const MockController = function(options) {
AdaptableController.call(this, options);
}
MockController.prototype = Object.create(AdaptableController.prototype);
MockController.prototype.constructor = AdaptableController;

describe("AdaptableController", ()=>{
it("should use the provided adapter", (done) => {
var adapter = new FilesAdapter();
var controller = new FilesController(adapter);
const adapter = new FilesAdapter();
const controller = new FilesController(adapter);
expect(controller.adapter).toBe(adapter);
// make sure _adapter is private
expect(controller._adapter).toBe(undefined);
Expand All @@ -23,7 +23,7 @@ describe("AdaptableController", ()=>{
});

it("should throw when creating a new mock controller", (done) => {
var adapter = new FilesAdapter();
const adapter = new FilesAdapter();
expect(() => {
new MockController(adapter);
}).toThrow();
Expand All @@ -32,9 +32,9 @@ describe("AdaptableController", ()=>{

it("should fail setting the wrong adapter to the controller", (done) => {
function WrongAdapter() {}
var adapter = new FilesAdapter();
var controller = new FilesController(adapter);
var otherAdapter = new WrongAdapter();
const adapter = new FilesAdapter();
const controller = new FilesController(adapter);
const otherAdapter = new WrongAdapter();
expect(() => {
controller.adapter = otherAdapter;
}).toThrow();
Expand All @@ -43,7 +43,7 @@ describe("AdaptableController", ()=>{

it("should fail to instantiate a controller with wrong adapter", (done) => {
function WrongAdapter() {}
var adapter = new WrongAdapter();
const adapter = new WrongAdapter();
expect(() => {
new FilesController(adapter);
}).toThrow();
Expand All @@ -58,7 +58,7 @@ describe("AdaptableController", ()=>{
});

it("should accept an object adapter", (done) => {
var adapter = {
const adapter = {
createFile: function() { },
deleteFile: function() { },
getFileData: function() { },
Expand All @@ -77,7 +77,7 @@ describe("AdaptableController", ()=>{
AGoodAdapter.prototype.getFileData = function() { };
AGoodAdapter.prototype.getFileLocation = function() { };

var adapter = new AGoodAdapter();
const adapter = new AGoodAdapter();
expect(() => {
new FilesController(adapter);
}).not.toThrow();
Expand Down
52 changes: 26 additions & 26 deletions spec/AdapterLoader.spec.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@

var loadAdapter = require("../src/Adapters/AdapterLoader").loadAdapter;
var FilesAdapter = require("@parse/fs-files-adapter").default;
var S3Adapter = require("@parse/s3-files-adapter").default;
var ParsePushAdapter = require("@parse/push-adapter").default;
const loadAdapter = require("../src/Adapters/AdapterLoader").loadAdapter;
const FilesAdapter = require("@parse/fs-files-adapter").default;
const S3Adapter = require("@parse/s3-files-adapter").default;
const ParsePushAdapter = require("@parse/push-adapter").default;
const Config = require('../src/Config');

describe("AdapterLoader", ()=>{

it("should instantiate an adapter from string in object", (done) => {
var adapterPath = require('path').resolve("./spec/MockAdapter");
const adapterPath = require('path').resolve("./spec/MockAdapter");

var adapter = loadAdapter({
const adapter = loadAdapter({
adapter: adapterPath,
options: {
key: "value",
Expand All @@ -25,16 +25,16 @@ describe("AdapterLoader", ()=>{
});

it("should instantiate an adapter from string", (done) => {
var adapterPath = require('path').resolve("./spec/MockAdapter");
var adapter = loadAdapter(adapterPath);
const adapterPath = require('path').resolve("./spec/MockAdapter");
const adapter = loadAdapter(adapterPath);

expect(adapter instanceof Object).toBe(true);
done();
});

it("should instantiate an adapter from string that is module", (done) => {
var adapterPath = require('path').resolve("./src/Adapters/Files/FilesAdapter");
var adapter = loadAdapter({
const adapterPath = require('path').resolve("./src/Adapters/Files/FilesAdapter");
const adapter = loadAdapter({
adapter: adapterPath
});

Expand All @@ -47,7 +47,7 @@ describe("AdapterLoader", ()=>{
});

it("should instantiate an adapter from npm module", (done) => {
var adapter = loadAdapter({
const adapter = loadAdapter({
module: '@parse/fs-files-adapter'
});

Expand All @@ -60,69 +60,69 @@ describe("AdapterLoader", ()=>{
});

it("should instantiate an adapter from function/Class", (done) => {
var adapter = loadAdapter({
const adapter = loadAdapter({
adapter: FilesAdapter
});
expect(adapter instanceof FilesAdapter).toBe(true);
done();
});

it("should instantiate the default adapter from Class", (done) => {
var adapter = loadAdapter(null, FilesAdapter);
const adapter = loadAdapter(null, FilesAdapter);
expect(adapter instanceof FilesAdapter).toBe(true);
done();
});

it("should use the default adapter", (done) => {
var defaultAdapter = new FilesAdapter();
var adapter = loadAdapter(null, defaultAdapter);
const defaultAdapter = new FilesAdapter();
const adapter = loadAdapter(null, defaultAdapter);
expect(adapter instanceof FilesAdapter).toBe(true);
done();
});

it("should use the provided adapter", (done) => {
var originalAdapter = new FilesAdapter();
var adapter = loadAdapter(originalAdapter);
const originalAdapter = new FilesAdapter();
const adapter = loadAdapter(originalAdapter);
expect(adapter).toBe(originalAdapter);
done();
});

it("should fail loading an improperly configured adapter", (done) => {
var Adapter = function(options) {
const Adapter = function(options) {
if (!options.foo) {
throw "foo is required for that adapter";
}
}
var adapterOptions = {
const adapterOptions = {
param: "key",
doSomething: function() {}
};

expect(() => {
var adapter = loadAdapter(adapterOptions, Adapter);
const adapter = loadAdapter(adapterOptions, Adapter);
expect(adapter).toEqual(adapterOptions);
}).not.toThrow("foo is required for that adapter");
done();
});

it("should load push adapter from options", (done) => {
var options = {
const options = {
android: {
senderId: 'yolo',
apiKey: 'yolo'
}
}
expect(() => {
var adapter = loadAdapter(undefined, ParsePushAdapter, options);
const adapter = loadAdapter(undefined, ParsePushAdapter, options);
expect(adapter.constructor).toBe(ParsePushAdapter);
expect(adapter).not.toBe(undefined);
}).not.toThrow();
done();
});

it("should load custom push adapter from string (#3544)", (done) => {
var adapterPath = require('path').resolve("./spec/MockPushAdapter");
var options = {
const adapterPath = require('path').resolve("./spec/MockPushAdapter");
const options = {
ios: {
bundleId: 'bundle.id'
}
Expand All @@ -145,9 +145,9 @@ describe("AdapterLoader", ()=>{
});

it("should load S3Adapter from direct passing", (done) => {
var s3Adapter = new S3Adapter("key", "secret", "bucket")
const s3Adapter = new S3Adapter("key", "secret", "bucket")
expect(() => {
var adapter = loadAdapter(s3Adapter, FilesAdapter);
const adapter = loadAdapter(s3Adapter, FilesAdapter);
expect(adapter).toBe(s3Adapter);
}).not.toThrow();
done();
Expand Down
4 changes: 2 additions & 2 deletions spec/Analytics.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('AnalyticsController', () => {
})
}).then(() => {
expect(analyticsAdapter.trackEvent).toHaveBeenCalled();
var lastCall = analyticsAdapter.trackEvent.calls.first();
const lastCall = analyticsAdapter.trackEvent.calls.first();
const args = lastCall.args;
expect(args[0]).toEqual('MyEvent');
expect(args[1]).toEqual({
Expand Down Expand Up @@ -44,7 +44,7 @@ describe('AnalyticsController', () => {
})
}).then(() => {
expect(analyticsAdapter.appOpened).toHaveBeenCalled();
var lastCall = analyticsAdapter.appOpened.calls.first();
const lastCall = analyticsAdapter.appOpened.calls.first();
const args = lastCall.args;
expect(args[0]).toEqual({
dimensions: {
Expand Down
Loading