fix and add tests

Author: jrainville

package-lock.json

@@ -88,6 +88,6 @@
     "matchdep": "^1.0.1",
     "mocha": "^3.2.0",
     "mocha-sinon": "^1.1.4",
-    "sinon": "^1.15.4"
+    "sinon": "^4.5.0"
   }
 }

package.json

@@ -158,14 +158,14 @@ describe('embark.Config', function () {
       ];
       const expected = [
         {
-          "filename": ".embark/contracts/simple_storage.sol",
+          "filename": ".embark/contracts/embark-framework/embark/master/test_app/app/contracts/simple_storage.sol",
           "type": "http",
           "path": "https://raw.githubusercontent.com/embark-framework/embark/master/test_app/app/contracts/simple_storage.sol",
           "basedir": "",
           "resolver": undefined
         },
         {
-          "filename": ".embark/contracts/ERC725.sol",
+          "filename": ".embark/contracts/status-im/contracts/master/contracts/identity/ERC725.sol",
           "type": "http",
           "path": "https://raw.githubusercontent.com/status-im/contracts/master/contracts/identity/ERC725.sol",
           "basedir": "",

test/config.js

@@ -0,0 +1,19 @@
+pragma solidity ^0.4.7;
+contract SimpleStorage {
+  uint public storedData;
+  import "./ownable.sol";
+
+  function SimpleStorage(uint initialValue) {
+    storedData = initialValue;
+  }
+
+  function set(uint x) {
+    storedData = x;
+  }
+
+  function get() constant returns (uint retVal) {
+    return storedData;
+  }
+
+}
+

test/contracts/contract_with_import.sol

@@ -1,7 +1,6 @@
 pragma solidity ^0.4.7;
 contract SimpleStorage {
   uint public storedData;
-  import "./ownable.sol";
 
   function SimpleStorage(uint initialValue) {
     storedData = initialValue;

test/contracts/simple_storage.sol

@@ -1,14 +1,27 @@
 /*globals describe, it*/
 const File = require('../lib/core/file');
 const fs = require('fs-extra');
+const path = require('path');
+const assert = require('assert');
+const sinon = require('sinon');
 
 describe('embark.File', function () {
   describe('parseFileForImport', () => {
     it('should find all the imports', function (done) {
-      const contract = fs.readFileSync('./test/contracts/simple_storage.sol').toString();
+      const contract = fs.readFileSync('./test/contracts/contract_with_import.sol').toString();
       const file = new File({filename: '.embark/contracts/embark-framework/embark/master/test_app/app/contracts/simple_storage.sol',
         path: 'https://raw.githubusercontent.com/embark-framework/embark/develop/test_apps/test_app/app/contracts/simple_storage.sol'});
+      const downloadFileStub = sinon.stub(file, 'downloadFile')
+        .callsFake((path, url, cb) => {
+          cb();
+        });
+
       file.parseFileForImport(contract, () => {
+        assert.strictEqual(downloadFileStub.callCount, 1);
+        assert.strictEqual(downloadFileStub.firstCall.args[0],
+          path.normalize('.embark/contracts/embark-framework/embark/master/test_app/app/contracts/ownable.sol'));
+        assert.strictEqual(downloadFileStub.firstCall.args[1],
+          'https://raw.githubusercontent.com/embark-framework/embark/develop/test_apps/test_app/app/contracts/./ownable.sol');
         done();
       });
     });

test/file.js

@@ -72,8 +72,8 @@
           1000
         ]
       },
-      "ERC725": {
-        "file": "https://github.com/status-im/contracts/blob/master/contracts/identity/ERC725.sol"
+      "Identity": {
+        "file": "https://github.com/status-im/contracts/blob/master/contracts/identity/Identity.sol"
       }
     },
     "afterDeploy": [

test_apps/test_app/config/contracts.json

@@ -3,16 +3,24 @@ const fs = require('fs-extra');
 const assert = require('assert');
 
 describe('http contracts', () => {
-  describe('ERC725', () => {
-    const contractPath = '.embark/contracts/ERC725.sol';
+  const contractPath = '.embark/contracts/status-im/contracts/master/contracts/identity/Identity.sol';
+  const contractImportPath = '.embark/contracts/status-im/contracts/master/contracts/identity/ERC725.sol';
 
-    it('should have downloaded the file in .embark/contracts', (done) => {
-      fs.access(contractPath, (err) => {
-        if (err) {
-          assert.fail(contractPath + ' was not downloaded');
-        }
-        done();
-      });
+  it('should have downloaded the file in .embark/contracts', (done) => {
+    fs.access(contractPath, (err) => {
+      if (err) {
+        assert.fail(contractPath + ' was not downloaded');
+      }
+      done();
+    });
+  });
+
+  it('should have downloaded the file import file too', (done) => {
+    fs.access(contractImportPath, (err) => {
+      if (err) {
+        assert.fail(contractPath + ' was not downloaded');
+      }
+      done();
     });
   });
 });