From e1733201e893a5e3a21e9f095735a68f580e477a Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Tue, 24 Mar 2020 20:11:24 +0100 Subject: [PATCH] chore: Fix lint, follow @alina-beck suggestions --- .../FilterMenu/CategoriesFilter.spec.js | 16 ++++------------ .../FilterMenu/FollowingFilter.spec.js | 4 +--- .../FilterMenu/LanguagesFilter.spec.js | 4 +--- .../LabeledButton/LabeledButton.story.js | 19 +++---------------- 4 files changed, 9 insertions(+), 34 deletions(-) diff --git a/webapp/components/FilterMenu/CategoriesFilter.spec.js b/webapp/components/FilterMenu/CategoriesFilter.spec.js index d33d2a6e6..332376bd7 100644 --- a/webapp/components/FilterMenu/CategoriesFilter.spec.js +++ b/webapp/components/FilterMenu/CategoriesFilter.spec.js @@ -48,26 +48,20 @@ describe('CategoriesFilter.vue', () => { describe('mount', () => { it('starts with all categories button active', () => { - const allCategoriesButton = wrapper.find( - '.categories-filter .sidebar .base-button', - ) + const allCategoriesButton = wrapper.find('.categories-filter .sidebar .base-button') expect(allCategoriesButton.attributes().class).toContain('--filled') }) it('sets category button attribute `filled` when corresponding category is filtered', async () => { getters['posts/filteredCategoryIds'] = jest.fn(() => ['cat9']) wrapper = await Wrapper() - democracyAndPoliticsButton = wrapper - .findAll('.categories-filter .item .base-button') - .at(2) + democracyAndPoliticsButton = wrapper.findAll('.categories-filter .item .base-button').at(2) expect(democracyAndPoliticsButton.attributes().class).toContain('--filled') }) describe('click on an "catetories-buttons" button', () => { it('calls TOGGLE_CATEGORY when clicked', () => { - environmentAndNatureButton = wrapper - .findAll('.categories-filter .item .base-button') - .at(0) + environmentAndNatureButton = wrapper.findAll('.categories-filter .item .base-button').at(0) environmentAndNatureButton.trigger('click') expect(mutations['posts/TOGGLE_CATEGORY']).toHaveBeenCalledWith({}, 'cat4') }) @@ -77,9 +71,7 @@ describe('CategoriesFilter.vue', () => { it('when all button is clicked', async () => { getters['posts/filteredCategoryIds'] = jest.fn(() => ['cat9']) wrapper = await Wrapper() - const allCategoriesButton = wrapper.find( - '.categories-filter .sidebar .base-button', - ) + const allCategoriesButton = wrapper.find('.categories-filter .sidebar .base-button') allCategoriesButton.trigger('click') expect(mutations['posts/RESET_CATEGORIES']).toHaveBeenCalledTimes(1) }) diff --git a/webapp/components/FilterMenu/FollowingFilter.spec.js b/webapp/components/FilterMenu/FollowingFilter.spec.js index b5d5c91e3..67d935492 100644 --- a/webapp/components/FilterMenu/FollowingFilter.spec.js +++ b/webapp/components/FilterMenu/FollowingFilter.spec.js @@ -35,9 +35,7 @@ describe('FollowingFilter', () => { it('sets "filter-by-followed" button attribute `filled`', () => { getters['posts/filteredByUsersFollowed'] = jest.fn(() => true) const wrapper = Wrapper() - expect( - wrapper.find('.following-filter .sidebar .base-button').classes('--filled'), - ).toBe(true) + expect(wrapper.find('.following-filter .sidebar .base-button').classes('--filled')).toBe(true) }) describe('click "filter-by-followed" button', () => { diff --git a/webapp/components/FilterMenu/LanguagesFilter.spec.js b/webapp/components/FilterMenu/LanguagesFilter.spec.js index a525b67b3..818b4f63f 100644 --- a/webapp/components/FilterMenu/LanguagesFilter.spec.js +++ b/webapp/components/FilterMenu/LanguagesFilter.spec.js @@ -61,9 +61,7 @@ describe('LanguagesFilter.vue', () => { it('when all button is clicked', async () => { getters['posts/filteredLanguageCodes'] = jest.fn(() => ['en']) wrapper = await Wrapper() - const allLanguagesButton = wrapper.find( - '.languages-filter .sidebar .base-button', - ) + const allLanguagesButton = wrapper.find('.languages-filter .sidebar .base-button') allLanguagesButton.trigger('click') expect(mutations['posts/RESET_LANGUAGES']).toHaveBeenCalledTimes(1) }) diff --git a/webapp/components/_new/generic/LabeledButton/LabeledButton.story.js b/webapp/components/_new/generic/LabeledButton/LabeledButton.story.js index 9a22ab427..b0f13b885 100644 --- a/webapp/components/_new/generic/LabeledButton/LabeledButton.story.js +++ b/webapp/components/_new/generic/LabeledButton/LabeledButton.story.js @@ -2,6 +2,8 @@ import { storiesOf } from '@storybook/vue' import helpers from '~/storybook/helpers' import LabeledButton from './LabeledButton.vue' +helpers.init() + storiesOf('Generic/LabeledButton', module) .addDecorator(helpers.layout) .add('default', () => ({ @@ -13,22 +15,7 @@ storiesOf('Generic/LabeledButton', module) - `, - })) - - .add('filled', () => ({ - components: { LabeledButton }, - data: () => ({ - filled: true, - }), - template: ` - `,