Commit Graph

63 Commits

Author SHA1 Message Date
Fabio Berger
f066b52143 remove spaces after it keyword 2017-05-30 15:28:45 +02:00
Fabio Berger
53e83a7d81 Add first test for getProxyAllowanceAsync 2017-05-30 15:28:21 +02:00
Fabio Berger
86cdb6cb83 use token instead of erc20 2017-05-30 14:53:25 +02:00
Fabio Berger
2c3b718a4f rename erc20Wrapper to tokenWrapper to be more generic in case we end up supporting another spec 2017-05-30 14:48:41 +02:00
Fabio Berger
1f09470838 Merge branch 'master' into erc20Wrapper
# Conflicts:
#	src/0x.js.ts
2017-05-30 14:48:10 +02:00
Fabio Berger
3522f94ff6 use .be.undefined instead of .be.an('undefined') 2017-05-30 14:26:07 +02:00
Fabio Berger
ad14c307ce Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter that instantiates contract instance if not already instantiated 2017-05-30 14:23:44 +02:00
Fabio Berger
8561258ded Also test that web3Wrapper nested under tokenRegistryWrapper has updated provider 2017-05-30 12:56:10 +02:00
Fabio Berger
eefc8ca7ec add assertions that contractInstances are not undefined before provider update 2017-05-30 12:53:42 +02:00
Fabio Berger
007c57ec40 Also instantiate tokenRegistry contract instance 2017-05-30 12:52:28 +02:00
Fabio Berger
6aded80b2f remove unused import 2017-05-30 12:51:34 +02:00
Fabio Berger
e2d0fd9cf9 remove unused import 2017-05-30 12:47:53 +02:00
Fabio Berger
a3ce892f85 Make tokenRegistry contract instantiation lazy and clear it on provider update 2017-05-30 12:43:50 +02:00
Fabio Berger
e8a52ce1da Merge branch 'master' into dontReinstantiateContractInstances 2017-05-30 12:37:45 +02:00
Fabio Berger
02d7f808ab Merge branch 'master' into tokenRegistry
# Conflicts:
#	src/0x.js.ts
2017-05-30 12:36:28 +02:00
Fabio Berger
d15002a110 Add tests for setProvider 2017-05-30 12:30:38 +02:00
Fabio Berger
c536114b16 make web3Wrapper a private instance variable 2017-05-30 12:25:17 +02:00
Fabio Berger
4d63a4d02a use to.have.lengthOf 2017-05-30 10:49:34 +02:00
Fabio Berger
f4bc7ecf5f Merge branch 'tokenRegistry' into erc20Wrapper 2017-05-30 09:55:52 +02:00
Fabio Berger
b21779999f Merge branch 'removeSrcFilesNotUsedByTests' into tokenRegistry 2017-05-30 09:55:15 +02:00
Fabio Berger
c9111aea38 name exchangeWrapper test file properly 2017-05-30 09:54:11 +02:00
Fabio Berger
132b5d4f9b Add tests for getBalanceAsync 2017-05-30 09:52:47 +02:00
Fabio Berger
f3d5690d56 Add tests for getTokensAsync including schema validation 2017-05-29 23:52:10 +02:00
Fabio Berger
43082b576c Fix typos 2017-05-29 16:53:07 +02:00
Fabio Berger
1958142936 empty stubs array before next test runs 2017-05-29 16:10:34 +02:00
Fabio Berger
c513a5a5bd Merge branch 'master' into addSignOrderHashAndTests
# Conflicts:
#	package.json
#	src/globals.d.ts
#	test/0x.js_test.ts
2017-05-29 16:06:04 +02:00
Fabio Berger
abd0228ba8 Merge pull request #16 from 0xProject/umd-tests
Umd tests
2017-05-29 16:04:13 +02:00
Fabio Berger
a331943c11 Use disable-next-line instead of disable and always put rule that is being disabled 2017-05-29 15:59:42 +02:00
Fabio Berger
8c877bb18a Implement tests for signOrderHashAsync that test the logic for Parity < v1.6.6, >1.6.6 and other nodes 2017-05-29 13:39:32 +02:00
Fabio Berger
232e031959 don't use uppercase for constant variable unless it's global to the entire file 2017-05-29 13:34:49 +02:00
Leonid Logvinov
bb3e7a2b7d Use only 0x public interface in contract wrapper tests 2017-05-29 11:55:43 +02:00
Leonid Logvinov
405857fa81 Use constants from test utils 2017-05-29 11:50:03 +02:00
Leonid Logvinov
021391744f Fix imports 2017-05-29 11:39:20 +02:00
Fabio Berger
62cc3b919c Merge branch 'master' of github.com:0xProject/0x.js
# Conflicts:
#	src/ts/0x.js.ts
#	src/ts/utils/utils.ts
2017-05-29 09:09:54 +02:00
Fabio Berger
4c3c1d049b improve comment 2017-05-26 18:08:50 +02:00
Fabio Berger
d5feb5fc79 rename BlockClean to BlockchainLifecycle and setupAsync to startAsync, restoreAsync to revertAsync 2017-05-26 18:01:54 +02:00
Fabio Berger
badd4a98e9 import reorder 2017-05-26 17:51:47 +02:00
Fabio Berger
aa3ae700b0 remove stray console log 2017-05-26 17:49:26 +02:00
Fabio Berger
a6da9cd073 Add missing return types 2017-05-26 17:47:00 +02:00
Fabio Berger
555bac19cb Setup blockchain snapshotting before/after every test, implemented unit tests for exchangeWrapper.isValidSignature 2017-05-26 17:12:22 +02:00
Fabio Berger
3cf25d0787 Postfix test files with _test 2017-05-26 17:08:45 +02:00
Leonid Logvinov
183e8a7138 Address feedback 2017-05-25 20:29:33 +02:00
Leonid Logvinov
f2f39d9eb2 Port getOrderHash 2017-05-25 17:24:29 +02:00
Leonid Logvinov
00b6401452 Fix braces 2017-05-25 13:47:04 +02:00
Leonid
b43cc8f52c Merge branch 'master' into isValidOrderHash 2017-05-25 13:44:19 +02:00
Leonid Logvinov
eee06e0cc9 Address feedback 2017-05-25 13:42:53 +02:00
Fabio Berger
12aa9a29e4 Add toUnitAmount and toBaseUnitAmount static helpers and tests 2017-05-25 13:19:46 +02:00
Leonid
dc1ca23e30 Merge branch 'master' into isValidOrderHash 2017-05-25 12:53:37 +02:00
Leonid Logvinov
5d64b562c6 Fix tests 2017-05-25 12:52:31 +02:00
Fabio Berger
2117b4e0c8 Use expect.to.throw 2017-05-25 12:23:13 +02:00