Merge pull request #3976 from ember-cli/relative-require

Relative require
ember-cli · Apr 29, 2015 · a95ea24 · a95ea24
2 parents d3f084a + d75b389
commit a95ea24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/models/project.js b/lib/models/project.js
@@ -282,7 +282,8 @@ Project.prototype.bowerDependencies = function(bower) {
 */
 Project.prototype.supportedInternalAddonPaths = function(){
   if (!this.root) { return []; }
-  var internalMiddlewarePath = path.join(this.root, path.relative(this.root, path.join(__dirname, '../tasks/server/middleware')));
+
+  var internalMiddlewarePath = path.join(__dirname, '../tasks/server/middleware');
 
   return [
     path.join(internalMiddlewarePath, 'tests-server'),
@@ -324,6 +325,7 @@ Project.prototype.initializeAddons = function() {
   debug('initializeAddons for: %s', this.name());
 
   this.discoverAddons();
+
   this.addons = this.addonsFactory.initializeAddons(this.addonPackages);
 
   this.addons.forEach(function(addon) {

diff --git a/tests/unit/tasks/server/express-server-test.js b/tests/unit/tasks/server/express-server-test.js
@@ -83,6 +83,8 @@ describe('express-server', function() {
   });
 
   describe('output', function() {
+    this.timeout(40000);
+
     it('with proxy', function() {
       return subject.start({
         proxy: 'http://localhost:3001/',