eggjs · gxcsoccer · Jul 30, 2016 · Jul 29, 2016 · Jul 30, 2016 · popomore
diff --git a/.eslintrc b/.eslintrc
@@ -1,11 +1,3 @@
 {
-  "extends": "eslint-config-egg",
-  "rules": {
-    "no-console": "off",
-    "no-magic-numbers": "off",
-    "generator-star-spacing": "off",
-    "prefer-template": "off",
-    "max-len": "off",
-    "dot-notation": "off"
-  }
+  "extends": "eslint-config-egg"
 }
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 /node_modules
 coverage
 .logs
-test
-npm-debug.log
+npm-debug.log
diff --git a/.travis.yml b/.travis.yml
@@ -8,4 +8,4 @@ install:
 script:
   - npm run ci
 after_script:
-  - npm i codecov && codecov
+  - npminstall codecov && codecov
diff --git a/appveyor.yml b/appveyor.yml
@@ -5,7 +5,7 @@ environment:
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - npm i npminstall && npminstall
+  - npm i npminstall && node_modules\.bin\npminstall
 
 test_script:
   - node --version

diff --git a/lib/base_loader.js b/lib/base_loader.js
@@ -8,9 +8,6 @@ const loading = require('loading');
 const interopRequire = require('interop-require');
 const debug = require('debug')('egg:loader');
 
-/**
- * Loader 基类
- */
 class EggLoader {
 
   /**
@@ -248,6 +245,8 @@ class EggLoader {
     const eggPath = this.eggPath;
     const frameworkPaths = [];
 
+    addEggPath(this.options.customEgg);
+
     // 遍历整个原型链，获取原型链上所有的 eggPath
     // 越核心的优先级越高
     let proto = this.app;

diff --git a/lib/plugin_loader.js b/lib/plugin_loader.js
@@ -224,16 +224,18 @@ module.exports = {
       }
     }
 
+    const logger = this.options.logger;
     if (!config) {
+      logger.warn(`[egg:loader] pkg.eggPlugin is missing in ${pluginPackage}`);
       return;
     }
 
     if (config.name && config.name !== plugin.name) {
-      // TODO: 兼容提示，1.1 改成必须配置 name
       // pluginName 为 config/plugin.js 配置的插件名
       // pluginConfigName 为 pkg.eggPath.name
-      this.options.logger.warn(`[egg:loader] pluginName(${plugin.name}) is different from pluginConfigName(${config.name})`);
+      logger.warn(`[egg:loader] pluginName(${plugin.name}) is different from pluginConfigName(${config.name})`);
     }
+
     for (const key of [ 'dep', 'env' ]) {
       if (!plugin[key].length && Array.isArray(config[key])) {
         plugin[key] = config[key];

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "egg-bin": "1",
     "egg-ci": "1",
-    "eslint": "3",
+    "eslint": "~3.1.0",
     "eslint-config-egg": "3",
     "koa": "1",
     "koa-router": "4",
@@ -48,4 +48,4 @@
     "is-type-of": "^1.0.0",
     "loading": "^1.12.0"
   }
-}
+}
diff --git a/test/egg_loader.test.js b/test/egg_loader.test.js
@@ -0,0 +1,118 @@
+'use strict';
+
+require('should');
+const path = require('path');
+const mm = require('mm');
+const utils = require('./utils');
+const BaseLoader = require('../index');
+
+describe('test/egg_loader.test.js', function() {
+
+  afterEach(mm.restore);
+
+  describe('.getServerEnv', function() {
+
+    it('should get from env EGG_SERVER_ENV', function() {
+      mm(process.env, 'EGG_SERVER_ENV', 'prod');
+      const app = utils.createApp('serverenv');
+      app.loader.serverEnv.should.equal('prod');
+    });
+
+    it('should use unittest when NODE_ENV = test', function() {
+      mm(process.env, 'NODE_ENV', 'test');
+      const app = utils.createApp('serverenv');
+      app.loader.serverEnv.should.equal('unittest');
+    });
+
+    it('should use default when NODE_ENV = production', function() {
+      mm(process.env, 'NODE_ENV', 'production');
+      const app = utils.createApp('serverenv');
+      app.loader.serverEnv.should.equal('default');
+    });
+
+    it('should use local when NODE_ENV is other', function() {
+      mm(process.env, 'NODE_ENV', 'development');
+      const app = utils.createApp('serverenv');
+      app.loader.serverEnv.should.equal('local');
+    });
+
+    it('should get from config/serverEnv', function() {
+      mm(process.env, 'NODE_ENV', 'production');
+      mm(process.env, 'EGG_SERVER_ENV', 'test');
+      const app = utils.createApp('serverenv-file');
+      app.loader.serverEnv.should.equal('prod');
+    });
+  });
+
+
+  describe('eggPaths', function() {
+
+    it('should get from paramter', function() {
+      const app = utils.createApp('eggpath');
+      app.loader.eggPath.should.equal(utils.getFilepath('egg'));
+    });
+
+    it('should get from framework', function() {
+      const Application = require('./fixtures/framework');
+      const app = new Application();
+      app.coreLogger = console;
+      app.loader = new utils.Loader('eggpath', { app });
+      app.loader.loadConfig();
+      app.loader.eggPaths.should.eql([
+        utils.getFilepath('egg'),
+        utils.getFilepath('framework/node_modules/framework2'),
+        utils.getFilepath('framework'),
+      ]);
+      return app;
+    });
+
+    it('should get from framework using symbol', function() {
+      const Application = require('./fixtures/framework-symbol');
+      const app = new Application();
+      app.coreLogger = console;
+      app.loader = new utils.Loader('eggpath', { app });
+      app.loader.loadConfig();
+      app.loader.eggPaths.should.eql([
+        utils.getFilepath('egg'),
+        utils.getFilepath('framework-symbol/node_modules/framework2'),
+        utils.getFilepath('framework-symbol'),
+      ]);
+      return app;
+    });
+
+    it('frameworkPaths should not container eggPath', function() {
+      const eggPath = path.join(__dirname, 'fixtures/egg');
+      const loader = new BaseLoader({
+        baseDir: path.join(__dirname, 'fixtures/eggpath'),
+        eggPath,
+        customEgg: eggPath,
+      });
+      loader.frameworkPaths.should.not.containEql(eggPath);
+    });
+  });
+
+
+  describe('loadDirs', function() {
+
+    it('should get plugin dir', function() {
+      const app = utils.createApp('plugin');
+      const dirs = app.loader.loadDirs();
+      dirs.length.should.eql(10);
+    });
+
+    it('should not get plugin dir', function() {
+      const loader = new utils.Loader('plugin');
+      const dirs = loader.loadDirs();
+      dirs.length.should.eql(2);
+    });
+  });
+
+
+  describe('loadFile', function() {
+    it('should throw with filepath when file syntax error', function() {
+      (function() {
+        utils.createApp('syntaxerror');
+      }).should.throw(/test\/fixtures\/syntaxerror\/app\.js error:/);
+    });
+  });
+});
diff --git a/test/fixtures/agent/app/agent.js b/test/fixtures/agent/app/agent.js
@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+  foo: 'agent bar',
+  bar: 'foo'
+};
diff --git a/test/fixtures/agent/app/context.js b/test/fixtures/agent/app/context.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = {};
diff --git a/test/fixtures/agent/config/plugin.js b/test/fixtures/agent/config/plugin.js
@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+  a: true,
+  b: true,
+};
diff --git a/test/fixtures/agent/node_modules/a/app/agent.js b/test/fixtures/agent/node_modules/a/app/agent.js
diff --git a/test/fixtures/agent/node_modules/a/package.json b/test/fixtures/agent/node_modules/a/package.json
diff --git a/test/fixtures/agent/node_modules/b/app/agent.js b/test/fixtures/agent/node_modules/b/app/agent.js
diff --git a/test/fixtures/agent/node_modules/b/package.json b/test/fixtures/agent/node_modules/b/package.json
diff --git a/test/fixtures/agent/package.json b/test/fixtures/agent/package.json
@@ -0,0 +1,3 @@
+{
+	"name": "application"
+}
diff --git a/test/fixtures/ali-plugin/config/plugin.js b/test/fixtures/ali-plugin/config/plugin.js
@@ -0,0 +1,13 @@
+const path = require('path');
+
+exports.foo = {
+  enable: true,
+  type: ['ali'],
+  path: path.join(__dirname, '../../../plugins/test-me')
+};
+
+exports.fooalipay = {
+  enable: true,
+  type: ['alipay'],
+  path: path.join(__dirname, '../../../plugins/test-me2')
+};
diff --git a/test/fixtures/ali-plugin/package.json b/test/fixtures/ali-plugin/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "ali-plugin",
+  "chair": {
+    "type": "ali"
+  }
+}
diff --git a/test/fixtures/application/app/application.js b/test/fixtures/application/app/application.js
@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+  foo: 'app bar',
+  bar: 'foo'
+};
diff --git a/test/fixtures/application/app/context.js b/test/fixtures/application/app/context.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = {};
diff --git a/test/fixtures/application/config/plugin.js b/test/fixtures/application/config/plugin.js
@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+  a: true,
+  b: true,
+};
diff --git a/test/fixtures/application/node_modules/a/app/application.js b/test/fixtures/application/node_modules/a/app/application.js
diff --git a/test/fixtures/application/node_modules/b/app/application.js b/test/fixtures/application/node_modules/b/app/application.js
diff --git a/test/fixtures/application/package.json b/test/fixtures/application/package.json
@@ -0,0 +1,3 @@
+{
+	"name": "application"
+}
diff --git a/test/fixtures/config-env/config/config.default.js b/test/fixtures/config-env/config/config.default.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  egg: 'config-default',
+};
diff --git a/test/fixtures/config-env/package.json b/test/fixtures/config-env/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "config-env"
+}
diff --git a/test/fixtures/config/app/controller/foo.js b/test/fixtures/config/app/controller/foo.js
@@ -0,0 +1,11 @@
+'use strict';
+
+var util = require('./util/a');
+module.exports = function() {
+  return {
+    a: function*() {
+      util.b();
+      this.body = 'hello';
+    }
+  };
+};
diff --git a/test/fixtures/config/app/controller/util/a.js b/test/fixtures/config/app/controller/util/a.js
@@ -0,0 +1,5 @@
+module.exports = {
+  a: 1,
+  b: function() {
+  }
+};
diff --git a/test/fixtures/config/app/services/foo.js b/test/fixtures/config/app/services/foo.js
@@ -0,0 +1,10 @@
+'use strict';
+var util = require('./util/bar');
+
+module.exports = function() {
+  return {
+    bar: function*(ctx) {
+      console.log(ctx);
+    }
+  };
+};
diff --git a/test/fixtures/config/app/services/util/bar.js b/test/fixtures/config/app/services/util/bar.js
@@ -0,0 +1 @@
+exports.a = 1;
diff --git a/test/fixtures/config/config/config.js b/test/fixtures/config/config/config.js
@@ -0,0 +1,14 @@
+'use strict';
+
+exports.loader = {
+  service: { ignore: 'util/**' },
+  controller: { ignore: 'util/**' }
+};
+
+exports.name = 'config-test';
+
+exports.test = 1;
+
+exports.urllib = {
+  keepAlive: false
+};
diff --git a/test/fixtures/config/package.json b/test/fixtures/config/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "loader_config"
+}
diff --git a/test/fixtures/custom-app/app/router.js b/test/fixtures/custom-app/app/router.js
@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = function(app) {
+  app.get('/', function*() {
+    this.body = {
+      customFoo: app.customFoo,
+      env: app.config.env,
+      eggPaths: app.loader.eggPaths,
+      frameworkPaths: app.loader.frameworkPaths,
+      eggPath: app.loader.eggPath,
+    };
+  });
+};