Skip to content

Commit

Permalink
Fix the tests so all of them can run in IE
Browse files Browse the repository at this point in the history 
Most of the changes are related to turning off the `"esversion": 6` JSHint option.

Fixes #500
  • Loading branch information
@chasenlehara
Chasen Le Hara authored and chasenlehara committed Sep 16, 2019
1 parent 7ff6cf2 commit 770adc5
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 63 deletions.
2 changes: 0 additions & 2 deletions .jshintrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"browser": true,
"phantom": true,
"node": true,
"esversion": 6,
"predef": [
"-Map"
],
Expand All @@ -41,4 +40,3 @@
"ActiveXObject": true
}
}

5 changes: 2 additions & 3 deletions can/map/observable-object-test.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/**
* Created by Nils Lundquist ([email protected]) on 2019-07-31.
*/
/* jshint esversion: 6 */
"use strict";

var set = require("can-set-legacy");
var $ = require("jquery");
Expand Down
100 changes: 55 additions & 45 deletions can/session/session-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ function setupFixtures(fixtureType) {

fixture(
{ method: "get", url: "/api/session" },
( request, response, headers, ajaxSettings ) => {
function(request, response, headers, ajaxSettings) {
QUnit.assert.ok(true, 'GET /api/session called');

const token = isCookie ? (request.headers['Fake-Cookie'] || '').split('=')[1]
var token = isCookie ? (request.headers['Fake-Cookie'] || '').split('=')[1]
: (request.headers.Authorization || '').split(' ')[1];

if (token === sessionResponse.token) {
Expand All @@ -50,7 +50,7 @@ function setupFixtures(fixtureType) {

fixture(
{ method: "post", url: "/api/session" },
( request, response, headers, ajaxSettings ) => {
function(request, response, headers, ajaxSettings) {
QUnit.assert.ok(true, 'POST /api/session called');
QUnit.assert.equal(request.data.username, 'nils', 'Username passed during login.');
QUnit.assert.equal(request.data.password, 'foobar', 'Password passed during login.');
Expand All @@ -61,7 +61,7 @@ function setupFixtures(fixtureType) {

fixture(
{ method: "delete", url: "/api/session" },
( request, response, headers, ajaxSettings ) => {
function(request, response, headers, ajaxSettings) {
QUnit.assert.ok(true, 'DELETE /api/session called');
return {};
}
Expand All @@ -79,37 +79,39 @@ QUnit.module("can-connect/can/session", {
var fixtureType = context.test.testName.indexOf('Cookie') > -1 ? 'cookie' : 'bearer';
setupFixtures(fixtureType);
},
afterEach: () => {
afterEach: function() {
tearDownFixtures();
}
});

QUnit.test("Faked Cookies - Session retrieved when .current is accessed", function(assert) {
const done = assert.async();
var done = assert.async();
assert.expect(3);

const Session = DefineMap.extend(sessionParams);
const options = {
var Session = DefineMap.extend(sessionParams);
var options = {
Map: Session,
url: {
resource: '/api/session',
getData: {
method: 'get',
url: '/api/session',
// this isn't needed during a real cookie auth scenario since the browser will be adding cookies to the request
beforeSend: (xhr) => {
beforeSend: function(xhr) {
xhr.setRequestHeader('Fake-Cookie', 'SESSIONID=DUMMY.TOKEN');
}
}
},
};

const behaviors = [base, dataUrl, constructor, canMap, sessionBehavior];
const connection = behaviors.reduce((conn, behavior) => behavior(conn), options);
var behaviors = [base, dataUrl, constructor, canMap, sessionBehavior];
var connection = behaviors.reduce(function(conn, behavior) {
return behavior(conn);
}, options);
connection.init();

assert.equal(Session.current, undefined, 'Session.current starts undefined.');
setTimeout(() => {
setTimeout(function() {
assert.propEqual(Session.current.serialize(), sessionResponse, 'Session.current is loaded as expected.');
done();
}, 10);
Expand All @@ -118,37 +120,39 @@ QUnit.test("Faked Cookies - Session retrieved when .current is accessed", functi
QUnit.test("Faked Cookies - Session.currentPromise & current are instantiated when .save is called", function(assert) {
// if this expect fails chances are too many requests are being made & .currentPromise or .current is causing a
// request when they shouldn't since a .save is pending
const done = assert.async();
var done = assert.async();
assert.expect(6);

const Session = DefineMap.extend(sessionParams);
const options = {
var Session = DefineMap.extend(sessionParams);
var options = {
Map: Session,
url: {
resource: '/api/session',
getData: 'GET /api/session'
},
};

const behaviors = [base, dataUrl, constructor, canMap, sessionBehavior];
const connection = behaviors.reduce((conn, behavior) => behavior(conn), options);
var behaviors = [base, dataUrl, constructor, canMap, sessionBehavior];
var connection = behaviors.reduce(function(conn, behavior) {
return behavior(conn);
}, options);
connection.init();

const savePromise = (new Session({ username: 'nils', password: 'foobar' })).save();
var savePromise = (new Session({ username: 'nils', password: 'foobar' })).save();
assert.equal(Session.current, undefined, 'Session.current starts undefined');
assert.ok(Session.currentPromise instanceof Promise, 'Session.currentPromise is set by .save()');
savePromise.then(() => {
savePromise.then(function() {
assert.propEqual(Session.current.serialize(), sessionResponse, 'Session.current set after successful save.');
done();
});
});

QUnit.test("Faked Cookies - Session undefined after .destroy called", function(assert) {
const done = assert.async();
var done = assert.async();
assert.expect(3);

const Session = DefineMap.extend(sessionParams);
const options = {
var Session = DefineMap.extend(sessionParams);
var options = {
Map: Session,
url: {
resource: '/api/session',
Expand All @@ -157,67 +161,71 @@ QUnit.test("Faked Cookies - Session undefined after .destroy called", function(a
method: 'get',
url: '/api/session',
// this isn't needed during a real cookie auth scenario since the browser will be adding cookies to the request
beforeSend: (xhr) => {
beforeSend: function(xhr) {
xhr.setRequestHeader('Fake-Cookie', 'SESSIONID=DUMMY.TOKEN');
}
}
},
};

const behaviors = [base, dataUrl, constructor, canMap, sessionBehavior];
const connection = behaviors.reduce((conn, behavior) => behavior(conn), options);
var behaviors = [base, dataUrl, constructor, canMap, sessionBehavior];
var connection = behaviors.reduce(function(conn, behavior) {
return behavior(conn);
}, options);
connection.init();

Session.currentPromise.then(() => {
Session.current.destroy().then(() => {
Session.currentPromise.then(function() {
Session.current.destroy().then(function() {
assert.equal(Session.current, undefined);
done();
});
});
});

QUnit.test("Computed observations dependant on Session.current recalculate after `new Session().save`", function(assert) {
const done = assert.async();
var done = assert.async();
assert.expect(6);

const Session = DefineMap.extend(sessionParams);
const options = {
var Session = DefineMap.extend(sessionParams);
var options = {
Map: Session,
url: {
resource: '/api/session',
getData: 'GET /api/session'
},
};

const behaviors = [base, dataUrl, constructor, canMap, sessionBehavior];
const connection = behaviors.reduce((conn, behavior) => behavior(conn), options);
var behaviors = [base, dataUrl, constructor, canMap, sessionBehavior];
var connection = behaviors.reduce(function(conn, behavior) {
return behavior(conn);
}, options);
connection.init();

const testObs = new Observation(function() {
var testObs = new Observation(function() {
return Session.current ? 'session available' : 'session absent';
});

testObs.on(function(message) {
assert.equal(message, 'session available', 'Observation recomputed after Session.current updates.');
});

Session.currentPromise.catch(() => {
Session.currentPromise.catch(function() {
// session absent since currentPromise rejected
assert.equal(testObs.value, 'session absent', 'Session absent prior to successful login.');

// session will be available after .save and testObs handler will run
(new Session({ username: 'nils', password: 'foobar' })).save().then((session) => {
(new Session({ username: 'nils', password: 'foobar' })).save().then(function(session) {
setTimeout(done, 10);
});
});
});

QUnit.test("Singleton instances created/deleted by directly using connection object update the .current & .currentPromise as expected.", function(assert) {
const done = assert.async();
var done = assert.async();
assert.expect(8);

const Session = DefineMap.extend(sessionParams);
const options = {
var Session = DefineMap.extend(sessionParams);
var options = {
Map: Session,
url: {
resource: '/api/session',
Expand All @@ -226,24 +234,26 @@ QUnit.test("Singleton instances created/deleted by directly using connection obj
},
};

const behaviors = [base, dataUrl, constructor, canMap, sessionBehavior];
const connection = behaviors.reduce((conn, behavior) => behavior(conn), options);
var behaviors = [base, dataUrl, constructor, canMap, sessionBehavior];
var connection = behaviors.reduce(function(conn, behavior) {
return behavior(conn);
}, options);
connection.init();

connection.save(new Session({ username: 'nils', password: 'foobar' })).then((instance) => {
connection.save(new Session({ username: 'nils', password: 'foobar' })).then(function(instance) {
assert.equal(Session.current, instance, 'Session.current is expected value after save.');

Session.currentPromise.then((res) => {
Session.currentPromise.then(function(res) {
assert.equal(instance, res, 'Session.currentPromise is expected value after save.');
});

connection.destroy(instance).then(() => {
connection.destroy(instance).then(function() {
assert.equal(Session.current, undefined, 'Session.current is expected value after destroy.');

Session.currentPromise.catch(() => {
Session.currentPromise.catch(function() {
assert.ok(true, 'Session.currentPromise is expected value after destroy.');
done();
});
});
});
});
});
24 changes: 13 additions & 11 deletions constructor/constructor_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,38 +59,40 @@ QUnit.test("basics", function(assert) {
}) ));

var done = assert.async();
peopleConnection.getList().then(function(people){
var promises = [];

promises.push(peopleConnection.getList().then(function(people){
assert.ok(people.isList, "is a list");
assert.equal(people.length, 1, "got a list");
assert.ok(people[0] instanceof Person);
}, testHelpers.logErrorAndStart(assert, done)); //-> instances
}, testHelpers.logErrorAndStart(assert, done))); //-> instances


peopleConnection.get({id: 5}).then(function(person){
promises.push(peopleConnection.get({id: 5}).then(function(person){
assert.equal(person.id, 5, "got a list");
assert.ok(person instanceof Person);
}, testHelpers.logErrorAndStart(assert, done));
}, testHelpers.logErrorAndStart(assert, done)));

var p = new Person({name: "justin"});

peopleConnection.save(p).then(function(updatedP){
promises.push(peopleConnection.save(p).then(function(updatedP){
assert.equal(p, updatedP, "same instances");
assert.equal(p.id, 3);
});
}));

var p2 = new Person({name: "justin", id: 3});

peopleConnection.save(p2).then(function(updatedP){
promises.push(peopleConnection.save(p2).then(function(updatedP){
assert.equal(p2, updatedP, "same instances");
assert.equal(p2.update, true);
}, testHelpers.logErrorAndStart(assert, done));
}, testHelpers.logErrorAndStart(assert, done)));

var p3 = new Person({name: "justin", id: 3});

peopleConnection.destroy(p3).then(function(updatedP){
promises.push(peopleConnection.destroy(p3).then(function(updatedP){
assert.equal(p3, updatedP, "same instances");
assert.equal(p3.destroy, true);
}, testHelpers.logErrorAndStart(assert, done));
done();
}, testHelpers.logErrorAndStart(assert, done)));

Promise.all(promises).then(done, done);
});
4 changes: 2 additions & 2 deletions data/url/data-url_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,12 @@ QUnit.test("beforeSend works when set for all methods or per-method", function(a
getListData: {
url: "/getList",
type: 'POST',
beforeSend: () => {
beforeSend: function() {
assert.ok(true, 'per-method beforeSend called');
}
},
getData: "DELETE /getInstance",
beforeSend: () => {
beforeSend: function() {
assert.ok(true, 'default beforeSend called');
}
}
Expand Down

0 comments on commit 770adc5

Please sign in to comment.