From fe1e457d9691cd9a271e045a802cdfce32b498a7 Mon Sep 17 00:00:00 2001 From: zinyando Date: Tue, 19 Jul 2016 18:13:03 +0200 Subject: [PATCH] Fix auth test to use logout button and tweaks to mirage config --- app/mirage/config.js | 30 +++------------------ app/mirage/factories/document.js | 14 ---------- app/tests/acceptance/authentication-test.js | 3 +-- 3 files changed, 4 insertions(+), 43 deletions(-) diff --git a/app/mirage/config.js b/app/mirage/config.js index c7230444..08dbdec9 100644 --- a/app/mirage/config.js +++ b/app/mirage/config.js @@ -35,38 +35,14 @@ export default function () { return schema.db.documents.where({ folderId: folder_id }); } - if (folder_id = "VzMygEw_3WrtFzto") { - return { - "id": "VzMygEw_3WrtFzto", - "created": "2016-05-11T13:24:17Z", - "revised": "2016-05-11T13:25:51Z", - "name": "Test", - "orgId": "VzMuyEw_3WqiafcD", - "userId": "VzMuyEw_3WqiafcE", - "folderType": 1 - }; - } - if (folder_id = 'V0Vy5Uw_3QeDAMW9') { return null; } }); - this.get('/documents/:id', function () { - return { - "id": "VzMzBUw_3WrtFztv", - "created": "2016-05-11T13:26:29Z", - "revised": "2016-05-11T13:26:29Z", - "orgId": "VzMuyEw_3WqiafcD", - "folderId": "VzMygEw_3WrtFzto", - "userId": "VzMuyEw_3WqiafcE", - "job": "3004c449-b053-49a6-4abc-72688136184d", - "location": "/var/folders/d6/kr81d2fs5bsbm8rz2p092fy80000gn/T/documize/_uploads/3004c449-b053-49a6-4abc-72688136184d/README.md", - "name": "README", - "excerpt": "To Document/ Instructions. GO. go- bindata- assetsfs. SSL.", - "tags": "", - "template": false - }; + this.get('/documents/:id', function (schema, request) { + let id = request.params.id; + return schema.db.documents.where({ id: `${id}` })[0]; }); this.get('/documents/:id/pages', function () { diff --git a/app/mirage/factories/document.js b/app/mirage/factories/document.js index 5d528d89..d9e9efe5 100644 --- a/app/mirage/factories/document.js +++ b/app/mirage/factories/document.js @@ -25,17 +25,3 @@ export default Factory.extend({ "tags": "", "template": false }); -// return { -// "id": "VzMzBUw_3WrtFztv", -// "created": "2016-05-11T13:26:29Z", -// "revised": "2016-05-11T13:26:29Z", -// "orgId": "VzMuyEw_3WqiafcD", -// "folderId": "VzMygEw_3WrtFzto", -// "userId": "VzMuyEw_3WqiafcE", -// "job": "3004c449-b053-49a6-4abc-72688136184d", -// "location": "/var/folders/d6/kr81d2fs5bsbm8rz2p092fy80000gn/T/documize/_uploads/3004c449-b053-49a6-4abc-72688136184d/README.md", -// "name": "README", -// "excerpt": "To Document/ Instructions. GO. go- bindata- assetsfs. SSL.", -// "tags": "", -// "template": false -// }; diff --git a/app/tests/acceptance/authentication-test.js b/app/tests/acceptance/authentication-test.js index 1fc2f369..ba300591 100644 --- a/app/tests/acceptance/authentication-test.js +++ b/app/tests/acceptance/authentication-test.js @@ -30,8 +30,7 @@ test('visiting /auth/login and logging in', function (assert) { test('logging out a user', function (assert) { server.create('meta', { allowAnonymousAccess: false }); userLogin(); - - visit('/auth/logout'); + click('.dropdown-menu a:contains(Logout)'); andThen(function () { assert.equal(currentURL(), '/auth/login', 'Logging out successful');