From 3c7cfcaca8e5886ee9550290edb65b9d02cc6a91 Mon Sep 17 00:00:00 2001
From: Raymond Feng <raymond@strongloop.com>
Date: Thu, 29 May 2014 10:18:14 -0700
Subject: [PATCH] Clean up the tests

---
 test/app.test.js                    | 98 -----------------------------
 test/fixtures/access-control/app.js |  3 -
 2 files changed, 101 deletions(-)

diff --git a/test/app.test.js b/test/app.test.js
index 915e7d24..01ad8022 100644
--- a/test/app.test.js
+++ b/test/app.test.js
@@ -327,104 +327,6 @@ describe('app', function() {
     });
   });
 
-  /*
-  describe('installMiddleware()', function() {
-    var app;
-    beforeEach(function() { app = loopback(); });
-
-    it('installs loopback.token', function(done) {
-      app.models.accessToken = loopback.AccessToken;
-
-      app.installMiddleware();
-
-      app.get('/', function(req, res) {
-        res.send({ accessTokenId: req.accessToken && req.accessToken.id });
-      });
-
-      app.models.accessToken.create({}, function(err, token) {
-        if (err) done(err);
-        request(app).get('/')
-          .set('Authorization', token.id)
-          .expect(200, { accessTokenId: token.id })
-          .end(done);
-      });
-    });
-
-    it('emits "middleware:preprocessors" before handlers are installed',
-      function(done) {
-        app.on('middleware:preprocessors', function() {
-          this.use(function(req, res, next) {
-            req.preprocessed = true;
-            next();
-          });
-        });
-
-        app.installMiddleware();
-
-        app.get('/', function(req, res) {
-          res.send({ preprocessed: req.preprocessed });
-        });
-
-        request(app).get('/')
-          .expect(200, { preprocessed: true})
-          .end(done);
-      }
-    );
-
-    it('emits "middleware:handlers before installing express router',
-      function(done) {
-        app.on('middleware:handlers', function() {
-          this.use(function(req, res, next) {
-            res.send({ handler: 'middleware' });
-          });
-        });
-
-        app.installMiddleware();
-
-        app.get('/', function(req, res) {
-          res.send({ handler: 'router' });
-        });
-
-        request(app).get('/')
-          .expect(200, { handler: 'middleware' })
-          .end(done);
-      }
-    );
-
-    it('emits "middleware:error-handlers" after all request handlers',
-      function(done) {
-        var logs = [];
-        app.on('middleware:error-handlers', function() {
-          app.use(function(err, req, res, next) {
-            logs.push(req.url);
-            next(err);
-          });
-        });
-
-        app.installMiddleware();
-
-        request(app).get('/not-found')
-          .expect(404)
-          .end(function(err, res) {
-            if (err) done(err);
-            expect(logs).to.eql(['/not-found']);
-            done();
-          });
-      }
-    );
-
-    it('installs REST transport', function(done) {
-      app.model(loopback.Application);
-      app.set('restApiRoot', '/api');
-      app.installMiddleware();
-
-      request(app).get('/api/applications')
-        .expect(200, [])
-        .end(done);
-    });
-  });
-  */
-
   describe('listen()', function() {
     it('starts http server', function(done) {
       var app = loopback();
diff --git a/test/fixtures/access-control/app.js b/test/fixtures/access-control/app.js
index 47ce2dc3..fb01c3da 100644
--- a/test/fixtures/access-control/app.js
+++ b/test/fixtures/access-control/app.js
@@ -9,9 +9,6 @@ app.use(loopback.cookieParser('secret'));
 app.use(loopback.token({model: app.models.accessToken}));
 app.use(apiPath, loopback.rest());
 
-if(loopback.isExpress3) {
-  app.use(app.router);
-}
 app.use(loopback.urlNotFound());
 app.use(loopback.errorHandler());
 app.enableAuth();