Merge pull request #833 from embark-framework/bug_fix/http-inception

Fix contracts with http import inceptions

lib/core/file.js

@@ -12,6 +12,7 @@ class File {
     this.path = options.path;
     this.basedir = options.basedir;
     this.resolver = options.resolver;
+    this.downloadedImports = false;
   }
 
   parseFileForImport(content, isHttpContract, callback) {
@@ -52,12 +53,12 @@ class File {
       // We already parsed this file
       return callback(null, newContent);
     }
-    self.downloadedImports = true;
     async.each(filesToDownload, ((fileObj, eachCb) => {
       self.downloadFile(fileObj.fileRelativePath, fileObj.url, (_content) => {
         eachCb();
       });
     }), (err) => {
+      self.downloadedImports = true;
       callback(err, newContent);
     });
   }
@@ -98,7 +99,7 @@ class File {
         fs.readFile(filename, next);
       },
       function parseForImports(content, next) {
-        self.parseFileForImport(content, true, (err) => {
+        self.parseFileForImport(content.toString(), true, (err) => {
           next(err, content);
         });
       }

test/config.js

@@ -78,14 +78,16 @@ describe('embark.Config', function () {
           "type": "http",
           "path": "https://raw.githubusercontent.com/embark-framework/embark/master/test_app/app/contracts/simple_storage.sol",
           "basedir": "",
-          "resolver": undefined
+          "resolver": undefined,
+          "downloadedImports": false
         },
         {
           "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": "",
-          "resolver": undefined
+          "resolver": undefined,
+          "downloadedImports": false
         }
       ];
       config.loadExternalContractsFiles();