Merge pull request #6 from fabrix-app/v1.1

[chore] fix route order for now
fabrix-app · Jul 21, 2018 · f9b9f81 · f9b9f81
2 parents 1586efa + 8346485
commit f9b9f81
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/lib/server.ts b/lib/server.ts
@@ -244,7 +244,8 @@ export const Server = {
    */
   registerRoutes(app: FabrixApp, server: Express) {
     // Sort the routes so that they are always in the correct express order.
-    const routes = app.routes
+    // Could be related to https://github.com/fabrix-app/spool-router/issues/6
+    const routes = new Map([...app.routes].reverse())
     const express = app.config.get('web.express')
     const expressRouter = express.Router
     const router = expressRouter()

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/spool-express",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Spool Express - Binds the routes compiled in spool-router to a Express 4 Server.",
   "homepage": "https://fabrix.app",
   "author": "Fabrix-app Team <hello@fabrix.app>",

diff --git a/test/integration/controller.test.js b/test/integration/controller.test.js
@@ -94,7 +94,7 @@ describe('express controllers', () => {
         })
     })
     // TODO fix spool-router and come back to this
-    it.skip('should test order', (done) => {
+    it('should test order', (done) => {
       request
         .get('/test/earth')
         .query({ where: {hello: 'world'}})