Fix #2417 --filter being ignored when --skiptags is set (#2416)

nightwatchjs · May 30, 2020 · 25c26f9 · 25c26f9
1 parent a62b4eb
commit 25c26f9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/lib/runner/folder-walk.js b/lib/runner/folder-walk.js
@@ -105,11 +105,11 @@ class Walker {
       let filename = filePath.split(path.sep).slice(-1)[0];
 
       if (this.settings.filename_filter) {
-        matched = minimatch(filename, this.settings.filename_filter);
+        matched = matched && minimatch(filename, this.settings.filename_filter);
       }
 
       if (this.tags.anyTagsDefined()) {
-        matched = this.tags.match(filePath);
+        matched = matched && this.tags.match(filePath);
       }
 
       return matched;

diff --git a/test/src/runner/testRunWithTags.js b/test/src/runner/testRunWithTags.js
@@ -98,16 +98,44 @@ describe('testRunWithTags', function() {
       globals: {
         reporter(results) {
           assert.ok('demoTagTest' in results.modules['tags/sample'].completed);
+          assert.strictEqual(Object.keys(results.modules).length, 1);
         }
       },
-      filter: 'tags/*',
-      tag_filter: ['login'],
+      filter: '**/tags/*',
+      tag_filter: ['other'],
       output_folder: false,
     };
 
     return NightwatchClient.runTests(testsPath, settings);
   });
 
+  it('testRunWithSkipTagsAndFilterNotEmpty', function() {
+    let testsPath = path.join(__dirname, '../../sampletests');
+
+    let settings = {
+      selenium: {
+        port: 10195,
+        version2: true,
+        start_process: true
+      },
+      silent: true,
+      output: false,
+      globals: {
+        reporter(results) {
+          assert.ok('demoTagTest' in results.modules['tags/sample'].completed);
+          assert.strictEqual(Object.keys(results.modules).length, 1);
+        }
+      },
+      filter: '**/tags/*',
+      output_folder: false,
+    };
+
+    return NightwatchClient.runTests({
+      _source: [testsPath],
+      skiptags: ['logout']
+    }, settings);
+  });
+
   it('testRunWithTagsAndSkipTags', function() {
     let testsPath = path.join(__dirname, '../../sampletests');