Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] 588 replace test helpers imports #952

Open
wants to merge 17 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 0 additions & 24 deletions apps/address-book/contracts/misc/Migrations.sol

This file was deleted.

8 changes: 8 additions & 0 deletions apps/address-book/contracts/test/Imports.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
pragma solidity ^0.4.24;
// HACK to workaround truffle artifact loading on dependencies
import "@aragon/os/contracts/acl/ACL.sol";
import "@aragon/os/contracts/factory/DAOFactory.sol";


// solium-disable-next-line no-empty-blocks
contract Imports {}
29 changes: 0 additions & 29 deletions apps/address-book/contracts/test/TestImports.sol

This file was deleted.

Empty file.
5 changes: 0 additions & 5 deletions apps/address-book/migrations/1_initial_migration.js

This file was deleted.

5 changes: 0 additions & 5 deletions apps/address-book/migrations/2_deploy_contracts.js

This file was deleted.

3 changes: 2 additions & 1 deletion apps/address-book/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"start": "aragon run",
"sync-assets": "copy-aragon-ui-assets -n aragon-ui ./dist && npm run copy-public-assets",
"test:gas": "GAS_REPORTER=true npm test",
"test": "TRUFFLE_TEST=true npm run ganache-cli:test"
"test": "cross-env TRUFFLE_TEST=true npm run ganache-cli:test"
},
"dependencies": {
"@aragon/api": "1.1.0",
Expand All @@ -45,6 +45,7 @@
"@babel/preset-react": "^7.0.0",
"babel-eslint": "^10.0.1",
"babel-plugin-styled-components": "^1.10.0",
"cross-env": "^5.2.0",
"eslint": "^5.16.0",
"eslint-config-prettier": "^4.3.0",
"eslint-config-standard": "^12.0.0",
Expand Down
27 changes: 0 additions & 27 deletions apps/address-book/test/Spoof.sol

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
const {
ACL,
DAOFactory,
EVMScriptRegistryFactory,
Kernel,
} = require('@tps/test-helpers/artifacts')
const ACL = artifacts.require('ACL')
const DAOFactory = artifacts.require('DAOFactory')
const EVMScriptRegistryFactory = artifacts.require('EVMScriptRegistryFactory')
const Kernel = artifacts.require('Kernel')

const AddressBook = artifacts.require('AddressBook')

Expand Down Expand Up @@ -117,7 +115,11 @@ contract('AddressBook App', accounts => {
})
it('should return a zero-address when getting non-existant entry', async () => {
const [ entryAddress, name, entryType ] = await app.getEntry(jeanluc)
assert.strictEqual(entryAddress, '0x0000000000000000000000000000000000000000', 'address should be 0x0')
assert.strictEqual(
entryAddress,
'0x0000000000000000000000000000000000000000',
'address should be 0x0'
)
assert.strictEqual(name, '', 'name should be empty')
assert.strictEqual(entryType, '', 'entry Type should be empty')
})
Expand Down
25 changes: 0 additions & 25 deletions apps/allocations/contracts/misc/Migrations.sol

This file was deleted.

9 changes: 9 additions & 0 deletions apps/allocations/contracts/test/Imports.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pragma solidity ^0.4.24;
// HACK to workaround truffle artifact loading on dependencies
import "@aragon/os/contracts/acl/ACL.sol";
import "@aragon/os/contracts/factory/DAOFactory.sol";
import "@aragon/apps-shared-minime/contracts/MiniMeToken.sol";


// solium-disable-next-line no-empty-blocks
contract Imports {}
27 changes: 0 additions & 27 deletions apps/allocations/contracts/test/TestImports.sol

This file was deleted.

Empty file.
5 changes: 0 additions & 5 deletions apps/allocations/migrations/1_initial_migration.js

This file was deleted.

5 changes: 0 additions & 5 deletions apps/allocations/migrations/2_deploy_contracts.js

This file was deleted.

1 change: 1 addition & 0 deletions apps/allocations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"dependencies": {
"@aragon/api": "1.1.0",
"@aragon/api-react": "1.0.0-beta.2",
"@aragon/apps-shared-minime": "^1.0.1",
"@aragon/apps-vault": "^4.1.0",
"@aragon/ui": "0.33.0",
"@babel/polyfill": "^7.2.5",
Expand Down
28 changes: 0 additions & 28 deletions apps/allocations/test/Spoof.sol

This file was deleted.