From 9fa6e0d05508cb2cc610710a8a52036b48361f85 Mon Sep 17 00:00:00 2001 From: zinyando Date: Thu, 9 Jun 2016 18:56:35 +0200 Subject: [PATCH] Fix permissions test --- app/app/mirage/config.js | 81 +++++++++++++------- app/tests/acceptance/documents-space-test.js | 3 +- app/tests/helpers/stub-audit.js | 4 +- 3 files changed, 56 insertions(+), 32 deletions(-) diff --git a/app/app/mirage/config.js b/app/app/mirage/config.js index 3a5b325e..5317cb41 100644 --- a/app/app/mirage/config.js +++ b/app/app/mirage/config.js @@ -129,31 +129,20 @@ export default function() { }); this.post('/folders', function(db, request) { - // return { - // "id":"V0Vy5Uw_3QeDAMW9", - // "created":"2016-05-25T09:39:49Z", - // "revised":"2016-05-25T09:39:49Z", - // "name":"Test Folder", - // "orgId":"VzMuyEw_3WqiafcD", - // "userId":"VzMuyEw_3WqiafcE", - // "folderType":2 - // }; - // console.log(request); - // var attrs = JSON.parse(request.requestBody).name; - // var folder = db.folders.insert(attrs); - // return folder; - }); - - this.put('/folders/V0Vy5Uw_3QeDAMW9', () => { - return { + var name = JSON.parse(request.requestBody).name; + let newFolder = { "id":"V0Vy5Uw_3QeDAMW9", "created":"2016-05-25T09:39:49Z", "revised":"2016-05-25T09:39:49Z", - "name":"Test Folder", + "name":name, "orgId":"VzMuyEw_3WqiafcD", "userId":"VzMuyEw_3WqiafcE", "folderType":2 }; + + let folder = db.folders.insert(newFolder); + console.log(newFolder); + return folder; }); this.post('/public/authenticate', () => { @@ -192,11 +181,6 @@ export default function() { }); this.get('/folders/VzMuyEw_3WqiafcG/permissions', (db) => { - // let folderId = 'VzMuyEw_3WqiafcG'; - // let permissions = db.folder_permissions - // console.log(permissions[0]); - // debugger; - // return permissions; return [ { "folderId":"VzMuyEw_3WqiafcG", @@ -207,20 +191,61 @@ export default function() { ]; }); - this.put('/folders/VzMuyEw_3WqiafcG/permissions', (db, request) => { - let id = 'VzMuyEw_3WqiafcG'; - let roles = JSON.parse(request.requestBody).Roles; - // let permissions = db.permissions.update(id, roles[2]); - // return permissions; + this.put('/folders/VzMygEw_3WrtFzto/permissions', () => { + return [ + { + "orgId":"VzMuyEw_3WqiafcD", + "folderId":"VzMygEw_3WrtFzto", + "userId":"", + "canEdit":true, + "canView":true + },{ + "orgId":"VzMuyEw_3WqiafcD", + "folderId":"VzMygEw_3WrtFzto", + "userId":"VzMyp0w_3WrtFztq", + "canEdit":false, + "canView":false + },{ + "orgId":"", + "folderId":"VzMygEw_3WrtFzto", + "userId":"VzMuyEw_3WqiafcE", + "canEdit":true, + "canView":true + } + ]; + }); + + this.get('/folders/VzMygEw_3WrtFzto/permissions', () => { + return [ + { + "folderId":"VzMygEw_3WrtFzto", + "userId":"VzMuyEw_3WqiafcE", + "canView":true, + "canEdit":true + } + ]; }); this.put('/folders/:id', (db, request) => { let id = request.params.id; let attrs = JSON.parse(request.requestBody); let folder = db.folders.update(id, attrs); + console.log(folder); return folder; }); + this.put('/folders/V0Vy5Uw_3QeDAMW9', () => { + return { + "id":"V0Vy5Uw_3QeDAMW9", + "created":"2016-05-25T09:39:49Z", + "revised":"2016-05-25T09:39:49Z", + "name":"Test Folder", + "orgId":"VzMuyEw_3WqiafcD", + "userId":"VzMuyEw_3WqiafcE", + "folderType":2 + }; + }); + this.get('folders/:id', (db, request) => { let id = request.params.id; return db.folders.find(id); diff --git a/app/tests/acceptance/documents-space-test.js b/app/tests/acceptance/documents-space-test.js index 0a0b0b4f..8bd76ece 100644 --- a/app/tests/acceptance/documents-space-test.js +++ b/app/tests/acceptance/documents-space-test.js @@ -22,7 +22,6 @@ test('Adding a new folder space', function(assert) { fillIn('#new-folder-name', 'body', 'Test Folder'); click('.actions div:contains(Add)', 'body'); - // return pauseTest(); andThen(function() { assert.equal(currentURL(), '/s/V0Vy5Uw_3QeDAMW9/test-folder'); @@ -118,7 +117,7 @@ test('changing space permissions', function(assert) { assert.equal(currentURL(), '/s/VzMuyEw_3WqiafcG/my-project'); }); - visit('/s/VzMuyEw_3WqiafcG/my-project/settings'); + visit('/s/VzMygEw_3WrtFzto/test/settings'); click(('.sidebar-menu .options li:contains(Permissions)')); click('tr:contains(Everyone) #canView-'); diff --git a/app/tests/helpers/stub-audit.js b/app/tests/helpers/stub-audit.js index 53778b97..2d9c6037 100644 --- a/app/tests/helpers/stub-audit.js +++ b/app/tests/helpers/stub-audit.js @@ -64,6 +64,6 @@ const Audit = Ember.Service.extend({ }, }); -export default Ember.Test.registerAsyncHelper('stubAudit', function(app, test, attrs={}) { +export default Ember.Test.registerAsyncHelper('stubAudit', function(app, test, attrs = {}) { test.register('service:audit', Audit.extend(attrs)); -}); +}); \ No newline at end of file