feat(cli): extend glob to cover subdirectories

* Extend globbing spec files to subdirectories * Update test cases
adonisjs · Oct 29, 2017 · cce2055 · cce2055
1 parent 2952d39
commit cce2055
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Cli/index.js b/src/Cli/index.js
@@ -28,8 +28,8 @@ class Cli {
   constructor (Env, Helpers) {
     this.projectRoot = Helpers.appRoot()
     this._testGroups = {
-      unit: 'test/unit/*.spec.js',
-      functional: 'test/functional/*.spec.js'
+      unit: 'test/unit/**/*.spec.js',
+      functional: 'test/functional/**/*.spec.js'
     }
     this._ignoreTests = Env.get('IGNORE_TESTS', [])
     this._filterCallback = null

diff --git a/test/unit/cli.spec.js b/test/unit/cli.spec.js
@@ -29,11 +29,11 @@ test.group('Cli', (group) => {
   })
 
   test('set correct global for unit tests', (assert) => {
-    assert.equal(this.cli._testGroups.unit, 'test/unit/*.spec.js')
+    assert.equal(this.cli._testGroups.unit, 'test/unit/**/*.spec.js')
   })
 
   test('set correct global for functional tests', (assert) => {
-    assert.equal(this.cli._testGroups.functional, 'test/functional/*.spec.js')
+    assert.equal(this.cli._testGroups.functional, 'test/functional/**/*.spec.js')
   })
 
   test('set correct global for test files to be ignored', (assert) => {
@@ -61,13 +61,13 @@ test.group('Cli', (group) => {
 
   test('set proper glob for loading tests', (assert) => {
     const glob = this.cli._getGlob([this.cli._testGroups.unit])
-    assert.deepEqual(glob, [path.join(this.helpers.appRoot(), 'test/unit/*.spec.js')])
+    assert.deepEqual(glob, [path.join(this.helpers.appRoot(), 'test/unit/**/*.spec.js')])
   })
 
   test('exclude tests using glob', (assert) => {
     const glob = this.cli._getGlob([this.cli._testGroups.unit], ['test/unit/_skip.spec.js'])
     assert.deepEqual(glob, [
-      path.join(this.helpers.appRoot(), 'test/unit/*.spec.js'),
+      path.join(this.helpers.appRoot(), 'test/unit/**/*.spec.js'),
       `!${path.join(this.helpers.appRoot(), 'test/unit/_skip.spec.js')}`
     ])
   })