From 90fda8ab80c85105e291d16b0634e4b7b5500207 Mon Sep 17 00:00:00 2001
From: David Cheung <davidcheung@ca.ibm.com>
Date: Wed, 14 Sep 2016 16:02:34 -0400
Subject: [PATCH] refactor: stop config caching
---
test/compiler.test.js | 34 ++++++++++++++++++++++++++++++++++
test/config-loader.test.js | 37 -------------------------------------
2 files changed, 34 insertions(+), 37 deletions(-)
delete mode 100644 test/config-loader.test.js
diff --git a/test/compiler.test.js b/test/compiler.test.js
index 41c4834..85d9a04 100644
--- a/test/compiler.test.js
+++ b/test/compiler.test.js
@@ -509,6 +509,40 @@ describe('compiler', function() {
});
});
+ it('does not cache loaded values', function(done) {
+ appdir.createConfigFilesSync();
+ appdir.writeConfigFileSync('middleware.json', {
+ 'strong-error-handler': { params: { debug: false }},
+ });
+ appdir.writeConfigFileSync('middleware.development.json', {
+ 'strong-error-handler': { params: { debug: true }},
+ });
+
+ // Here we load main config and merge it with DEV overrides
+ var bootOptions = {
+ appRootDir: appdir.PATH,
+ env: 'development',
+ phases: ['load'],
+ };
+ var productionBootOptions = {
+ appRootDir: appdir.PATH,
+ env: 'production',
+ phases: ['load'],
+ };
+ boot.compile(bootOptions, function(err, context) {
+ var config = context.configurations.middleware;
+ expect(config['strong-error-handler'].params.debug,
+ 'debug in development').to.equal(true);
+
+ boot.compile(productionBootOptions, function(err, context2) {
+ var config = context2.configurations.middleware;
+ expect(config['strong-error-handler'].params.debug,
+ 'debug in production').to.equal(false);
+ done();
+ });
+ });
+ });
+
it('allows env specific model-config json', function(done) {
appdir.createConfigFilesSync();
appdir.writeConfigFileSync('model-config.local.json', {
diff --git a/test/config-loader.test.js b/test/config-loader.test.js
deleted file mode 100644
index 2faade0..0000000
--- a/test/config-loader.test.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright IBM Corp. 2014,2016. All Rights Reserved.
-// Node module: loopback-boot
-// This file is licensed under the MIT License.
-// License text available at https://opensource.org/licenses/MIT
-
-var configLoader = require('../lib/config-loader');
-var fs = require('fs-extra');
-var path = require('path');
-var expect = require('chai').expect;
-var sandbox = require('./helpers/sandbox');
-var appdir = require('./helpers/appdir');
-
-describe('config-loader', function() {
- beforeEach(sandbox.reset);
- beforeEach(appdir.init);
-
- it('does not cache loaded values', function() {
- appdir.createConfigFilesSync();
- appdir.writeConfigFileSync('middleware.json', {
- 'strong-error-handler': { params: { debug: false }},
- });
- appdir.writeConfigFileSync('middleware.development.json', {
- 'strong-error-handler': { params: { debug: true }},
- });
-
- // Here we load main config and merge it with DEV overrides
- var config = configLoader.loadMiddleware(appdir.PATH, 'development');
- expect(config['strong-error-handler'].params.debug, 'debug in development')
- .to.equal(true);
-
- // When we load the config file again in different environment,
- // only the main file is loaded and no overrides are applied.
- config = configLoader.loadMiddleware(appdir.PATH, 'production');
- expect(config['strong-error-handler'].params.debug, 'debug in production')
- .to.equal(false);
- });
-});