Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions dist/truffle.plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,26 @@ async function plugin(truffleConfig){
let truffle;
let testsErrored = false;
let coverageConfig;
let coverageConfigPath;
let solcoverjs;

// Load truffle lib, .solcover.js & launch app
try {
truffle = loadTruffleLibrary();

coverageConfigPath = path.join(truffleConfig.working_directory, '.solcover.js');
coverageConfig = req.silent(coverageConfigPath) || {};
(truffleConfig.solcoverjs)
? solcoverjs = path.join(truffleConfig.working_directory, truffleConfig.solcoverjs)
: solcoverjs = path.join(truffleConfig.working_directory, '.solcover.js');

coverageConfig = req.silent(solcoverjs) || {};
coverageConfig.cwd = truffleConfig.working_directory;
coverageConfig.originalContractsDir = truffleConfig.contracts_directory;

app = new App(coverageConfig);

if (truffleConfig.help){
return app.ui.report('truffle-help')
}

truffle = loadTruffleLibrary();

} catch (err) {
throw err;
}
Expand Down
7 changes: 6 additions & 1 deletion lib/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ class UI {

const kinds = {

'truffle-help': `Usage: truffle run coverage [options]\n\n` +
`Options:\n` +
` --file: path (or glob) to run subset of JS test files\n` +
` --solcoverjs: relative path to .solcover.js (ex: ./../.solcover.js)\n`,

'truffle-version': `${ct} ${c.bold('truffle')}: v${args[0]}`,
'ganache-version': `${ct} ${c.bold('ganache-core')}: ${args[0]}`,

Expand All @@ -33,7 +38,7 @@ class UI {
`\n${c.bold('=====================')}\n`,

'instr-item': `${ct} ${args[0]}`,
'instr-skipped': `${ds} ${c.grey(args[0])}`
'instr-skipped': `${ds} ${c.grey(args[0])}`,
}

this.log(emoji.emojify(kinds[kind]));
Expand Down
38 changes: 37 additions & 1 deletion test/units/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ function getOutput(truffleConfig){
describe('app', function() {
let truffleConfig;
let solcoverConfig;
let collector;

beforeEach(() => {
mock.clean();
truffleConfig = mock.getDefaultTruffleConfig();

solcoverConfig = {};
truffleConfig = mock.getDefaultTruffleConfig();

if (process.env.SILENT)
solcoverConfig.silent = true;
Expand Down Expand Up @@ -145,6 +147,40 @@ describe('app', function() {
await plugin(truffleConfig);
});

it('truffle run coverage --config ../.solcover.js', async function() {
assertCleanInitialState();

solcoverConfig = {
silent: process.env.SILENT ? true : false,
istanbulReporter: ['json-summary', 'text']
};
fs.writeFileSync('.solcover.js', `module.exports=${JSON.stringify(solcoverConfig)}`);

// This relative path has to be ./ prefixed
// (because it's path.joined to truffle's working_directory)
truffleConfig.solcoverjs = './../.solcover.js';

mock.install('Simple', 'simple.js');
await plugin(truffleConfig);

// The relative solcoverjs uses the json-summary reporter which
// this assertion requires
const expected = [{
file: pathToContract(truffleConfig, 'Simple.sol'),
pct: 100
}];

assertLineCoverage(expected);
shell.rm('.solcover.js');
});

it('truffle run coverage --help', async function(){
assertCleanInitialState();
truffleConfig.help = "true";
mock.install('Simple', 'simple.js', solcoverConfig);
await plugin(truffleConfig);
})

it('truffle run coverage --file test/<fileName>', async function() {
assertCleanInitialState();

Expand Down
7 changes: 5 additions & 2 deletions test/util/integration.truffle.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ function install(
noMigrations
) {

const configjs = getSolcoverJS(config);
let configjs;
if(config) configjs = getSolcoverJS(config);

const trufflejs = getTruffleConfigJS(_truffleConfig);
const migration = deploySingle(contract);

Expand All @@ -116,7 +118,7 @@ function install(

// Configs
fs.writeFileSync(`${temp}/${truffleConfigName}`, trufflejs);
fs.writeFileSync(configPath, configjs);
if(config) fs.writeFileSync(configPath, configjs);

decacheConfigs();

Expand Down Expand Up @@ -169,6 +171,7 @@ function clean() {
shell.rm('-Rf', temp);
shell.rm('-Rf', 'coverage');
shell.rm('coverage.json');
shell.rm('.solcover.js');

shell.config.silent = false;
};
Expand Down