Merge pull request #125 from sc-forks/fix-bad-merge-116

Add relative mapping logic, remove path corrections in tests

lib/app.js

@@ -222,8 +222,8 @@ class App {
           // Generate Istanbul report
           try {
             this.coverage.generate(this.events, `${this.workingDir}/contracts`);
-
+            const relativeMapping = App.makeKeysRelative(this.coverage.coverage, this.workingDir);
-            const json = JSON.stringify(this.coverage.coverage);
+            const json = JSON.stringify(relativeMapping);
             fs.writeFileSync('./coverage.json', json);
 
             collector.add(this.coverage.coverage);

test/assert.js

@@ -8,7 +8,7 @@ const vm = require('./util/vm');
 const assert = require('assert');
 
 describe('asserts and requires', () => {
-  const filePath = path.resolve('./test.sol').split('\\').join('/');
+  const filePath = path.resolve('./test.sol');
   const pathPrefix = './';
 
   it('should cover assert statements as if they are if statements when they pass', done => {

test/comments.js

@@ -6,7 +6,7 @@ const util = require('./util/util.js');
 const solc = require('solc');
 
 describe('comments', () => {
-  const filePath = path.resolve('./test.sol').split('\\').join('/');
+  const filePath = path.resolve('./test.sol');
   const pathPrefix = './';
 
   it('should cover functions even if comments are present immediately after the opening {', () => {

test/conditional.js

@@ -8,7 +8,7 @@ const vm = require('./util/vm');
 const assert = require('assert');
 
 describe('conditional statements', () => {
-  const filePath = path.resolve('./test.sol').split('\\').join('/');
+  const filePath = path.resolve('./test.sol');
   const pathPrefix = './';
 
   it('should cover a conditional that reaches the consequent (same-line)', done => {

test/expressions.js

@@ -11,7 +11,7 @@ const path = require('path');
  *     and passing the error to mocha.
  */
 describe('generic expressions', () => {
-  const filePath = path.resolve('./test.sol').split('\\').join('/');
+  const filePath = path.resolve('./test.sol');
 
   it('should compile after instrumenting a single binary expression', () => {
     const contract = util.getCode('expressions/single-binary-expression.sol');

test/function.js

@@ -14,7 +14,7 @@ const assert = require('assert');
  *     and passing the error to mocha.
  */
 describe('function declarations', () => {
-  const filePath = path.resolve('./test.sol').split('\\').join('/');
+  const filePath = path.resolve('./test.sol');
   const pathPrefix = './';
 
   it('should compile after instrumenting an ordinary function declaration', () => {

test/if.js

@@ -8,7 +8,7 @@ const vm = require('./util/vm');
 const assert = require('assert');
 
 describe('if, else, and else if statements', () => {
-  const filePath = path.resolve('./test.sol').split('\\').join('/');
+  const filePath = path.resolve('./test.sol');
   const pathPrefix = './';
 
   it('should cover an if statement with a bracketed consequent', done => {

test/loops.js

@@ -8,7 +8,7 @@ const vm = require('./util/vm');
 const assert = require('assert');
 
 describe('for and while statements', () => {
-  const filePath = path.resolve('./test.sol').split('\\').join('/');
+  const filePath = path.resolve('./test.sol');
   const pathPrefix = './';
 
   it('should cover a for statement with a bracketed body (multiline)', done => {

test/statements.js

@@ -14,7 +14,7 @@ const assert = require('assert');
  *     and passing the error to mocha.
  */
 describe('generic statements', () => {
-  const filePath = path.resolve('./test.sol').split('\\').join('/');
+  const filePath = path.resolve('./test.sol');
   const pathPrefix = './';
 
   it('should compile after instrumenting a single statement (first line of function)', () => {