fix(core-webhooks): require all properties in schema and handle 404 r…

…esources (#2634)
ArkEcosystem · May 30, 2019 · a832610 · a832610
1 parent ac57453
commit a832610
Show file tree

Hide file tree

Showing 10 changed files with 208 additions and 293 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -657,12 +657,6 @@ jobs:
             cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
             test:coverage /integration/core-forger/ --coverageDirectory
             .coverage/integration/core-forger
-      - run:
-          name: core-json-rpc - integration
-          command: >-
-            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
-            test:coverage /integration/core-json-rpc/ --coverageDirectory
-            .coverage/integration/core-json-rpc
       - run:
           name: Last 1000 lines of test output
           when: on_fail
@@ -778,12 +772,6 @@ jobs:
             cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
             test:coverage /integration/core-forger/ --coverageDirectory
             .coverage/integration/core-forger
-      - run:
-          name: core-json-rpc - integration
-          command: >-
-            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
-            test:coverage /integration/core-json-rpc/ --coverageDirectory
-            .coverage/integration/core-json-rpc
       - run:
           name: Last 1000 lines of test output
           when: on_fail
@@ -899,12 +887,6 @@ jobs:
             cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
             test:coverage /integration/core-forger/ --coverageDirectory
             .coverage/integration/core-forger
-      - run:
-          name: core-json-rpc - integration
-          command: >-
-            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
-            test:coverage /integration/core-json-rpc/ --coverageDirectory
-            .coverage/integration/core-json-rpc
       - run:
           name: Last 1000 lines of test output
           when: on_fail
@@ -1566,6 +1548,12 @@ jobs:
       - run:
           name: Create .core/database directory
           command: mkdir -p $HOME/.core/database
+      - run:
+          name: core-json-rpc - integration
+          command: >-
+            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
+            test:coverage /integration/core-json-rpc/ --coverageDirectory
+            .coverage/integration/core-json-rpc
       - run:
           name: core-p2p - integration
           command: >-
@@ -1590,12 +1578,6 @@ jobs:
             cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
             test:coverage /integration/core-vote-report/ --coverageDirectory
             .coverage/integration/core-vote-report
-      - run:
-          name: core-webhooks - integration
-          command: >-
-            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
-            test:coverage /integration/core-webhooks/ --coverageDirectory
-            .coverage/integration/core-webhooks
       - run:
           name: Last 1000 lines of test output
           when: on_fail
@@ -1687,6 +1669,12 @@ jobs:
       - run:
           name: Create .core/database directory
           command: mkdir -p $HOME/.core/database
+      - run:
+          name: core-json-rpc - integration
+          command: >-
+            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
+            test:coverage /integration/core-json-rpc/ --coverageDirectory
+            .coverage/integration/core-json-rpc
       - run:
           name: core-p2p - integration
           command: >-
@@ -1711,12 +1699,6 @@ jobs:
             cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
             test:coverage /integration/core-vote-report/ --coverageDirectory
             .coverage/integration/core-vote-report
-      - run:
-          name: core-webhooks - integration
-          command: >-
-            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
-            test:coverage /integration/core-webhooks/ --coverageDirectory
-            .coverage/integration/core-webhooks
       - run:
           name: Last 1000 lines of test output
           when: on_fail
@@ -1808,6 +1790,12 @@ jobs:
       - run:
           name: Create .core/database directory
           command: mkdir -p $HOME/.core/database
+      - run:
+          name: core-json-rpc - integration
+          command: >-
+            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
+            test:coverage /integration/core-json-rpc/ --coverageDirectory
+            .coverage/integration/core-json-rpc
       - run:
           name: core-p2p - integration
           command: >-
@@ -1832,12 +1820,6 @@ jobs:
             cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
             test:coverage /integration/core-vote-report/ --coverageDirectory
             .coverage/integration/core-vote-report
-      - run:
-          name: core-webhooks - integration
-          command: >-
-            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core && yarn
-            test:coverage /integration/core-webhooks/ --coverageDirectory
-            .coverage/integration/core-webhooks
       - run:
           name: Last 1000 lines of test output
           when: on_fail

diff --git a/__tests__/integration/core-webhooks/__support__/setup.ts b/__tests__/integration/core-webhooks/__support__/setup.ts
diff --git a/__tests__/integration/core-webhooks/__support__/utils.ts b/__tests__/integration/core-webhooks/__support__/utils.ts
diff --git a/__tests__/integration/core-webhooks/server.test.ts b/__tests__/integration/core-webhooks/server.test.ts