#11 some more tests

RXNT · Sep 4, 2017 · b026cf0 · b026cf0
1 parent 40861ec
commit b026cf0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/conditionsMeet.js b/src/conditionsMeet.js
@@ -3,15 +3,15 @@ import checkField from "./checkField";
 import { OR, AND, NOT } from "./constants";
 import selectn from "selectn";
 
-export default function conditionsMeet(conditions, formData) {
-  if (!isObject(conditions) || !isObject(formData)) {
+export default function conditionsMeet(condition, formData) {
+  if (!isObject(condition) || !isObject(formData)) {
     toError(
-      `Rule ${JSON.stringify(conditions)} with ${formData} can't be processed`
+      `Rule ${JSON.stringify(condition)} with ${formData} can't be processed`
     );
     return false;
   }
-  return Object.keys(conditions).every(ref => {
-    let refCondition = conditions[ref];
+  return Object.keys(condition).every(ref => {
+    let refCondition = condition[ref];
     if (ref === OR) {
       return refCondition.some(rule => conditionsMeet(rule, formData));
     } else if (ref === AND) {

diff --git a/test/conditionsMeet.test.js b/test/conditionsMeet.test.js
@@ -1,4 +1,5 @@
 import conditionsMeet from "../src/conditionsMeet";
+import { testInProd } from "./utils";
 
 test("sanity checkField", function() {
   expect(() => conditionsMeet("empty", {})).toThrow();
@@ -53,3 +54,10 @@ test("NOT condition", () => {
     conditionsMeet(condition, { firstName: "Will", lastName: "Smith" })
   ).toBeFalsy();
 });
+
+test("invalid condition", () => {
+  expect(() => conditionsMeet("empty", {})).toThrow();
+  expect(() => conditionsMeet({}, "empty")).toThrow();
+  expect(testInProd(() => conditionsMeet("empty", {}))).toBeFalsy();
+  expect(testInProd(() => conditionsMeet({}, "empty"))).toBeFalsy();
+});
diff --git a/test/validation.test.js b/test/validation.test.js
@@ -181,15 +181,15 @@ test("invalid field NOT or", () => {
     {
       conditions: {
         not: {
-          firstName: "or",
+          firstName: "bad",
         },
       },
       event: { type: "remove" },
     },
   ]);
 
   expect(listInvalidPredicates(invalidFieldNotWithOr, defSchema)).toEqual([
-    "or",
+    "bad",
   ]);
   expect(() => validatePredicates(invalidFieldNotWithOr, defSchema)).toThrow();
 });