Merge pull request #180 from aragon/fix_tests

Fix broken tests
aragon · Mar 21, 2018 · 47589a2 · 47589a2
2 parents c1182cc + 819f749
commit 47589a2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/apps/token-manager/test/tokenmanager.js b/apps/token-manager/test/tokenmanager.js
@@ -13,18 +13,22 @@ const EVMScriptRegistryFactory = artifacts.require('@aragon/core/contracts/facto
 const ACL = artifacts.require('@aragon/core/contracts/acl/ACL')
 const Kernel = artifacts.require('@aragon/core/contracts/kernel/Kernel')
 
+const getContract = name => artifacts.require(name)
+
 const n = '0x00'
 const ANY_ADDR = '0xffffffffffffffffffffffffffffffffffffffff'
 
 contract('Token Manager', accounts => {
-    let tokenManager, token = {}
+    let daoFact, tokenManager, token = {}
 
     const root = accounts[0]
     const holder = accounts[1]
 
     before(async () => {
+        const kernelBase = await getContract('Kernel').new()
+        const aclBase = await getContract('ACL').new()
         const regFact = await EVMScriptRegistryFactory.new()
-        daoFact = await DAOFactory.new(regFact.address)
+        daoFact = await DAOFactory.new(kernelBase.address, aclBase.address, regFact.address)
     })
 
     beforeEach(async () => {

diff --git a/apps/voting/test/voting.js b/apps/voting/test/voting.js
@@ -7,13 +7,13 @@ const { encodeCallScript, EMPTY_SCRIPT } = require('@aragon/test-helpers/evmScri
 const ExecutionTarget = artifacts.require('ExecutionTarget')
 
 const Voting = artifacts.require('Voting')
-const MiniMeToken = artifacts.require('@aragon/core/contracts/common/MiniMeToken')
-const DAOFactory = artifacts.require('@aragon/core/contracts/factory/DAOFactory')
-const EVMScriptRegistryFactory = artifacts.require('@aragon/core/contracts/factory/EVMScriptRegistryFactory')
-const ACL = artifacts.require('@aragon/core/contracts/acl/ACL')
-const Kernel = artifacts.require('@aragon/core/contracts/kernel/Kernel')
-
+const MiniMeToken = artifacts.require('@aragon/os/contracts/lib/minime/MiniMeToken')
+const DAOFactory = artifacts.require('@aragon/os/contracts/factory/DAOFactory')
+const EVMScriptRegistryFactory = artifacts.require('@aragon/os/contracts/factory/EVMScriptRegistryFactory')
+const ACL = artifacts.require('@aragon/os/contracts/acl/ACL')
+const Kernel = artifacts.require('@aragon/os/contracts/kernel/Kernel')
 
+const getContract = name => artifacts.require(name)
 const pct16 = x => new web3.BigNumber(x).times(new web3.BigNumber(10).toPower(16))
 const createdVoteId = receipt => receipt.logs.filter(x => x.event == 'StartVote')[0].args.voteId
 
@@ -32,8 +32,10 @@ contract('Voting App', accounts => {
     const root = accounts[0]
 
     before(async () => {
+        const kernelBase = await getContract('Kernel').new()
+        const aclBase = await getContract('ACL').new()
         const regFact = await EVMScriptRegistryFactory.new()
-        daoFact = await DAOFactory.new(regFact.address)
+        daoFact = await DAOFactory.new(kernelBase.address, aclBase.address, regFact.address)
     })
 
     beforeEach(async () => {