Merge branch 'master' into pre-release-tidy

app/app/services/audit.js

@@ -32,8 +32,6 @@ export default Ember.Service.extend({
             this.start();
         }
 
-		console.log();
-
         Intercom('trackEvent', id); //jshint ignore: line
         Intercom('update'); //jshint ignore: line
     },

app/bower.json

@@ -9,13 +9,14 @@
     "loader.js": "^3.5.0",
     "qunit": "~1.20.0",
     "install": "~1.0.4",
-    "pretender": "~0.10.1",
+    "pretender": "~1.1.0",
     "lodash": "~3.7.0",
-    "Faker": "~3.0.0"
+    "Faker": "~3.1.0"
   },
   "resolutions": {
     "jquery": ">=2.1.1",
-    "ember": "v2.5.1"
+    "ember": "v2.5.1",
+    "FakeXMLHttpRequest": "^1.4.0"
   },
   "version": "0.0.1"
 }

app/mirage/config.js

@@ -5,11 +5,11 @@ export default function() {
     this.namespace = 'api'; // make this `api`, for example, if your API is namespaced
     // this.timing = 400;      // delay for each request, automatically set to 0 during testing
 
-    this.get('/public/meta', function(db) {
-        return db.meta[0];
+    this.get('/public/meta', function(schema) {
+        return schema.db.meta[0];
     });
 
-    this.get('/public/validate', function(db, request) {
+    this.get('/public/validate', function(schema, request) {
         let serverToken = request.queryParams.token;
         let token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkb21haW4iOiIiLCJleHAiOjE0NjQwMjM2NjcsImlzcyI6IkRvY3VtaXplIiwib3JnIjoiVnpNdXlFd18zV3FpYWZjRCIsInN1YiI6IndlYmFwcCIsInVzZXIiOiJWek11eUV3XzNXcWlhZmNFIn0.NXZ6bo8mtvdZF_b9HavbidVUJqhmBA1zr0fSAPvbah0";
 
@@ -55,7 +55,7 @@ export default function() {
         return [];
     });
 
-    this.get('/documents', function(db, request) {
+    this.get('/documents', function(schema, request) {
         let folder_id = request.queryParams.folder;
 
         if (folder_id = "VzMuyEw_3WqiafcG") {
@@ -101,11 +101,11 @@ export default function() {
         }
     });
 
-    this.get('/folders', function(db) {
-        return db.folders;
+    this.get('/folders', function(schema) {
+        return schema.db.folders;
     });
 
-    this.post('/folders', function(db, request) {
+    this.post('/folders', function(schema, request) {
         var name = JSON.parse(request.requestBody).name;
         let newFolder = {
             "id":"V0Vy5Uw_3QeDAMW9",
@@ -117,8 +117,7 @@ export default function() {
             "folderType":2
         };
 
-        let folder = db.folders.insert(newFolder);
-        console.log(newFolder);
+        let folder = schema.db.folders.insert(newFolder);
         return folder;
     });
 
@@ -153,8 +152,8 @@ export default function() {
         };
     });
 
-    this.get('/users/VzMuyEw_3WqiafcE/permissions', (db) => {
-        return db.permissions;
+    this.get('/users/VzMuyEw_3WqiafcE/permissions', (schema) => {
+        return schema.db.permissions;
     });
 
     this.get('/folders/VzMuyEw_3WqiafcG/permissions', () => {
@@ -203,11 +202,10 @@ export default function() {
         ];
     });
 
-    this.put('/folders/:id', (db, request) => {
+    this.put('/folders/:id', (schema, request) => {
         let id = request.params.id;
         let attrs = JSON.parse(request.requestBody);
-        let folder = db.folders.update(id, attrs);
-        console.log(folder);
+        let folder = schema.db.folders.update(id, attrs);
         return folder;
     });
 
@@ -223,9 +221,9 @@ export default function() {
         };
     });
 
-    this.get('folders/:id', (db, request) => {
+    this.get('folders/:id', (schema, request) => {
         let id = request.params.id;
-        return db.folders.find(id);
+        return schema.db.folders.find(id);
     });
 
     this.get('/organizations/VzMuyEw_3WqiafcD', () => {
@@ -242,7 +240,7 @@ export default function() {
         };
     });
 
-    this.put('/organizations/VzMuyEw_3WqiafcD', (db, request) => {
+    this.put('/organizations/VzMuyEw_3WqiafcD', (schema, request) => {
         let title = JSON.parse(request.requestBody).title;
         let message = JSON.parse(request.requestBody).title;
         let allowAnonymousAccess = JSON.parse(request.requestBody).allowAnonymousAccess;
@@ -312,7 +310,7 @@ export default function() {
         }];
     });
 
-    this.post('/users', (db, request) => {
+    this.post('/users', (schema, request) => {
         let firstname = JSON.parse(request.requestBody).firstname;
         let lastname = JSON.parse(request.requestBody).lastname;
         let email = JSON.parse(request.requestBody).email;
@@ -373,7 +371,7 @@ export default function() {
         ]};
     });
 
-    this.put('/users/VzMuyEw_3WqiafcE', (db, request) => {
+    this.put('/users/VzMuyEw_3WqiafcE', (schema, request) => {
         let firstname = JSON.parse(request.requestBody).firstname;
         let lastname = JSON.parse(request.requestBody).lastname;
         let email = JSON.parse(request.requestBody).email;

app/package.json

@@ -29,7 +29,7 @@
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.4.0",
     "ember-cli-jshint": "^1.0.0",
-    "ember-cli-mirage": "0.1.13",
+    "ember-cli-mirage": "^0.2.0",
     "ember-cli-qunit": "^1.4.0",
     "ember-cli-release": "0.2.8",
     "ember-cli-sass": "5.3.1",

app/tests/helpers/destroy-app.js

@@ -2,4 +2,5 @@ import Ember from 'ember';
 
 export default function destroyApp(application) {
   Ember.run(application, 'destroy');
+  server.shutdown();
 }