Merge pull request #94 from shmargum/add-tests

Add tests

Author: swyxio

.gitignore

@@ -1 +1,2 @@
 node_modules/
+*.swp

lib/build.js

@@ -31,7 +31,7 @@ function haveBabelrc(functionsDir) {
 
 function webpackConfig(dir, additionalConfig) {
   var config = conf.load();
-  var envConfig = config.build.environment || config.build.Environment || {};
+  var envConfig = conf.loadContext(config).environment;
   var babelOpts = { cacheDirectory: true };
   if (!haveBabelrc(dir)) {
     babelOpts.presets = [

lib/config.js

@@ -13,3 +13,30 @@ exports.load = function() {
 
   return toml.parse(fs.readFileSync(configPath));
 };
+
+exports.loadContext = function(config) {
+  var buildConfig = config.build;
+  var contextConfig = (
+    process.env.CONTEXT &&
+    config.context &&
+    config.context[process.env.CONTEXT]
+  ) || {};
+  var branchConfig = (
+    process.env.BRANCH &&
+    config.context &&
+    config.context[process.env.BRANCH]
+  ) || {};
+  var buildEnv = buildConfig.environment || buildConfig.Environment || {};
+  var contextEnv = contextConfig.environment || contextConfig.Environment || {};
+  var branchEnv = branchConfig.environment || branchConfig.Environment || {};
+  return {
+    ...buildConfig,
+    ...contextConfig,
+    ...branchConfig,
+    environment: {
+      ...buildEnv,
+      ...contextEnv,
+      ...branchEnv,
+    }
+  };
+};

lib/config.spec.js

@@ -0,0 +1,41 @@
+var conf = require('./config');
+
+beforeAll(function() {
+  process.env.CONTEXT = 'branch-deploy';
+  process.env.BRANCH = 'foo-branch';
+});
+
+describe('loadContext', function() {
+  it('should merge in context config', function() {
+    var config = {
+      build: {
+        publish: '/default',
+        environment: {
+          SOME_VAR: true,
+        },
+      },
+      context: {
+        'branch-deploy': {
+          publish: '/branch-deploy',
+          environment: {
+            SOME_VAR: false,
+          },
+        },
+        'foo-branch': {
+          publish: '/foo-branch',
+          environment: {
+            SOME_OTHER_VAR: 10,
+          },
+        },
+      },
+    };
+    var contextConfig = conf.loadContext(config);
+    expect(contextConfig).toEqual({
+      publish: '/foo-branch',
+      environment: {
+        SOME_VAR: false,
+        SOME_OTHER_VAR: 10,
+      },
+    });
+  });
+});

package.json

@@ -8,7 +8,7 @@
     "netlify-lambda": "bin/cmd.js"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest"
   },
   "author": "Mathias Biilmann Christensen",
   "license": "MIT",
@@ -34,5 +34,8 @@
     "toml": "^2.3.3",
     "webpack": "^4.17.1",
     "webpack-merge": "^4.1.4"
+  },
+  "devDependencies": {
+    "jest": "^23.6.0"
   }
 }