From 366c5d776bf90bc3c3f0f5d6353512827c1d2d54 Mon Sep 17 00:00:00 2001 From: Matt Rider Date: Thu, 11 Apr 2019 22:28:18 -0300 Subject: [PATCH] Fix lint --- backend/src/middleware/validUrlMiddleware.js | 4 ++-- backend/src/resolvers/socialMedia.spec.js | 4 ++-- backend/src/resolvers/user_management.spec.js | 1 - backend/src/seed/factories/users.js | 2 +- backend/src/server.js | 1 - webapp/pages/settings/my-social-media.spec.js | 8 ++++---- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/backend/src/middleware/validUrlMiddleware.js b/backend/src/middleware/validUrlMiddleware.js index f5fdae9d4..37f06199c 100644 --- a/backend/src/middleware/validUrlMiddleware.js +++ b/backend/src/middleware/validUrlMiddleware.js @@ -1,5 +1,5 @@ const validURL = str => { - const isValid = str.match(/^(?:https?:\/\/)(?:[^@\n])?(?:www\.)?([^:\/\n?]+)/g) + const isValid = str.match(/^(?:https?:\/\/)(?:[^@\n])?(?:www\.)?([^:/\n?]+)/g) return !!isValid } @@ -15,4 +15,4 @@ export default { return socialMedia } } -} \ No newline at end of file +} diff --git a/backend/src/resolvers/socialMedia.spec.js b/backend/src/resolvers/socialMedia.spec.js index 92a08823e..b97316543 100644 --- a/backend/src/resolvers/socialMedia.spec.js +++ b/backend/src/resolvers/socialMedia.spec.js @@ -25,7 +25,7 @@ describe('CreateSocialMedia', () => { password: '1234' }) }) - + afterEach(async () => { await factory.cleanDatabase() }) @@ -46,4 +46,4 @@ describe('CreateSocialMedia', () => { await expect(client.request(mutation, variables)).rejects.toThrow('Input is not a URL') }) }) -}) \ No newline at end of file +}) diff --git a/backend/src/resolvers/user_management.spec.js b/backend/src/resolvers/user_management.spec.js index c059ec78e..1c21adac1 100644 --- a/backend/src/resolvers/user_management.spec.js +++ b/backend/src/resolvers/user_management.spec.js @@ -309,4 +309,3 @@ describe('change password', () => { }) }) }) - diff --git a/backend/src/seed/factories/users.js b/backend/src/seed/factories/users.js index f9479fdbb..9fe957515 100644 --- a/backend/src/seed/factories/users.js +++ b/backend/src/seed/factories/users.js @@ -1,7 +1,7 @@ import faker from 'faker' import uuid from 'uuid/v4' -export default function create(params) { +export default function create (params) { const { id = uuid(), name = faker.name.findName(), diff --git a/backend/src/server.js b/backend/src/server.js index 5861646f4..fe0d4ee1d 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -11,7 +11,6 @@ import { getDriver } from './bootstrap/neo4j' import helmet from 'helmet' import decode from './jwt/decode' - dotenv.config() // check env and warn const requiredEnvVars = ['MAPBOX_TOKEN', 'JWT_SECRET', 'PRIVATE_KEY_PASSPHRASE'] diff --git a/webapp/pages/settings/my-social-media.spec.js b/webapp/pages/settings/my-social-media.spec.js index 591a2d9a6..c8fc45d31 100644 --- a/webapp/pages/settings/my-social-media.spec.js +++ b/webapp/pages/settings/my-social-media.spec.js @@ -26,7 +26,9 @@ describe('my-social-media.vue', () => { mutate: jest .fn() .mockRejectedValue({ message: 'Ouch!' }) - .mockResolvedValueOnce({ data: { CreateSocialMeda: { id: 's1', url: socialMediaUrl } }}) + .mockResolvedValueOnce({ + data: { CreateSocialMeda: { id: 's1', url: socialMediaUrl } } + }) }, $toast: { error: jest.fn(), @@ -58,9 +60,7 @@ describe('my-social-media.vue', () => { getters = { 'auth/user': () => { return { - socialMedia: [ - { id: 's1', url: socialMediaUrl } - ] + socialMedia: [{ id: 's1', url: socialMediaUrl }] } } }