Skip to content

Commit 4d5a4e2

Browse files
committed
Add tests and fixtures for full project scenarios (#385)
* Full project tests fixtures for repeated use of evm_revert, * ... and the skipped folders option, * ... and solidity imports with relative paths reaching outside the `contracts/` folder.
1 parent 7d1e6ac commit 4d5a4e2

32 files changed

+668
-23
lines changed

dist/truffle.plugin.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,29 @@ const ganache = require('ganache-core-sc');
3737
async function plugin(truffleConfig){
3838
let app;
3939
let error;
40+
let truffle;
4041
let testsErrored = false;
42+
let coverageConfig;
43+
let coverageConfigPath;
4144

45+
// Load truffle lib, .solcover.js & launch app
4246
try {
43-
// Load truffle lib & coverage config
44-
const truffle = loadTruffleLibrary();
47+
truffle = loadTruffleLibrary();
4548

46-
const coverageConfigPath = path.join(truffleConfig.working_directory, '.solcover.js');
47-
const coverageConfig = req.silent(coverageConfigPath) || {};
49+
coverageConfigPath = path.join(truffleConfig.working_directory, '.solcover.js');
50+
coverageConfig = req.silent(coverageConfigPath) || {};
4851

4952
coverageConfig.cwd = truffleConfig.working_directory;
5053
coverageConfig.contractsDir = truffleConfig.contracts_directory;
5154

52-
// Start
5355
app = new App(coverageConfig);
56+
57+
} catch (err) {
58+
throw err;
59+
}
60+
61+
// Instrument and test..
62+
try {
5463
death(app.cleanUp);
5564

5665
// Write instrumented sources to temp folder
@@ -97,7 +106,6 @@ async function plugin(truffleConfig){
97106
} catch (e) {
98107
error = e.stack;
99108
}
100-
101109
// Run Istanbul
102110
await app.report();
103111

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!node_modules
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
silent: process.env.SILENT ? true : false,
3+
};
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
pragma solidity >=0.4.21 <0.6.0;
2+
3+
contract RelativePathImport {
4+
uint r;
5+
constructor() public {}
6+
7+
function isRelativePathMethod() public {
8+
r = 5;
9+
}
10+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
pragma solidity >=0.4.21 <0.6.0;
2+
3+
contract Migrations {
4+
address public owner;
5+
uint public last_completed_migration;
6+
7+
constructor() public {
8+
owner = msg.sender;
9+
}
10+
11+
modifier restricted() {
12+
if (msg.sender == owner) _;
13+
}
14+
15+
function setCompleted(uint completed) public restricted {
16+
last_completed_migration = completed;
17+
}
18+
19+
function upgrade(address new_address) public restricted {
20+
Migrations upgraded = Migrations(new_address);
21+
upgraded.setCompleted(last_completed_migration);
22+
}
23+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
pragma solidity >=0.4.21 <0.6.0;
2+
3+
import "../assets/RelativePathImport.sol";
4+
import "package/NodeModulesImport.sol";
5+
6+
contract UsesImports is RelativePathImport, NodeModulesImport {
7+
8+
constructor() public {}
9+
10+
function wrapsRelativePathMethod() public {
11+
isRelativePathMethod();
12+
}
13+
14+
function wrapsNodeModulesMethod() public {
15+
isNodeModulesMethod();
16+
}
17+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const Migrations = artifacts.require("Migrations");
2+
3+
module.exports = function(deployer) {
4+
deployer.deploy(Migrations);
5+
};

test/integration/projects/import-paths/node_modules/package/NodeModulesImport.sol

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
var UsesImports = artifacts.require("UsesImports");
2+
3+
contract("UsesImports", function(accounts) {
4+
let instance;
5+
6+
before(async () => instance = await UsesImports.new());
7+
8+
it('uses a method from a relative import', async () => {
9+
await instance.wrapsRelativePathMethod();
10+
})
11+
12+
it('uses an import from node_modules', async () => {
13+
await instance.wrapsNodeModulesMethod();
14+
})
15+
16+
});
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
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+
27+
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
86+
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+
}
98+
}
99+
}

0 commit comments

Comments
 (0)