ci(travis): make travis run tests on mysql also

adonisjs · Oct 1, 2018 · 1aff675 · 1aff675
1 parent 44164c7
commit 1aff675
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 172 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,10 @@ node_js:
   - node
   - 8.0.0
 sudo: false
+services:
+  - mysql
+before_install:
+  - mysql -e 'CREATE DATABASE testing_lucid;'
 install:
   - npm install
 after_script:

diff --git a/package.json b/package.json
@@ -17,7 +17,9 @@
     "mrm": "mrm --preset=@adonisjs/mrm-preset",
     "pretest": "npm run lint",
     "test:cleanup": "rm -rf test/functional/database && rm -rf test/unit/tmp",
-    "test": "DB=sqlite nyc node japaFile.js",
+    "test:sqlite": "DB=sqlite node japaFile.js",
+    "test:mysql": "DB=mysql node japaFile.js",
+    "test": "nyc npm run test:sqlite && npm run test:mysql",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "commit": "git-cz",
     "lint": "standard"

diff --git a/test/unit/helpers/config.js b/test/unit/helpers/config.js
diff --git a/test/unit/helpers/index.js b/test/unit/helpers/index.js
@@ -43,8 +43,8 @@ module.exports = {
         version: '5.7',
         connection: {
           host: '127.0.0.1',
-          user: 'virk',
-          password: 'virk',
+          user: 'travis',
+          password: '',
           database: 'testing_lucid'
         }
       })

diff --git a/test/unit/helpers/mysqlConnections.js b/test/unit/helpers/mysqlConnections.js
diff --git a/test/unit/helpers/postgresConnection.js b/test/unit/helpers/postgresConnection.js
diff --git a/test/unit/helpers/sqliteConnections.js b/test/unit/helpers/sqliteConnections.js
diff --git a/test/unit/lucid-has-many.spec.js b/test/unit/lucid-has-many.spec.js
@@ -204,7 +204,7 @@ test.group('Relations | Has Many', (group) => {
 
     const users = await User.query().with('cars', (builder) => {
       builder
-        .select('cars.*', ioc.use('Database').raw('count("older_cars"."id") as older_cars_count'))
+        .select('cars.*', ioc.use('Database').raw(helpers.formatQuery('count("older_cars"."id") as older_cars_count')))
         .joinRaw('left join cars older_cars on older_cars.model < cars.model')
         .groupBy('cars.id')
     }).fetch()