Fixed TODO for multiple negations combined with normal grep conditions (#89)

* Fixed TODO for multiple negations plus some normal conditions

* simplified logic

* added another test scenario

Co-authored-by: Luan Raithz Machado <luan.machado@hbsis.com.br>

Author: luanraithz

cypress/integration/unit.js

@@ -318,6 +318,24 @@ describe('utils', () => {
         ]),
       ).to.be.true
     })
+
+    it("Multiple invert strings and a simple one", () => {
+      const t = checkName("-name;-hey;number")
+      expect(t("number should only be matches without a n-a-m-e")).to.be.true
+      expect(t("number can't be name")).to.be.false
+      expect(t("The man needs a name")).to.be.false
+      expect(t("number hey name")).to.be.false
+      expect(t("numbers hey name")).to.be.false
+      expect(t("number hsey nsame")).to.be.true
+      expect(t("This wont match")).to.be.false
+    })
+
+    it("Only inverted strings", () => {
+      const t = checkName("-name;-hey")
+      expect(t("I'm matched")).to.be.true
+      expect(t("hey! I'm not")).to.be.false
+      expect(t("My name is weird")).to.be.false
+    })
   })
 
   context('parseFullTitleGrep', () => {

src/utils.js

@@ -111,17 +111,12 @@ function shouldTestRunTitle(parsedGrep, testName) {
     return true
   }
 
-  // TODO if some titles greps are "invert: true" we should
-  // use AND instead of OR, otherwise it does the
-  // opposite of what we probably want to do
+  const inverted = parsedGrep.filter(g => g.invert)
+  const straight = parsedGrep.filter(g => !g.invert)
 
-  return parsedGrep.some((titleGrep) => {
-    if (titleGrep.invert) {
-      return !testName.includes(titleGrep.title)
-    }
-
-    return testName.includes(titleGrep.title)
-  })
+  return inverted.every(titleGrep => !testName.includes(titleGrep.title))
+    && (!straight.length || straight
+      .some(titleGrep => testName.includes(titleGrep.title)))
 }
 
 // note: tags take precedence over the test name