Skip to content
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

Landscaper: QUnit2 upgrade #72

Merged
merged 2 commits into from
May 24, 2019
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
15 changes: 8 additions & 7 deletions can-define-stream_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ var poll = function poll(fn, callback, timeout, interval) {
})();
};

test('Stream behavior on multiple properties with merge', 8, function() {
QUnit.test('Stream behavior on multiple properties with merge', function(assert) {
assert.expect(8);

var expectedNewVal,
expectedOldVal,
Expand Down Expand Up @@ -125,15 +126,15 @@ test('Stream behavior on multiple properties with merge', 8, function() {

map.foo = 'foo-1';

QUnit.equal( map.baz, undefined, "read value before binding");
assert.equal( map.baz, undefined, "read value before binding");

map.on("baz", function(ev, newVal, oldVal){
QUnit.equal(newVal, expectedNewVal, caseName+ " newVal");
QUnit.equal(oldVal, expectedOldVal, caseName+ " oldVal");
assert.equal(newVal, expectedNewVal, caseName+ " newVal");
assert.equal(oldVal, expectedOldVal, caseName+ " oldVal");
});


QUnit.equal( map.baz, 'bar', "read value immediately after binding");
assert.equal( map.baz, 'bar', "read value immediately after binding");

caseName = "setting foo";
expectedOldVal = 'bar';
Expand Down Expand Up @@ -218,7 +219,7 @@ QUnit.test('Test if streams are memory safe', function(assert) {
);
});

test('Stream on DefineList', function() {
QUnit.test('Stream on DefineList', function(assert) {
var expectedLength;

var PeopleList = DefineList.extend({});
Expand Down Expand Up @@ -247,7 +248,7 @@ test('Stream on DefineList', function() {

expectedLength = 2;
stream.onValue(function(ev, val) {
QUnit.equal(val, expectedLength, 'List size changed');
assert.equal(val, expectedLength, 'List size changed');
});

expectedLength = 3;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"generator-donejs": "^1.0.5",
"jshint": "^2.9.1",
"steal": "^1.2.8",
"steal-qunit": "^1.0.1",
"steal-qunit": "^2.0.0",
"steal-tools": "^1.1.2",
"testee": "^0.9.0"
},
Expand Down