feat: update to support loopback 3.x

Tom Kirkpatrick · Tom Kirkpatrick · commit e0c926adddcd · 2017-07-13T18:34:01.000+02:00
diff --git a/package.json b/package.json
@@ -38,7 +38,6 @@
     "lodash": "^4.17.4"
   },
   "peerDependencies": {
-    "loopback": "^2.25.0",
     "loopback-context": "^3.1.0",
     "cls-hooked": "^4.1.5"
   },
@@ -51,7 +50,7 @@
     "dirty-chai": "2.0.1",
     "eslint": "^4.1.0",
     "eslint-config-fullcube": "^3.0.0",
-    "loopback": "^2.25.0",
+    "loopback": "^3.4.0",
     "loopback-boot": "^2.24.0",
     "loopback-component-explorer": "2.3.0",
     "loopback-context": "^3.1.0",
diff --git a/test/fixtures/simple-app/common/models/access-token.json b/test/fixtures/simple-app/common/models/access-token.json
@@ -0,0 +1,12 @@
+{
+  "name": "accessToken",
+  "plural": "accessTokens",
+  "base": "AccessToken",
+  "relations": {
+    "user": {
+      "type": "belongsTo",
+      "model": "user",
+      "foreignKey": "userId"
+    }
+  }
+}
diff --git a/test/fixtures/simple-app/common/models/invoice.js b/test/fixtures/simple-app/common/models/invoice.js
diff --git a/test/fixtures/simple-app/common/models/invoice.json b/test/fixtures/simple-app/common/models/invoice.json
@@ -1,9 +1,11 @@
 {
   "name": "Invoice",
   "base": "PersistedModel",
-  "idInjection": true,
   "options": {
-    "validateUpsert": true
+    "idInjection": true,
+    "validateUpsert": true,
+    "forceId": false,
+    "replaceOnPUT": false
   },
   "properties": {
     "storeId": {
@@ -59,14 +61,7 @@
       "principalType": "ROLE",
       "principalId": "$group:manager",
       "permission": "ALLOW",
-      "property": "updateAttributes"
-    },
-    {
-      "accessType": "WRITE",
-      "principalType": "ROLE",
-      "principalId": "$group:manager",
-      "permission": "ALLOW",
-      "property": "upsert"
+      "property": ["patchOrCreate", "replaceOrCreate", "replaceById", "updateOrCreate", "updateAttributes", "patchAttributes"]
     },
     {
       "accessType": "*",
diff --git a/test/fixtures/simple-app/common/models/store.js b/test/fixtures/simple-app/common/models/store.js
diff --git a/test/fixtures/simple-app/common/models/store.json b/test/fixtures/simple-app/common/models/store.json
@@ -1,9 +1,11 @@
 {
   "name": "Store",
   "base": "PersistedModel",
-  "idInjection": true,
   "options": {
-    "validateUpsert": true
+    "idInjection": true,
+    "validateUpsert": true,
+    "forceId": false,
+    "replaceOnPUT": false
   },
   "properties": {
     "id": {
diff --git a/test/fixtures/simple-app/common/models/team.js b/test/fixtures/simple-app/common/models/team.js
diff --git a/test/fixtures/simple-app/common/models/team.json b/test/fixtures/simple-app/common/models/team.json
@@ -1,9 +1,11 @@
 {
   "name": "Team",
   "base": "PersistedModel",
-  "idInjection": true,
   "options": {
-    "validateUpsert": true
+    "idInjection": true,
+    "validateUpsert": true,
+    "forceId": false,
+    "replaceOnPUT": false
   },
   "properties": {
     "storeId": {
diff --git a/test/fixtures/simple-app/common/models/transaction.js b/test/fixtures/simple-app/common/models/transaction.js
diff --git a/test/fixtures/simple-app/common/models/transaction.json b/test/fixtures/simple-app/common/models/transaction.json
@@ -1,9 +1,11 @@
 {
   "name": "Transaction",
   "base": "PersistedModel",
-  "idInjection": true,
   "options": {
-    "validateUpsert": true
+    "idInjection": true,
+    "validateUpsert": true,
+    "forceId": false,
+    "replaceOnPUT": false
   },
   "properties": {
     "storeId": {
diff --git a/test/fixtures/simple-app/common/models/user.js b/test/fixtures/simple-app/common/models/user.js
@@ -4,5 +4,5 @@ module.exports = function userCustomizer(user) {
   user.currentUser = function(cb) {
     return process.nextTick(() => cb(null, user.getCurrentUser()))
   }
-  return user
+
 }
diff --git a/test/fixtures/simple-app/common/models/user.json b/test/fixtures/simple-app/common/models/user.json
@@ -1,10 +1,12 @@
 {
   "name": "user",
   "base": "User",
-  "idInjection": true,
   "options": {
+    "idInjection": true,
     "validateUpsert": true,
-    "saltWorkFactor": 1
+    "forceId": false,
+    "saltWorkFactor": 1,
+    "replaceOnPUT": false
   },
   "mixins": {
     "GetCurrentUser": true
@@ -18,6 +20,14 @@
   },
   "validations": [],
   "relations": {
+    "accessTokens": {
+      "type": "hasMany",
+      "model": "accessToken",
+      "foreignKey": "userId",
+      "options": {
+        "disableInclude": true
+      }
+    },
     "stores": {
       "type": "hasMany",
       "model": "Store",
@@ -55,7 +65,6 @@
   "methods": {
     "currentUser": {
       "description": "Get the current user.",
-      "isStatic": true,
       "http": {
         "path": "/currentUser",
         "verb": "get"
diff --git a/test/fixtures/simple-app/server/config.json b/test/fixtures/simple-app/server/config.json
@@ -16,10 +16,7 @@
       "extended": true,
       "limit": "100kb"
     },
-    "cors": false,
-    "errorHandler": {
-      "disableStackTrace": false
-    }
+    "cors": false
   },
   "legacyExplorer": false,
   "logoutSessionsOnSensitiveChanges": true
diff --git a/test/fixtures/simple-app/server/middleware.development.json b/test/fixtures/simple-app/server/middleware.development.json
@@ -0,0 +1,10 @@
+{
+  "final:after": {
+    "strong-error-handler": {
+      "params": {
+        "debug": true,
+        "log": true
+      }
+    }
+  }
+}
diff --git a/test/fixtures/simple-app/server/middleware.json b/test/fixtures/simple-app/server/middleware.json
@@ -1,4 +1,11 @@
 {
+  "initial:before": {
+    "loopback#token": {
+      "params": {
+        "model": "accessToken"
+      }
+    }
+  },
   "initial": {
     "loopback-context#per-request": {
       "params": {
@@ -7,9 +14,7 @@
     }
   },
   "session": {},
-  "auth": {
-    "loopback#token": {}
-  },
+  "auth": {},
   "parse": {},
   "routes": {
     "loopback#rest": {
@@ -23,6 +28,6 @@
     "loopback#urlNotFound": {}
   },
   "final:after": {
-    "loopback#errorHandler": {}
+    "strong-error-handler": {}
   }
 }
diff --git a/test/fixtures/simple-app/server/model-config.json b/test/fixtures/simple-app/server/model-config.json
@@ -14,23 +14,25 @@
       "../../../../lib/mixins"
     ]
   },
-  "AccessToken": {
+
+  "accessToken": {
     "dataSource": "db",
     "public": true
   },
-  "ACL": {
+  "user": {
     "dataSource": "db",
     "public": true
   },
-  "RoleMapping": {
+
+  "ACL": {
     "dataSource": "db",
     "public": true
   },
-  "Role": {
+  "RoleMapping": {
     "dataSource": "db",
     "public": true
   },
-  "user": {
+  "Role": {
     "dataSource": "db",
     "public": true
   },
diff --git a/test/fixtures/simple-app/server/server.js b/test/fixtures/simple-app/server/server.js
@@ -6,8 +6,6 @@ const loopback = require('loopback')
 const boot = require('loopback-boot')
 const app = loopback()
 
-global.Promise = require('bluebird')
-
 app.start = function() {
   // start the web server
   return app.listen(function() {
diff --git a/test/mixin-test.js b/test/mixin-test.js
@@ -21,6 +21,19 @@ function json(verb, url, data) {
     .expect('Content-Type', /json/)
 }
 
+/**
+ * Initialise the application for the test suite.
+ */
+before(done => {
+  function finishBoot() {
+    return done()
+  }
+  if (app.booting) {
+    return app.once('booted', finishBoot)
+  }
+  return finishBoot()
+})
+
 describe('Current User Mixin.', function() {
   describe('Smoke test', function() {
     it('should add a getCurrentUser model method', function() {
