From ec9307c9912ad7be204d38f107ed588ac4b7a927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Medeiros?= <me@andremedeiros.info>
Date: Tue, 30 Oct 2018 17:25:57 +0100
Subject: [PATCH] fix fs layer (#1004)

---
 lib/core/fs.js | 10 +++++-----
 test/fs.js     | 12 ++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/core/fs.js b/lib/core/fs.js
index 0bad3cbe7..8311a363f 100644
--- a/lib/core/fs.js
+++ b/lib/core/fs.js
@@ -5,6 +5,11 @@ let fs = require('fs-extra');
 let utils = require('../utils/utils.js');
 require('colors');
 
+// set PWD to process.cwd() since Windows doesn't have a value for PWD
+if (!process.env.PWD) {
+  process.env.PWD = process.cwd();
+}
+
 // set the anchor for embark's fs.dappPath()
 if (!process.env.DAPP_PATH) {
   process.env.DAPP_PATH = process.env.PWD;
@@ -20,11 +25,6 @@ if (!process.env.PKG_PATH) {
   process.env.PKG_PATH = process.env.PWD;
 }
 
-// set PWD to process.cwd() since Windows doesn't have a value for PWD
-if (!process.env.PWD) {
-  process.env.PWD = process.cwd();
-}
-
 const pathConfigs = {
   DAPP_PATH: process.env.DAPP_PATH,
   EMBARK_PATH: process.env.EMBARK_PATH,
diff --git a/test/fs.js b/test/fs.js
index e38d8105c..bd4f143c2 100644
--- a/test/fs.js
+++ b/test/fs.js
@@ -2,17 +2,29 @@
 const {assert} = require('chai');
 const os = require('os');
 
+const underlyingFs = require('fs-extra');
 const fs = require('../lib/core/fs');
 
 describe('fs', () => {
+  let fsMethods = {};
+
   before(() => {
     this.oldProcessExit = process.exit;
     process.exit = function() {};
+
+    for(const method in underlyingFs) {
+      fsMethods[method] = underlyingFs[method];
+      underlyingFs[method] = function() {};
+    }
   });
 
 
   after(() => {
     process.exit = this.oldProcessExit;
+
+    for(const method in underlyingFs) {
+      underlyingFs[method] = fsMethods[method];
+    }
   });
 
   const helperFunctions = [