Skip to content

Commit 2ec139f

Browse files
committed
io.js + 0.12
Drop travis 0.8 tests due to sqlite 3.0 incompatibility. ORM still works on 0.8, just not on travis.
1 parent da8b86c commit 2ec139f

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
language: node_js
22
node_js:
3-
- '0.8'
43
- '0.10'
4+
- '0.12'
5+
- 'iojs-v1.5.1'
56
before_script:
67
- mysql -e 'create database orm_test;'
78
- psql -c 'create database orm_test;' -U postgres

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
"lodash" : "2.4.1"
4444
},
4545
"devDependencies": {
46-
"mysql" : "2.0.0-alpha9",
47-
"pg" : "2.6.2",
48-
"sqlite3" : "2.1.7",
46+
"mysql" : "2.5.5",
47+
"pg" : "4.3.0",
48+
"sqlite3" : "3.0.5",
4949
"async" : "0.9.0",
5050
"mocha" : "1.13.0",
5151
"should" : "1.2.2",

test/integration/association-hasmany.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ describe("hasMany", function () {
778778
should.equal(data[0].name, 'account_id');
779779
should.equal(data[0].pk, 1);
780780
should.equal(data[1].name, 'emails_text');
781-
should.equal(data[1].pk, 1);
781+
should.equal(data[1].pk, 2);
782782

783783
done();
784784
});

test/integration/validation.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -421,12 +421,12 @@ describe("Validations", function() {
421421
should(Array.isArray(err));
422422
should.equal(err.length, 2);
423423

424-
should.deepEqual(err[0], _.extend(new Error(),{
425-
property: 'name', value: 'n', msg: 'out-of-range-length'
424+
should.deepEqual(err[0], _.extend(new Error('out-of-range-length'), {
425+
property: 'name', value: 'n', msg: 'out-of-range-length', type: 'validation'
426426
}));
427427

428428
should.deepEqual(err[1], _.extend(new Error(),{
429-
property: 'height', value: '4', msg: 'out-of-range-number'
429+
property: 'height', value: '4', msg: 'out-of-range-number', type: 'validation'
430430
}));
431431

432432
should.equal(john.id, null);
@@ -447,17 +447,16 @@ describe("Validations", function() {
447447
should(Array.isArray(err));
448448
should.equal(err.length, 3);
449449

450-
// `type` is a non enumerable undocumented property of `Error` in V8.
451450
should.deepEqual(err[0], _.extend(new Error(),{
452-
property: 'name', value: null, msg: 'required'
451+
property: 'name', value: null, msg: 'required', type: 'validation'
453452
}));
454453

455454
should.deepEqual(err[1], _.extend(new Error(),{
456-
property: 'name', value: null, msg: 'undefined'
455+
property: 'name', value: null, msg: 'undefined', type: 'validation'
457456
}));
458457

459458
should.deepEqual(err[2], _.extend(new Error(),{
460-
property: 'height', value: '4', msg: 'out-of-range-number'
459+
property: 'height', value: '4', msg: 'out-of-range-number', type: 'validation'
461460
}));
462461

463462
should.equal(john.id, null);

0 commit comments

Comments
 (0)