Merge pull request #3090 from sequelize/iojs-travis

io.js on travis

.travis.yml

@@ -2,6 +2,7 @@ language: node_js
 
 
 node_js:
 node_js:
   - "0.10"
   - "0.10"
+  - "iojs"
 
 
 sudo: false
 sudo: false
 
 

package.json

@@ -45,7 +45,7 @@
   "devDependencies": {
   "devDependencies": {
     "continuation-local-storage": "3.1.2",
     "continuation-local-storage": "3.1.2",
     "chai-as-promised": "^4.1.1",
     "chai-as-promised": "^4.1.1",
-    "sqlite3": "~3.0.0",
+    "sqlite3": "fengmk2/node-sqlite3#support-iojs-version",
     "mysql": "~2.5.0",
     "mysql": "~2.5.0",
     "pg": "^4.2.0",
     "pg": "^4.2.0",
     "pg-native": "^1.8.0",
     "pg-native": "^1.8.0",
@@ -56,7 +56,6 @@
     "mocha": "~2.0.0",
     "mocha": "~2.0.0",
     "chai-datetime": "~1.3.0",
     "chai-datetime": "~1.3.0",
     "sinon": "~1.11.0",
     "sinon": "~1.11.0",
-    "mariasql": "~0.1.2",
     "chai-spies": "~0.5.1",
     "chai-spies": "~0.5.1",
     "lcov-result-merger": "~1.0.0",
     "lcov-result-merger": "~1.0.0",
     "istanbul": "~0.3.0",
     "istanbul": "~0.3.0",

test/integration/sequelize.test.js

@@ -114,21 +114,13 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
             .sequelizeWithInvalidConnection
             .sequelizeWithInvalidConnection
             .authenticate()
             .authenticate()
             .complete(function(err, result) {
             .complete(function(err, result) {
-              if (dialect === 'postgres') {
-                expect(
-                  err.message.match(/connect ECONNREFUSED/) ||
-                  err.message.match(/invalid port number/) ||
-                  err.message.match(/RangeError: Port should be > 0 and < 65536/)
-                ).to.be.ok;
-              } else if (dialect === 'mssql') {
-                expect(
-                  err.message.match(/ConnectionError: Login failed for user/) ||
-                  err.message.match(/RangeError: Port should be > 0 and < 65536/)
-                ).to.be.ok;
-              } else {
-                expect(err.message).to.match(/connect ECONNREFUSED/);
-              }
-
+              expect(
+                err.message.match(/connect ECONNREFUSED/) ||
+                err.message.match(/invalid port number/) ||
+                err.message.match(/RangeError: Port should be > 0 and < 65536/) ||
+                err.message.match(/RangeError: port should be > 0 and < 65536/) ||
+                err.message.match(/ConnectionError: Login failed for user/)
+              ).to.be.ok;
               done();
               done();
 
 
             });
             });