Skip to content

Commit 3bd99ab

Browse files
cgeweckecgewecke
authored
Reorganize and cleanup truffle integration tests (#400)
1 parent c25697d commit 3bd99ab

File tree

17 files changed

+616
-1103
lines changed

17 files changed

+616
-1103
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ workflows:
7878
build:
7979
jobs:
8080
- unit-test
81-
- e2e-zeppelin
81+
# TODO: re-enable when server logic is added
82+
#- e2e-zeppelin
8283
- e2e-metacoin
8384
# TODO: re-enable.
8485
# At the moment we're using forks so this is pointless

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
},
1010
"scripts": {
1111
"nyc": "SILENT=true nyc --exclude '**/sc_temp/**' --exclude '**/test/**'",
12-
"test": "npm run nyc -- mocha test/units --timeout 70000 --no-warnings --exit",
13-
"test:ci": "SILENT=true nyc --reporter=lcov --exclude '**/sc_temp/**' --exclude '**/test/**' -- mocha test/units --timeout 70000 --no-warnings --exit",
14-
"test:debug": "mocha test/units --timeout 70000 --no-warnings --exit"
12+
"test": "npm run nyc -- mocha test/units/* --timeout 100000 --no-warnings --exit",
13+
"test:ci": "SILENT=true nyc --reporter=lcov --exclude '**/sc_temp/**' --exclude '**/test/**/' -- mocha test/units/* --timeout 100000 --no-warnings --exit",
14+
"test:debug": "mocha test/units/* --timeout 100000 --no-warnings --exit"
1515
},
1616
"homepage": "https://github.com/sc-forks/solidity-coverage",
1717
"repository": {

‎test/integration/projects/.solcover.js‎

Whitespace-only changes.

‎test/integration/projects/bad-solcover.js‎

Whitespace-only changes.

‎test/integration/projects/bad-solcoverjs/truffle-config.js‎

Lines changed: 3 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,7 @@
1-
/**
2-
* Use this file to configure your truffle project. It's seeded with some
3-
* common settings for different networks and features like migrations,
4-
* compilation and testing. Uncomment the ones you need or modify
5-
* them to suit your project as necessary.
6-
*
7-
* More information about configuration can be found at:
8-
*
9-
* truffleframework.com/docs/advanced/configuration
10-
*
11-
* To deploy via Infura you'll need a wallet provider (like truffle-hdwallet-provider)
12-
* to sign your transactions before they're sent to a remote public node. Infura accounts
13-
* are available for free at: infura.io/register.
14-
*
15-
* You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
16-
* public/private key pairs. If you're publishing your code to GitHub make sure you load this
17-
* phrase from a file you've .gitignored so it doesn't accidentally become public.
18-
*
19-
*/
20-
21-
// const HDWalletProvider = require('truffle-hdwallet-provider');
22-
// const infuraKey = "fj4jll3k.....";
23-
//
24-
// const fs = require('fs');
25-
// const mnemonic = fs.readFileSync(".secret").toString().trim();
26-
271
module.exports = {
28-
/**
29-
* Networks define how you connect to your ethereum client and let you set the
30-
* defaults web3 uses to send transactions. If you don't specify one truffle
31-
* will spin up a development blockchain for you on port 9545 when you
32-
* run `develop` or `test`. You can ask a truffle command to use a specific
33-
* network from the command line, e.g
34-
*
35-
* $ truffle test --network <network-name>
36-
*/
37-
38-
networks: {
39-
// Useful for testing. The `development` name is special - truffle uses it by default
40-
// if it's defined here and no other network is specified at the command line.
41-
// You should run a client (like ganache-cli, geth or parity) in a separate terminal
42-
// tab if you use this network and you must also set the `host`, `port` and `network_id`
43-
// options below to some value.
44-
//
45-
// development: {
46-
// host: "127.0.0.1", // Localhost (default: none)
47-
// port: 8545, // Standard Ethereum port (default: none)
48-
// network_id: "*", // Any network (default: none)
49-
// },
50-
51-
// Another network with more advanced options...
52-
// advanced: {
53-
// port: 8777, // Custom port
54-
// network_id: 1342, // Custom network
55-
// gas: 8500000, // Gas sent with each transaction (default: ~6700000)
56-
// gasPrice: 20000000000, // 20 gwei (in wei) (default: 100 gwei)
57-
// from: <address>, // Account to send txs from (default: accounts[0])
58-
// websockets: true // Enable EventEmitter interface for web3 (default: false)
59-
// },
60-
61-
// Useful for deploying to a public network.
62-
// NB: It's important to wrap the provider as a function.
63-
// ropsten: {
64-
// provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
65-
// network_id: 3, // Ropsten's id
66-
// gas: 5500000, // Ropsten has a lower block limit than mainnet
67-
// confirmations: 2, // # of confs to wait between deployments. (default: 0)
68-
// timeoutBlocks: 200, // # of blocks before a deployment times out (minimum/default: 50)
69-
// skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
70-
// },
71-
72-
// Useful for private networks
73-
// private: {
74-
// provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
75-
// network_id: 2111, // This network is yours, in the cloud.
76-
// production: true // Treats this network as if it was a public net. (default: false)
77-
// }
78-
},
79-
80-
// Set default mocha options here, use special reporters etc.
81-
mocha: {
82-
// timeout: 100000
83-
},
84-
85-
// Configure your compilers
2+
networks: {},
3+
mocha: {},
864
compilers: {
87-
solc: {
88-
// version: "0.5.1", // Fetch exact version from solc-bin (default: truffle's version)
89-
// docker: true, // Use "0.5.1" you've installed locally with docker (default: false)
90-
// settings: { // See the solidity docs for advice about optimization and evmVersion
91-
// optimizer: {
92-
// enabled: false,
93-
// runs: 200
94-
// },
95-
// evmVersion: "byzantium"
96-
// }
97-
}
5+
solc: {}
986
}
997
}

‎test/integration/projects/import-paths/truffle-config.js‎

Lines changed: 3 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,7 @@
1-
/**
2-
* Use this file to configure your truffle project. It's seeded with some
3-
* common settings for different networks and features like migrations,
4-
* compilation and testing. Uncomment the ones you need or modify
5-
* them to suit your project as necessary.
6-
*
7-
* More information about configuration can be found at:
8-
*
9-
* truffleframework.com/docs/advanced/configuration
10-
*
11-
* To deploy via Infura you'll need a wallet provider (like truffle-hdwallet-provider)
12-
* to sign your transactions before they're sent to a remote public node. Infura accounts
13-
* are available for free at: infura.io/register.
14-
*
15-
* You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
16-
* public/private key pairs. If you're publishing your code to GitHub make sure you load this
17-
* phrase from a file you've .gitignored so it doesn't accidentally become public.
18-
*
19-
*/
20-
21-
// const HDWalletProvider = require('truffle-hdwallet-provider');
22-
// const infuraKey = "fj4jll3k.....";
23-
//
24-
// const fs = require('fs');
25-
// const mnemonic = fs.readFileSync(".secret").toString().trim();
26-
271
module.exports = {
28-
/**
29-
* Networks define how you connect to your ethereum client and let you set the
30-
* defaults web3 uses to send transactions. If you don't specify one truffle
31-
* will spin up a development blockchain for you on port 9545 when you
32-
* run `develop` or `test`. You can ask a truffle command to use a specific
33-
* network from the command line, e.g
34-
*
35-
* $ truffle test --network <network-name>
36-
*/
37-
38-
networks: {
39-
// Useful for testing. The `development` name is special - truffle uses it by default
40-
// if it's defined here and no other network is specified at the command line.
41-
// You should run a client (like ganache-cli, geth or parity) in a separate terminal
42-
// tab if you use this network and you must also set the `host`, `port` and `network_id`
43-
// options below to some value.
44-
//
45-
// development: {
46-
// host: "127.0.0.1", // Localhost (default: none)
47-
// port: 8545, // Standard Ethereum port (default: none)
48-
// network_id: "*", // Any network (default: none)
49-
// },
50-
51-
// Another network with more advanced options...
52-
// advanced: {
53-
// port: 8777, // Custom port
54-
// network_id: 1342, // Custom network
55-
// gas: 8500000, // Gas sent with each transaction (default: ~6700000)
56-
// gasPrice: 20000000000, // 20 gwei (in wei) (default: 100 gwei)
57-
// from: <address>, // Account to send txs from (default: accounts[0])
58-
// websockets: true // Enable EventEmitter interface for web3 (default: false)
59-
// },
60-
61-
// Useful for deploying to a public network.
62-
// NB: It's important to wrap the provider as a function.
63-
// ropsten: {
64-
// provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
65-
// network_id: 3, // Ropsten's id
66-
// gas: 5500000, // Ropsten has a lower block limit than mainnet
67-
// confirmations: 2, // # of confs to wait between deployments. (default: 0)
68-
// timeoutBlocks: 200, // # of blocks before a deployment times out (minimum/default: 50)
69-
// skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
70-
// },
71-
72-
// Useful for private networks
73-
// private: {
74-
// provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
75-
// network_id: 2111, // This network is yours, in the cloud.
76-
// production: true // Treats this network as if it was a public net. (default: false)
77-
// }
78-
},
79-
80-
// Set default mocha options here, use special reporters etc.
81-
mocha: {
82-
// timeout: 100000
83-
},
84-
85-
// Configure your compilers
2+
networks: {},
3+
mocha: {},
864
compilers: {
87-
solc: {
88-
// version: "0.5.1", // Fetch exact version from solc-bin (default: truffle's version)
89-
// docker: true, // Use "0.5.1" you've installed locally with docker (default: false)
90-
// settings: { // See the solidity docs for advice about optimization and evmVersion
91-
// optimizer: {
92-
// enabled: false,
93-
// runs: 200
94-
// },
95-
// evmVersion: "byzantium"
96-
// }
97-
}
5+
solc: {}
986
}
997
}

‎test/integration/projects/multiple-migrations/truffle-config.js‎

Lines changed: 3 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,7 @@
1-
/**
2-
* Use this file to configure your truffle project. It's seeded with some
3-
* common settings for different networks and features like migrations,
4-
* compilation and testing. Uncomment the ones you need or modify
5-
* them to suit your project as necessary.
6-
*
7-
* More information about configuration can be found at:
8-
*
9-
* truffleframework.com/docs/advanced/configuration
10-
*
11-
* To deploy via Infura you'll need a wallet provider (like truffle-hdwallet-provider)
12-
* to sign your transactions before they're sent to a remote public node. Infura accounts
13-
* are available for free at: infura.io/register.
14-
*
15-
* You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
16-
* public/private key pairs. If you're publishing your code to GitHub make sure you load this
17-
* phrase from a file you've .gitignored so it doesn't accidentally become public.
18-
*
19-
*/
20-
21-
// const HDWalletProvider = require('truffle-hdwallet-provider');
22-
// const infuraKey = "fj4jll3k.....";
23-
//
24-
// const fs = require('fs');
25-
// const mnemonic = fs.readFileSync(".secret").toString().trim();
26-
271
module.exports = {
28-
/**
29-
* Networks define how you connect to your ethereum client and let you set the
30-
* defaults web3 uses to send transactions. If you don't specify one truffle
31-
* will spin up a development blockchain for you on port 9545 when you
32-
* run `develop` or `test`. You can ask a truffle command to use a specific
33-
* network from the command line, e.g
34-
*
35-
* $ truffle test --network <network-name>
36-
*/
37-
38-
networks: {
39-
// Useful for testing. The `development` name is special - truffle uses it by default
40-
// if it's defined here and no other network is specified at the command line.
41-
// You should run a client (like ganache-cli, geth or parity) in a separate terminal
42-
// tab if you use this network and you must also set the `host`, `port` and `network_id`
43-
// options below to some value.
44-
//
45-
// development: {
46-
// host: "127.0.0.1", // Localhost (default: none)
47-
// port: 8545, // Standard Ethereum port (default: none)
48-
// network_id: "*", // Any network (default: none)
49-
// },
50-
51-
// Another network with more advanced options...
52-
// advanced: {
53-
// port: 8777, // Custom port
54-
// network_id: 1342, // Custom network
55-
// gas: 8500000, // Gas sent with each transaction (default: ~6700000)
56-
// gasPrice: 20000000000, // 20 gwei (in wei) (default: 100 gwei)
57-
// from: <address>, // Account to send txs from (default: accounts[0])
58-
// websockets: true // Enable EventEmitter interface for web3 (default: false)
59-
// },
60-
61-
// Useful for deploying to a public network.
62-
// NB: It's important to wrap the provider as a function.
63-
// ropsten: {
64-
// provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
65-
// network_id: 3, // Ropsten's id
66-
// gas: 5500000, // Ropsten has a lower block limit than mainnet
67-
// confirmations: 2, // # of confs to wait between deployments. (default: 0)
68-
// timeoutBlocks: 200, // # of blocks before a deployment times out (minimum/default: 50)
69-
// skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
70-
// },
71-
72-
// Useful for private networks
73-
// private: {
74-
// provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
75-
// network_id: 2111, // This network is yours, in the cloud.
76-
// production: true // Treats this network as if it was a public net. (default: false)
77-
// }
78-
},
79-
80-
// Set default mocha options here, use special reporters etc.
81-
mocha: {
82-
// timeout: 100000
83-
},
84-
85-
// Configure your compilers
2+
networks: {},
3+
mocha: {},
864
compilers: {
87-
solc: {
88-
// version: "0.5.1", // Fetch exact version from solc-bin (default: truffle's version)
89-
// docker: true, // Use "0.5.1" you've installed locally with docker (default: false)
90-
// settings: { // See the solidity docs for advice about optimization and evmVersion
91-
// optimizer: {
92-
// enabled: false,
93-
// runs: 200
94-
// },
95-
// evmVersion: "byzantium"
96-
// }
97-
}
5+
solc: {}
986
}
997
}

0 commit comments

Comments
 (0)