diff --git a/app/app/mirage/config.js b/app/app/mirage/config.js index 5317cb41..726ef0ac 100644 --- a/app/app/mirage/config.js +++ b/app/app/mirage/config.js @@ -180,7 +180,7 @@ export default function() { return db.permissions; }); - this.get('/folders/VzMuyEw_3WqiafcG/permissions', (db) => { + this.get('/folders/VzMuyEw_3WqiafcG/permissions', () => { return [ { "folderId":"VzMuyEw_3WqiafcG", @@ -483,11 +483,11 @@ export default function() { /** very helpful for debugging */ - this.handledRequest = function(verb, path, request) { + this.handledRequest = function(verb, path) { console.log(`👊${verb} ${path}`); }; - this.unhandledRequest = function(verb, path, request) { + this.unhandledRequest = function(verb, path) { console.log(`🔥${verb} ${path}`); }; diff --git a/app/app/mirage/factories/folder_permission.js b/app/app/mirage/factories/folder_permission.js deleted file mode 100644 index 0fed7da7..00000000 --- a/app/app/mirage/factories/folder_permission.js +++ /dev/null @@ -1,8 +0,0 @@ -import Mirage, {faker} from 'ember-cli-mirage'; - -export default Mirage.Factory.extend({ - "folderId":"VzMuyEw_3WqiafcG", - "userId":"VzMuyEw_3WqiafcE", - "canView":true, - "canEdit":true -}); diff --git a/app/app/pods/customize/users/controller.js b/app/app/pods/customize/users/controller.js index b684154f..16e71b9d 100644 --- a/app/app/pods/customize/users/controller.js +++ b/app/app/pods/customize/users/controller.js @@ -32,9 +32,9 @@ export default Ember.Controller.extend(NotifierMixin, { $("#newUserFirstname").focus(); this.get('model').pushObject(user); }) - .catch(function(){ + .catch(function(error){ let msg = error.status === 409 ? 'Unable to add duplicate user' : 'Unable to add user'; - self.showNotification(msg); + this.showNotification(msg); }); }, diff --git a/app/app/services/document.js b/app/app/services/document.js index beb89c8c..fe27e77b 100644 --- a/app/app/services/document.js +++ b/app/app/services/document.js @@ -21,8 +21,7 @@ export default Ember.Service.extend({ let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}`); return this.get('ajax').request(url).then((response) => { - let doc = models.DocumentModel.create(response); - return doc; + return models.DocumentModel.create(response); }); }, @@ -71,8 +70,6 @@ export default Ember.Service.extend({ return this.get('ajax').request(url, { method: 'PUT', data: JSON.stringify(doc) - }).then((response) => { - return response; }); }, @@ -97,8 +94,6 @@ export default Ember.Service.extend({ return this.get('ajax').post(url, { data: JSON.stringify(payload), contentType: 'json' - }).then((response) => { - return response; }); }, @@ -108,8 +103,6 @@ export default Ember.Service.extend({ return this.get('ajax').post(url, { data: JSON.stringify(payload), contentType: 'json' - }).then((response) => { - return response; }); }, @@ -118,8 +111,6 @@ export default Ember.Service.extend({ return this.get('ajax').request(url, { method: 'DELETE' - }).then((response) => { - return response; }); }, @@ -131,8 +122,6 @@ export default Ember.Service.extend({ method: 'PUT', data: JSON.stringify(payload), contentType: 'json' - }).then((response) => { - return response; }); }, @@ -143,8 +132,6 @@ export default Ember.Service.extend({ return this.get('ajax').post(url, { data: JSON.stringify(payload), contentType: 'json' - }).then((response) => { - return response; }); }, @@ -155,8 +142,6 @@ export default Ember.Service.extend({ return this.get('ajax').post(url, { data: JSON.stringify(payload), contentType: 'json' - }).then((response) => { - return response; }); }, @@ -166,16 +151,14 @@ export default Ember.Service.extend({ return this.get('ajax').request(url, { method: 'DELETE' - }).then((response) => { - return response; }); }, getPageRevisions(documentId, pageId) { let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId + "/revisions"); - return this.get('ajax').request(url).then((response) => { - return response; + return this.get('ajax').request(url, { + method: "GET" }); }, @@ -184,16 +167,14 @@ export default Ember.Service.extend({ return this.get('ajax').request(url, { dataType: 'text' - }).then((response) => { - return response; }); }, rollbackPage(documentId, pageId, revisionId) { let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId + "/revisions/" + revisionId); - return this.get('ajax').post(url).then((response) => { - return response; + return this.get('ajax').request(url, { + method: "POST" }); }, @@ -201,8 +182,8 @@ export default Ember.Service.extend({ getMeta(documentId) { let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/meta`); - return this.get('ajax').request(url).then((response) => { - return response; + return this.get('ajax').request(url, { + method: "GET" }); }, @@ -278,8 +259,6 @@ export default Ember.Service.extend({ return this.get('ajax').request(url, { method: 'DELETE' - }).then((response) => { - return response; }); }, }); diff --git a/app/app/services/folder.js b/app/app/services/folder.js index 1ec18394..ebcd8d5e 100644 --- a/app/app/services/folder.js +++ b/app/app/services/folder.js @@ -66,8 +66,6 @@ export default BaseService.extend({ return this.get('ajax').request(url, { method: 'PUT', data: JSON.stringify(folder) - }).then((response)=>{ - return response; }); }, @@ -76,8 +74,6 @@ export default BaseService.extend({ return this.get('ajax').request(url, { method: 'DELETE' - }).then((response)=>{ - return response; }); }, @@ -86,8 +82,6 @@ export default BaseService.extend({ return this.get('ajax').post(url, { data: payload - }).then((response)=>{ - return response; }); }, @@ -141,8 +135,6 @@ export default BaseService.extend({ return this.get('ajax').request(url, { method: 'PUT', data: JSON.stringify(payload) - }).then((response) => { - return response; }); }, @@ -152,8 +144,6 @@ export default BaseService.extend({ return this.get('ajax').post(url, { data: JSON.stringify(invitation) - }).then((response) => { - return response; }); }, diff --git a/app/app/services/organization.js b/app/app/services/organization.js index 8a353546..c80996e9 100644 --- a/app/app/services/organization.js +++ b/app/app/services/organization.js @@ -38,8 +38,6 @@ export default Ember.Service.extend({ return this.get('ajax').request(url, { method: 'PUT', data: JSON.stringify(org) - }).then((response) => { - return response; }); } }); diff --git a/app/app/services/search.js b/app/app/services/search.js index 94ed87d4..e2bd5935 100644 --- a/app/app/services/search.js +++ b/app/app/services/search.js @@ -19,8 +19,8 @@ export default Ember.Service.extend({ find(keywords) { let url = this.get('sessionService').appMeta.getUrl("search?keywords=" + encodeURIComponent(keywords)); - return this.get('ajax').request(url).then((response) => { - return response; + return this.get('ajax').request(url, { + method: "GET" }); }, }); diff --git a/app/app/services/section.js b/app/app/services/section.js index 14533cca..401187ec 100644 --- a/app/app/services/section.js +++ b/app/app/services/section.js @@ -43,8 +43,6 @@ export default BaseService.extend({ return this.get('ajax').post(url, { data: JSON.stringify(data) - }).then((response)=>{ - return response; }); }, diff --git a/app/app/services/template.js b/app/app/services/template.js index fea37076..dc2ed984 100644 --- a/app/app/services/template.js +++ b/app/app/services/template.js @@ -20,8 +20,8 @@ export default Ember.Service.extend({ let url = this.get('sessionService').appMeta.getUrl("templates/" + templateId + "/folder/" + folderId + "?type=stock"); - return this.get('ajax').post(url).then((response)=>{ - return response; + return this.get('ajax').request(url, { + method: "POST" }); }, @@ -61,8 +61,6 @@ export default Ember.Service.extend({ return this.get('ajax').request(url, { type: 'GET' - }).then((response) => { - return response; }); } }); diff --git a/app/app/services/user.js b/app/app/services/user.js index 0ad6babc..adbc9522 100644 --- a/app/app/services/user.js +++ b/app/app/services/user.js @@ -83,8 +83,6 @@ export default Ember.Service.extend({ return this.get('ajax').post(url, { data: password - }).then((response)=>{ - return response; }); }, @@ -94,8 +92,6 @@ export default Ember.Service.extend({ return this.get('ajax').request(url, { method: 'DELETE' - }).then((response) => { - return response; }); }, @@ -104,8 +100,7 @@ export default Ember.Service.extend({ let url = this.get('sessionService').appMeta.getUrl('public/forgot'); if (is.empty(email)) { - reject("invalid"); - return; + return Ember.RSVP.reject("invalid"); } let data = JSON.stringify({ @@ -114,8 +109,6 @@ export default Ember.Service.extend({ return this.request('ajax').post(url, { data: data - }).then((response)=>{ - return response; }); }, @@ -129,8 +122,6 @@ export default Ember.Service.extend({ return this.request('ajax').post(url, { data: password - }).then((response)=>{ - return response; }); } }); diff --git a/app/tests/.jshintrc b/app/tests/.jshintrc index 861b980d..ce9a4986 100644 --- a/app/tests/.jshintrc +++ b/app/tests/.jshintrc @@ -28,7 +28,10 @@ "pauseTest", "userLogin", "skip", - "waitToAppear" + "waitToAppear", + "waitToAppear", + "stubUserNotification", + "is" ], "node": false, "browser": false, diff --git a/app/tests/acceptance/user-settings-test.js b/app/tests/acceptance/user-settings-test.js index c851b422..95328d58 100644 --- a/app/tests/acceptance/user-settings-test.js +++ b/app/tests/acceptance/user-settings-test.js @@ -1,4 +1,4 @@ -import { test, skip } from 'qunit'; +import { test} from 'qunit'; import moduleForAcceptance from 'documize/tests/helpers/module-for-acceptance'; moduleForAcceptance('Acceptance | User Settings'); diff --git a/app/tests/helpers/stub-audit.js b/app/tests/helpers/stub-audit.js index 2d9c6037..2ec9137b 100644 --- a/app/tests/helpers/stub-audit.js +++ b/app/tests/helpers/stub-audit.js @@ -1,6 +1,5 @@ import Ember from 'ember'; -import netUtil from 'documize/utils/net'; -import config from 'documize/config/environment'; +// import netUtil from 'documize/utils/net'; const Audit = Ember.Service.extend({ sessionService: Ember.inject.service('session'), @@ -20,6 +19,8 @@ const Audit = Ember.Service.extend({ this.start(); } + return id; + // Intercom('trackEvent', id); //jshint ignore: line // Intercom('update'); //jshint ignore: line }, @@ -37,7 +38,7 @@ const Audit = Ember.Service.extend({ this.set('ready', true); - let appId = config.environment === 'production' ? 'c6cocn4z' : 'itgvb1vo'; + // let appId = config.environment === 'production' ? 'c6cocn4z' : 'itgvb1vo'; // window.intercomSettings = { // app_id: appId, @@ -66,4 +67,4 @@ const Audit = Ember.Service.extend({ export default Ember.Test.registerAsyncHelper('stubAudit', function(app, test, attrs = {}) { test.register('service:audit', Audit.extend(attrs)); -}); \ No newline at end of file +}); diff --git a/app/tests/helpers/stub-session.js b/app/tests/helpers/stub-session.js index 738a126f..85cfa1a9 100644 --- a/app/tests/helpers/stub-session.js +++ b/app/tests/helpers/stub-session.js @@ -80,7 +80,7 @@ const Session = Ember.Service.extend({ }).then((response)=>{ this.setSession(response.token, models.UserModel.create(response.user)); this.get('ready', true); - resolve(response); + return response; }); }, @@ -113,17 +113,17 @@ const Session = Ember.Service.extend({ // localStorage.clear(); }, - storeSessionItem: function(key, data) { + storeSessionItem: function() { // localStorage[key] = data; // console.log(data); }, - getSessionItem: function(key) { + getSessionItem: function() { // return localStorage[key]; // console.log(data); }, - clearSessionItem: function(key) { + clearSessionItem: function() { // delete localStorage[key]; }, @@ -181,12 +181,12 @@ const Session = Ember.Service.extend({ return this.get('ajax').request(tokenCheckUrl, { method: 'GET', contentType: 'json' - }).then((response) => { + }).then((user) => { this.setSession(token, models.UserModel.create(user)); this.set('ready', true); }).catch((reason) => { if (reason.status === 401 || reason.status === 403) { - localStorage.clear(); + // localStorage.clear(); window.location.href = "/auth/login"; } }); diff --git a/app/tests/helpers/stub-user-notification.js b/app/tests/helpers/stub-user-notification.js index 1df4e2e6..64ae69db 100644 --- a/app/tests/helpers/stub-user-notification.js +++ b/app/tests/helpers/stub-user-notification.js @@ -12,7 +12,7 @@ const userNotification = Ember.Component.extend({ }, showNotification(msg) { - // return msg; + return msg; } }); diff --git a/app/tests/helpers/user-login.js b/app/tests/helpers/user-login.js index e21ff370..dbca8c86 100644 --- a/app/tests/helpers/user-login.js +++ b/app/tests/helpers/user-login.js @@ -1,6 +1,6 @@ import Ember from 'ember'; -export default Ember.Test.registerAsyncHelper('userLogin', function(app) { +export default Ember.Test.registerAsyncHelper('userLogin', function() { visit('/auth/login'); fillIn('#authEmail', 'brizdigital@gmail.com');