Use config in test environment

bin/near

@@ -78,13 +78,7 @@ const newProject = {
   handler: (argv) => exitOnError(main.newProject(argv))
 };
 
-const configPath = process.cwd() + '/src/config';
-let config = {};
-try {
-  config = require(configPath)(process.env.NODE_ENV || 'development');
-} catch (e) {
-  console.log(`Didn't find config at ${configPath}\n`);
-}
+let config = require('../get-config')();
 yargs // eslint-disable-line
   .option('nodeUrl', {
     desc: 'NEAR node URL',

blank_project/package.json

@@ -9,8 +9,7 @@
     "deploy": "npm run build && npm run deploy:contract && npm run deploy:pages",
     "prestart": "npm run build && npm run deploy:contract",
     "start": "python3 -mhttp.server --directory src",
-    "test": "npm run build && jest test --env=near-shell/local_test_environment",
-    "test-on-devnet": "npm run build && jest test --env=near-shell/devnet_test_environment"
+    "test": "npm run build && jest test --env=near-shell/test_environment"
   },
   "devDependencies": {
     "assemblyscript": "github:nearprotocol/assemblyscript.git",

get-config.js

@@ -0,0 +1,10 @@
+
+module.exports = function getConfig() {
+    const configPath = process.cwd() + '/src/config';
+    try {
+        return require(configPath)(process.env.NODE_ENV || 'development');
+    } catch (e) {
+        console.log(`Didn't find config at ${configPath}\n`);
+        return {};
+    }
+}

test/new_project.sh

@@ -7,5 +7,4 @@ cd tmp-project
 npm install
 npm uninstall near-shell
 npm install ../
-npm run build
-npm run test-on-devnet
+NODE_ENV=development npm run test

local_test_environment.js → test_environment.js

@@ -13,26 +13,26 @@ class LocalTestEnvironment extends NodeEnvironment {
         this.global.nearlib = require('nearlib');
         this.global.nearlib.dev = require('nearlib/dev');
         this.global.window = {};
-        this.global.testSettings = {
+        let config = require('./get-config')();
+        this.global.testSettings = config;
+        config = Object.assign(config, {
             contractName: "test" + Date.now(),
-            accountId: "test" + Date.now(),
-            nodeUrl: "http://localhost:3030",
-            deps: {
-                storage:  this.createFakeStorage(),
-                keyStore: new nearlib.InMemoryKeyStore(),
-                createAccount: dev.createAccountWithLocalNodeConnection
-            }
-        };
-        const near = await dev.connect(this.global.testSettings);
+            accountId: "test" + Date.now()
+        });
+        config.deps = Object.assign(config.deps || {}, {
+            storage:  this.createFakeStorage(),
+            keyStore: new nearlib.InMemoryKeyStore(),
+        });
+        const near = await dev.connect(config);
 
         const keyWithRandomSeed = await nearlib.KeyPair.fromRandomSeed();
-        await dev.createAccountWithLocalNodeConnection(this.global.testSettings.contractName, keyWithRandomSeed.getPublicKey());
-        this.global.testSettings.deps.keyStore.setKey(this.global.testSettings.contractName, keyWithRandomSeed);
+        await config.deps.createAccount(config.contractName, keyWithRandomSeed.getPublicKey());
+        config.deps.keyStore.setKey(config.contractName, keyWithRandomSeed);
 
         // deploy contract
         const data = [...fs.readFileSync('./out/main.wasm')];
         await near.waitForTransactionResult(
-            await near.deployContract(this.global.testSettings.contractName, data));
+            await near.deployContract(config.contractName, data));
 
         await super.setup();
     }