change test cmd ealush#521

Moses3301 · Nov 30, 2020 · 571b57c · 571b57c
1 parent c019e1c
commit 571b57c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "prettier-watch": "onchange '**/*.js' '**/*.json' -- prettier --write {{changed}}",
     "dev": "onchange -i './packages/**/src/**/*.js' -- yarn genJSConfig",
     "genJSConfig": "node ./scripts/genJsconfig",
-    "test": "jest --projects ./packages/*",
+    "test": "jest --projects ./packages/",
     "lint": "eslint . --ignore-path .gitignore",
     "pretest": "yarn genJSConfig",
     "docs": "node scripts/release/steps/updateDocs"

diff --git a/packages/vest/src/__tests__/test_types/fixtures/rules.ts b/packages/vest/src/__tests__/test_types/fixtures/rules.ts
@@ -103,12 +103,16 @@ enforce(0).shorterThanOrEquals;
 enforce.shorterThanOrEquals;
 enforce(0).startsWith;
 enforce.startsWith;
+enforce(0).allOf;
+enforce.allOf;
 enforce(0).anyOf;
 enforce.anyOf;
 enforce(0).isArrayOf;
 enforce.isArrayOf;
 enforce(0).loose;
 enforce.loose;
+enforce(0).oneOf;
+enforce.oneOf;
 enforce(0).optional;
 enforce.optional;
 enforce(0).shape;

diff --git a/packages/vest/src/typings/enforce.d.ts b/packages/vest/src/typings/enforce.d.ts
@@ -88,11 +88,8 @@ interface IEnforceRules<T = {}> {
   ) => RuleReturn<T>;
   isArrayOf: CompoundListOfRules<T>;
   anyOf: CompoundListOfRules<T>;
-<<<<<<< HEAD
   allOf: CompoundListOfRules<T>;
-=======
   oneOf: CompoundListOfRules<T>;
->>>>>>> latest
 }
 
 interface IEnforce {
@@ -199,11 +196,8 @@ type TEnforceLazy = {
   optional: LazyCopmoundListOfRules;
   isArrayOf: LazyCopmoundListOfRules;
   anyOf: LazyCopmoundListOfRules;
-<<<<<<< HEAD
   allOf: LazyCopmoundListOfRules;
-=======
   oneOf: LazyCopmoundListOfRules;
->>>>>>> latest
 };
 
 export type TEnforce = IEnforce & TEnforceLazyReturn;