Add more tests for NOT

Author: kristerkari

src/__tests__/index.spec.js

@@ -659,6 +659,192 @@ describe("media queries", () => {
     ).toEqual({ a: 2 });
   });
 
+  it("should process media query with NOT and OR operators and type", () => {
+    expect(
+      process({
+        __mediaQueries: {
+          "@media not print, (orientation: landscape)": [
+            {
+              inverse: true,
+              type: "print",
+              expressions: []
+            },
+            {
+              expressions: [
+                {
+                  feature: "orientation",
+                  modifier: undefined,
+                  value: "landscape"
+                }
+              ],
+              inverse: false,
+              type: "all"
+            }
+          ],
+          "@media print": [
+            {
+              inverse: false,
+              type: "print",
+              expressions: []
+            }
+          ]
+        },
+        a: 1,
+        "@media not print, (orientation: landscape)": {
+          a: 2
+        },
+        "@media print": {
+          a: 3
+        }
+      })
+    ).toEqual({ a: 2 });
+    expect(
+      process({
+        __mediaQueries: {
+          "@media not ios, (orientation: landscape)": [
+            {
+              inverse: true,
+              type: "ios",
+              expressions: []
+            },
+            {
+              expressions: [
+                {
+                  feature: "orientation",
+                  modifier: undefined,
+                  value: "landscape"
+                }
+              ],
+              inverse: false,
+              type: "all"
+            }
+          ],
+          "@media print": [
+            {
+              inverse: false,
+              type: "print",
+              expressions: []
+            }
+          ]
+        },
+        a: 1,
+        "@media not ios, (orientation: landscape)": {
+          a: 2
+        },
+        "@media print": {
+          a: 3
+        }
+      })
+    ).toEqual({ a: 2 });
+    expect(
+      process({
+        __mediaQueries: {
+          "@media not print, (orientation: portrait)": [
+            {
+              inverse: true,
+              type: "print",
+              expressions: []
+            },
+            {
+              expressions: [
+                {
+                  feature: "orientation",
+                  modifier: undefined,
+                  value: "portrait"
+                }
+              ],
+              inverse: false,
+              type: "all"
+            }
+          ],
+          "@media print": [
+            {
+              inverse: false,
+              type: "print",
+              expressions: []
+            }
+          ]
+        },
+        a: 1,
+        "@media not ios, (orientation: portrait)": {
+          a: 2
+        },
+        "@media print": {
+          a: 3
+        }
+      })
+    ).toEqual({ a: 1 });
+  });
+
+  it("should process media query with NOT and AND operators and platform", () => {
+    expect(
+      process({
+        __mediaQueries: {
+          "@media android": [
+            {
+              inverse: false,
+              type: "android",
+              expressions: []
+            }
+          ],
+          "@media not android and (orientation: landscape)": [
+            {
+              inverse: true,
+              type: "android",
+              expressions: [
+                {
+                  feature: "orientation",
+                  modifier: undefined,
+                  value: "landscape"
+                }
+              ]
+            }
+          ]
+        },
+        a: 1,
+        "@media android": {
+          a: 2
+        },
+        "@media not ios and (orientation: landscape)": {
+          a: 3
+        }
+      })
+    ).toEqual({ a: 1 });
+    expect(
+      process({
+        __mediaQueries: {
+          "@media android": [
+            {
+              inverse: false,
+              type: "android",
+              expressions: []
+            }
+          ],
+          "@media not android and (orientation: portrait)": [
+            {
+              inverse: true,
+              type: "android",
+              expressions: [
+                {
+                  feature: "orientation",
+                  modifier: undefined,
+                  value: "portrait"
+                }
+              ]
+            }
+          ]
+        },
+        a: 1,
+        "@media android": {
+          a: 2
+        },
+        "@media not android and (orientation: portrait)": {
+          a: 3
+        }
+      })
+    ).toEqual({ a: 3 });
+  });
+
   it("should process media query with not operator and platform", () => {
     expect(
       process({

src/mediaquery.js

@@ -94,7 +94,7 @@ function matchQuery(query, values) {
     }
   });
 
-  return (expressionsMatch && !inverse) || (!expressionsMatch && inverse);
+  return expressionsMatch || inverse;
 }
 
 // -- Utilities ----------------------------------------------------------------