diff options
author | Fred Carlsen <fred@sjelfull.no> | 2018-12-20 06:59:07 +0800 |
---|---|---|
committer | Fred Carlsen <fred@sjelfull.no> | 2018-12-20 06:59:07 +0800 |
commit | 5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf (patch) | |
tree | aed059ac8540233b7fbd20aa32bc3a0f21734182 /packages/sol-compiler/test/compiler_utils_test.ts | |
parent | aa5c2c249d43c980c06d3a5541233f2407a83371 (diff) | |
parent | 125a940560a01305781bfb6754f52fa64669a6f3 (diff) | |
download | dexon-sol-tools-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar dexon-sol-tools-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.gz dexon-sol-tools-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.bz2 dexon-sol-tools-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.lz dexon-sol-tools-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.xz dexon-sol-tools-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.zst dexon-sol-tools-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.zip |
Merge remote-tracking branch 'upstream/feature/website/0x-org' into feature/website/0x-org
# Conflicts:
# packages/website/ts/@next/components/button.tsx
# packages/website/ts/@next/components/definition.tsx
# packages/website/ts/@next/components/hero.tsx
# packages/website/ts/@next/components/sections/landing/about.tsx
# packages/website/ts/@next/pages/market_maker.tsx
Diffstat (limited to 'packages/sol-compiler/test/compiler_utils_test.ts')
-rw-r--r-- | packages/sol-compiler/test/compiler_utils_test.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/sol-compiler/test/compiler_utils_test.ts b/packages/sol-compiler/test/compiler_utils_test.ts index 4fe7b994e..b8c18110c 100644 --- a/packages/sol-compiler/test/compiler_utils_test.ts +++ b/packages/sol-compiler/test/compiler_utils_test.ts @@ -52,7 +52,7 @@ describe('Compiler utils', () => { const source = await fsWrapper.readFileAsync(path, { encoding: 'utf8', }); - const dependencies = parseDependencies({ source, path }); + const dependencies = parseDependencies({ source, path, absolutePath: path }); const expectedDependencies = [ 'zeppelin-solidity/contracts/token/ERC20/ERC20.sol', 'packages/sol-compiler/lib/test/fixtures/contracts/TokenTransferProxy.sol', @@ -68,7 +68,7 @@ describe('Compiler utils', () => { const source = await fsWrapper.readFileAsync(path, { encoding: 'utf8', }); - expect(parseDependencies({ source, path })).to.be.deep.equal([ + expect(parseDependencies({ source, path, absolutePath: path })).to.be.deep.equal([ 'zeppelin-solidity/contracts/ownership/Ownable.sol', 'zeppelin-solidity/contracts/token/ERC20/ERC20.sol', ]); @@ -77,7 +77,7 @@ describe('Compiler utils', () => { it.skip('correctly parses commented out dependencies', async () => { const path = ''; const source = `// import "./TokenTransferProxy.sol";`; - expect(parseDependencies({ path, source })).to.be.deep.equal([]); + expect(parseDependencies({ path, source, absolutePath: path })).to.be.deep.equal([]); }); }); }); |