diff --git a/package.json b/package.json index 348b8e1ff..c02cb393e 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ "dapp-forwarder": "concurrently -k -n forwarder,dapp -p '[{time}][{name}]' 'yarn forwarder' 'yarn dapp'", "watch:test:unit": "nodemon --exec \"yarn test:unit\" ./test ./app ./ui", "sendwithprivatedapp": "node development/static-server.js test/e2e/send-eth-with-private-key-test --port 8080", - "test:unit": "cross-env METAMASK_ENV=test mocha --exit --require test/setup.js --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\"", - "test:unit:global": "cross-env METAMASK_ENV=test mocha --exit --require test/setup.js --recursive mocha test/unit-global/*", - "test:single": "cross-env METAMASK_ENV=test mocha --require test/helper.js", + "test:unit": "mocha --exit --require test/env.js --require test/setup.js --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\"", + "test:unit:global": "mocha --exit --require test/env.js --require test/setup.js --recursive mocha test/unit-global/*", + "test:single": "mocha --require test/env.js --require test/helper.js", "test:integration": "yarn test:integration:build && yarn test:flat", "test:integration:build": "gulp build:scss", "test:e2e:chrome": "SELENIUM_BROWSER=chrome test/e2e/run-all.sh", @@ -44,7 +44,7 @@ "verify-locales": "node ./development/verify-locale-strings.js", "verify-locales:fix": "node ./development/verify-locale-strings.js --fix", "mozilla-lint": "addons-linter dist/firefox", - "watch": "cross-env METAMASK_ENV=test mocha --watch --require test/setup.js --reporter min --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\"", + "watch": "mocha --watch --require test/env.js --require test/setup.js --reporter min --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\"", "devtools:react": "react-devtools", "devtools:redux": "remotedev --hostname=localhost --port=8000", "start:dev": "concurrently -k -n build,react,redux yarn:start yarn:devtools:react yarn:devtools:redux", @@ -199,7 +199,6 @@ "chromedriver": "^79.0.0", "concurrently": "^4.1.1", "coveralls": "^3.0.0", - "cross-env": "^5.1.4", "css-loader": "^2.1.1", "del": "^3.0.0", "deps-dump": "^1.1.0", diff --git a/test/env.js b/test/env.js new file mode 100644 index 000000000..1fbdad3df --- /dev/null +++ b/test/env.js @@ -0,0 +1 @@ +process.env.METAMASK_ENV = 'test' diff --git a/yarn.lock b/yarn.lock index a8aae95ca..232efa3f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7870,14 +7870,6 @@ create-react-context@^0.2.1: fbjs "^0.8.0" gud "^1.0.0" -cross-env@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.4.tgz#f61c14291f7cc653bb86457002ea80a04699d022" - integrity sha512-Mx8mw6JWhfpYoEk7PGvHxJMLQwQHORAs8+2bX+C1lGQ4h3GkDb1zbzC2Nw85YH9ZQMlO0BHZxMacgrfPmMFxbg== - dependencies: - cross-spawn "^5.1.0" - is-windows "^1.0.0" - cross-fetch@2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.2.tgz#a47ff4f7fc712daba8f6a695a11c948440d45723" @@ -16000,7 +15992,7 @@ is-windows@^0.2.0: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" integrity sha1-3hqm1j6indJIc3tp8f+LgALSEIw= -is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2: +is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==