From 8cd5533aed76affdac4cf9e5a5d1e876a371a166 Mon Sep 17 00:00:00 2001 From: Vyrtsev Mikhail Date: Tue, 16 Jul 2019 01:45:22 +0300 Subject: [PATCH] fix lint errors --- .../components/auth-panel/auth-panel.test.tsx | 14 +++++----- .../_type/_down/comment__vote_type_down.scss | 3 ++- .../_type/_up/comment__vote_type_up.scss | 3 ++- .../app/components/comment/comment.test.tsx | 26 +++++++++---------- frontend/app/utils/parseQuery.ts | 18 ++++++------- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/frontend/app/components/auth-panel/auth-panel.test.tsx b/frontend/app/components/auth-panel/auth-panel.test.tsx index 92e4f53d..6065a5fc 100644 --- a/frontend/app/components/auth-panel/auth-panel.test.tsx +++ b/frontend/app/components/auth-panel/auth-panel.test.tsx @@ -24,7 +24,7 @@ describe('', () => { }); it('should render login form with google and github provider', () => { - const element = ; + const element = ; render(element, container); @@ -45,7 +45,7 @@ describe('', () => { it('should render login form with google and github provider for read-only post', () => { const element = ( @@ -70,7 +70,7 @@ describe('', () => { it('should not render settings if there is no hidden users', () => { const element = ( @@ -86,7 +86,7 @@ describe('', () => { it('should render settings if there is some hidden users', () => { const element = ( ', () => { }); it('should render info about current user', () => { - const element = ; + const element = ; render(element, container); @@ -129,7 +129,9 @@ describe('', () => { }); it('should render admin action', () => { - const element = ; + const element = ( + + ); render(element, container); diff --git a/frontend/app/components/comment/__vote/_type/_down/comment__vote_type_down.scss b/frontend/app/components/comment/__vote/_type/_down/comment__vote_type_down.scss index 5caf0646..4c8db682 100644 --- a/frontend/app/components/comment/__vote/_type/_down/comment__vote_type_down.scss +++ b/frontend/app/components/comment/__vote/_type/_down/comment__vote_type_down.scss @@ -2,7 +2,8 @@ transform: scale(1, -1); margin-left: 4px; - &.comment__vote_selected, &:hover { + &.comment__vote_selected, + &:hover { background-image: url('comment__vote_type_down.svg'); } } diff --git a/frontend/app/components/comment/__vote/_type/_up/comment__vote_type_up.scss b/frontend/app/components/comment/__vote/_type/_up/comment__vote_type_up.scss index c3a78603..5fb20825 100644 --- a/frontend/app/components/comment/__vote/_type/_up/comment__vote_type_up.scss +++ b/frontend/app/components/comment/__vote/_type/_up/comment__vote_type_up.scss @@ -1,7 +1,8 @@ .comment__vote_type_up { margin-right: 4px; - &.comment__vote_selected, &:hover { + &.comment__vote_selected, + &:hover { background-image: url('comment__vote_type_up.svg'); } } diff --git a/frontend/app/components/comment/comment.test.tsx b/frontend/app/components/comment/comment.test.tsx index 14a26ebd..b15e0fb6 100644 --- a/frontend/app/components/comment/comment.test.tsx +++ b/frontend/app/components/comment/comment.test.tsx @@ -37,7 +37,7 @@ describe('', () => { }); it('disabled on user info widget', () => { - const element = ; + const element = ; render(element, container); const voteButtons = container.querySelectorAll('.comment__vote'); @@ -51,7 +51,7 @@ describe('', () => { it('disabled on read only post', () => { const element = ( - + ); render(element, container); @@ -67,7 +67,7 @@ describe('', () => { it('disabled for deleted comment', () => { const element = ( // ahem - + ); render(element, container); @@ -83,13 +83,13 @@ describe('', () => { it('disabled for guest', () => { const element = ( ); render(element, container); @@ -104,7 +104,7 @@ describe('', () => { }); it('disabled for own comment', () => { - const element = ; + const element = ; render(element, container); const voteButtons = container.querySelectorAll('.comment__vote'); @@ -120,7 +120,7 @@ describe('', () => { const voteSpy = jest.fn(async () => {}); const element = ( @@ -145,7 +145,7 @@ describe('', () => { const voteSpy = jest.fn(async () => {}); const element = ( @@ -175,7 +175,7 @@ describe('', () => { }); it('for admin if shows admin controls', () => { - const element = ; + const element = ; render(element, container); const controls = container.querySelectorAll('.comment__controls > span'); @@ -188,7 +188,7 @@ describe('', () => { }); it('for regular user it shows only "hide"', () => { - const element = ; + const element = ; render(element, container); const controls = container.querySelectorAll('.comment__controls > span'); @@ -197,7 +197,7 @@ describe('', () => { }); it('verification badge clickable for admin', () => { - const element = ; + const element = ; render(element, container); const controls = container.querySelector('.comment__verification')!; @@ -207,10 +207,10 @@ describe('', () => { it('verification badge not clickable for regular user', () => { const element = ( ); render(element, container); diff --git a/frontend/app/utils/parseQuery.ts b/frontend/app/utils/parseQuery.ts index 26d47204..8f83ba53 100644 --- a/frontend/app/utils/parseQuery.ts +++ b/frontend/app/utils/parseQuery.ts @@ -4,17 +4,15 @@ export function parseQuery(search: string): { [key: string]: string } { return search .substr(1) .split('&') - .map( - (chunk): [string, string] => { - const parts = chunk.split('='); - if (parts.length < 2) { - parts[1] = ''; - } else { - parts[1] = decodeURIComponent(parts[1]); - } - return parts as [string, string]; + .map((chunk): [string, string] => { + const parts = chunk.split('='); + if (parts.length < 2) { + parts[1] = ''; + } else { + parts[1] = decodeURIComponent(parts[1]); } - ) + return parts as [string, string]; + }) .reduce<{ [key: string]: string }>((c, x) => { c[x[0]] = x[1]; return c;