From 2b7576521cf73fd247884e1f0338c4cb19004639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Tue, 5 Mar 2019 18:15:05 +0100 Subject: [PATCH] Fix lint + return more attributes in post factory for convenience --- src/middleware/permissionsMiddleware.js | 2 +- src/middleware/softDeleteMiddleware.spec.js | 4 +-- src/resolvers/posts.spec.js | 29 +++++++++------------ src/seed/factories/users.js | 3 +++ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/middleware/permissionsMiddleware.js b/src/middleware/permissionsMiddleware.js index 1c6e8310b..44ed2ed34 100644 --- a/src/middleware/permissionsMiddleware.js +++ b/src/middleware/permissionsMiddleware.js @@ -64,7 +64,7 @@ const permissions = shield({ DeleteBadge: isAdmin, AddPostDisabledBy: and(isModerator, fromUserMatchesCurrentUser), - RemovePostDisabledBy: and(isModerator, fromUserMatchesCurrentUser), + RemovePostDisabledBy: and(isModerator, fromUserMatchesCurrentUser) // addFruitToBasket: isAuthenticated // CreateUser: allow, }, diff --git a/src/middleware/softDeleteMiddleware.spec.js b/src/middleware/softDeleteMiddleware.spec.js index c37e7d426..283e16eb0 100644 --- a/src/middleware/softDeleteMiddleware.spec.js +++ b/src/middleware/softDeleteMiddleware.spec.js @@ -19,8 +19,8 @@ beforeEach(async () => { factory.create('Post', { title: 'Publicly visible post', deleted: false }) ]) const moderatorFactory = Factory() - await moderatorFactory.authenticateAs({ email: 'moderator@example.org', password: '1234'}) - await moderatorFactory.relate('Post', 'DisabledBy', { from: 'm1', to: 'p2'}) + await moderatorFactory.authenticateAs({ email: 'moderator@example.org', password: '1234' }) + await moderatorFactory.relate('Post', 'DisabledBy', { from: 'm1', to: 'p2' }) }) afterEach(async () => { diff --git a/src/resolvers/posts.spec.js b/src/resolvers/posts.spec.js index 427a5d925..89fb1c8e4 100644 --- a/src/resolvers/posts.spec.js +++ b/src/resolvers/posts.spec.js @@ -201,13 +201,10 @@ describe('DeletePost', () => { }) }) - - - describe('AddPostDisabledBy', () => { const setup = async (params = {}) => { - await factory.create('User', {email: 'author@example.org', password: '1234'}) - await factory.authenticateAs({email: 'author@example.org', password: '1234'}) + await factory.create('User', { email: 'author@example.org', password: '1234' }) + await factory.authenticateAs({ email: 'author@example.org', password: '1234' }) await factory.create('Post', { id: 'p9' // that's the ID we will look for }) @@ -215,8 +212,8 @@ describe('AddPostDisabledBy', () => { let headers = {} const { email, password } = params if (email && password) { - const user = await factory.create('User', params) - headers = await login({email, password}) + await factory.create('User', params) + headers = await login({ email, password }) } client = new GraphQLClient(host, { headers }) } @@ -280,7 +277,7 @@ describe('AddPostDisabledBy', () => { it('sets current user', async () => { await client.request(mutation) - const query = `{ Post(disabled: true) { id, disabledBy { id } } }` + const query = '{ Post(disabled: true) { id, disabledBy { id } } }' const expected = { Post: [{ id: 'p9', disabledBy: { id: 'u7' } }] } await expect(client.request(query)).resolves.toEqual(expected) }) @@ -290,11 +287,11 @@ describe('AddPostDisabledBy', () => { const expected = { Post: [ { id: 'p9', disabled: true } ] } await expect(client.request( - `{ Post { id disabled } }` + '{ Post { id disabled } }' )).resolves.toEqual(before) await client.request(mutation) // this updates .disabled await expect(client.request( - `{ Post(disabled: true) { id disabled } }` + '{ Post(disabled: true) { id disabled } }' )).resolves.toEqual(expected) }) }) @@ -304,8 +301,8 @@ describe('AddPostDisabledBy', () => { describe('RemovePostDisabledBy', () => { const setup = async (params = {}) => { - await factory.create('User', {email: 'anotherModerator@example.org', password: '1234', id: 'u123', role: 'moderator'}) - await factory.authenticateAs({email: 'anotherModerator@example.org', password: '1234'}) + await factory.create('User', { email: 'anotherModerator@example.org', password: '1234', id: 'u123', role: 'moderator' }) + await factory.authenticateAs({ email: 'anotherModerator@example.org', password: '1234' }) await factory.create('Post', { id: 'p9' // that's the ID we will look for }) @@ -317,8 +314,8 @@ describe('RemovePostDisabledBy', () => { let headers = {} const { email, password } = params if (email && password) { - const user = await factory.create('User', params) - headers = await login({email, password}) + await factory.create('User', params) + headers = await login({ email, password }) } client = new GraphQLClient(host, { headers }) } @@ -385,11 +382,11 @@ describe('RemovePostDisabledBy', () => { const expected = { Post: [ { id: 'p9', disabled: false } ] } await expect(client.request( - `{ Post(disabled: true) { id disabled } }` + '{ Post(disabled: true) { id disabled } }' )).resolves.toEqual(before) await client.request(mutation) // this updates .disabled await expect(client.request( - `{ Post { id disabled } }` + '{ Post { id disabled } }' )).resolves.toEqual(expected) }) }) diff --git a/src/seed/factories/users.js b/src/seed/factories/users.js index 8e0ee693c..c27b2b1ce 100644 --- a/src/seed/factories/users.js +++ b/src/seed/factories/users.js @@ -25,10 +25,13 @@ export default function create (params) { disabled: ${disabled}, deleted: ${deleted} ) { + id name email avatar role + deleted + disabled } } `