include and excloude should work with tags (#537)

Author: Edgar Cruzado

lib/test/TestSuite.js

@@ -824,17 +824,31 @@ class TestSuite {
             const isTheTestExcluded = tags.some(tag => exclude.includes(tag))
                 || suiteTags.some(suiteTag => exclude.includes(suiteTag));
 
-            if (isTheTestIncluded) {
-                test.only = true;
-            } else {
-                test.skip = true;
-            }
-
             if (isTheTestExcluded) {
                 test.skip = true;
+            } else {
+                test.isTheTestIncluded = isTheTestIncluded;
             }
+            return test;
+        });
 
+        const hasSomeTestIncludeAndOnly = this.tests.some(test => test.only && test.isTheTestIncluded);
+        this.tests = this.tests.map((test) => {
+            if (hasSomeTestIncludeAndOnly) {
+                if (test.isTheTestIncluded && test.only) {
+                    test.only = true;
+                } else {
+                    test.skip = true;
+                }
+            } else {
+                if (test.isTheTestIncluded) {
+                    test.only = true;
+                } else {
+                    test.skip = true;
+                }
+            }
             return test;
+
         });
     }