Skip to content

Commit

Permalink
Add approval controller (MetaMask#289)
Browse files Browse the repository at this point in the history
* Add approval controller

* Add approval controller tests

* Add JavaScript tests for approval controller, update CI config
  • Loading branch information
rekmarks committed Nov 3, 2020
1 parent 2455748 commit 1450178
Show file tree
Hide file tree
Showing 6 changed files with 916 additions and 11 deletions.
23 changes: 13 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,20 @@ workflows:
build-test:
jobs:
- prep-deps
- test-build:
- prep-build:
requires:
- prep-deps
- test-lint:
requires:
- prep-deps
- test-unit:
requires:
- prep-deps
- prep-build
- test-format:
requires:
- prep-deps
- prep-build
- all-tests-pass:
requires:
- test-build
- test-lint
- test-unit
- test-format
Expand All @@ -43,27 +42,31 @@ jobs:
- node_modules
- build-artifacts

test-format:
prep-build:
docker:
- image: circleci/node:10
steps:
- checkout
- attach_workspace:
at: .
- run:
name: Format
command: yarn format
name: Build
command: yarn build
- persist_to_workspace:
root: .
paths:
- dist

test-build:
test-format:
docker:
- image: circleci/node:10
steps:
- checkout
- attach_workspace:
at: .
- run:
name: Build project
command: yarn build
name: Format
command: yarn format

test-lint:
docker:
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"human-standard-token-abi": "^2.0.0",
"isomorphic-fetch": "^3.0.0",
"jsonschema": "^1.2.4",
"nanoid": "^3.1.12",
"percentile": "^1.2.1",
"single-call-balance-checker-abi": "^1.0.0",
"uuid": "^3.3.2",
Expand Down Expand Up @@ -94,10 +95,12 @@
"^.+\\.tsx?$": "ts-jest"
},
"testMatch": [
"**/*.test.ts"
"**/*.test.ts",
"**/*.test.js"
],
"coveragePathIgnorePatterns": [
"/node_modules/",
"dist/BaseController*",
"tests/"
],
"coverageThreshold": {
Expand Down
Loading

0 comments on commit 1450178

Please sign in to comment.