ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace last instance of ds-button with base-button

Browse Source
This commit is contained in:
Alina Beck 2020-01-15 16:13:47 +03:00
parent fcbe6125f3
commit eaf738c12b
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/FilterPosts/FilterPosts.spec.js
View File

@ -150,7 +150,7 @@ describe('FilterPosts.vue', () => {
describe('click on an "emotions-buttons" button', () => { describe('click on an "emotions-buttons" button', () => {
it('calls TOGGLE_EMOTION when clicked', () => { it('calls TOGGLE_EMOTION when clicked', () => {
const wrapper = openFilterPosts() const wrapper = openFilterPosts()
happyEmotionButton = wrapper.findAll('button.emotions-buttons').at(1) happyEmotionButton = wrapper.findAll('.emotion-button .base-button').at(1)
happyEmotionButton.trigger('click') happyEmotionButton.trigger('click')
expect(mutations['posts/TOGGLE_EMOTION']).toHaveBeenCalledWith({}, 'happy') expect(mutations['posts/TOGGLE_EMOTION']).toHaveBeenCalledWith({}, 'happy')
}) })
@ -158,7 +158,7 @@ describe('FilterPosts.vue', () => {
it('sets the attribute `src` to colorized image', () => { it('sets the attribute `src` to colorized image', () => {
getters['posts/filteredByEmotions'] = jest.fn(() => ['happy']) getters['posts/filteredByEmotions'] = jest.fn(() => ['happy'])
const wrapper = openFilterPosts() const wrapper = openFilterPosts()
happyEmotionButton = wrapper.findAll('button.emotions-buttons').at(1) happyEmotionButton = wrapper.findAll('.emotion-button .base-button').at(1)
const happyEmotionButtonImage = happyEmotionButton.find('img') const happyEmotionButtonImage = happyEmotionButton.find('img')
expect(happyEmotionButtonImage.attributes().src).toEqual('/img/svg/emoji/happy_color.svg') expect(happyEmotionButtonImage.attributes().src).toEqual('/img/svg/emoji/happy_color.svg')
}) })

2
webapp/components/generic/SearchableInput/SearchableInput.spec.js
View File

@ -32,7 +32,7 @@ describe('SearchableInput.vue', () => {
} }
describe('mount', () => { describe('mount', () => {
let select, dropdown let select
beforeEach(() => { beforeEach(() => {
select = wrapper.find('.ds-select') select = wrapper.find('.ds-select')

6
webapp/components/generic/SearchableInput/SearchableInput.vue
View File

@ -1,9 +1,5 @@
<template> <template>
<div <div class="searchable-input" aria-label="search" role="search">
class="searchable-input"
aria-label="search"
role="search"
>
<ds-select <ds-select
type="search" type="search"
icon="search" icon="search"

7
webapp/pages/post/_id/_slug/index.vue
View File

@ -12,7 +12,12 @@
> >
<aside v-show="post.imageBlurred" class="blur-toggle"> <aside v-show="post.imageBlurred" class="blur-toggle">
<img v-show="blurred" :src="post.image | proxyApiUrl" class="preview" /> <img v-show="blurred" :src="post.image | proxyApiUrl" class="preview" />
<ds-button :icon="blurred ? 'eye' : 'eye-slash'" primary @click="blurred = !blurred" /> <base-button
:icon="blurred ? 'eye' : 'eye-slash'"
filled
circle
@click="blurred = !blurred"
/>
</aside> </aside>
<hc-user :user="post.author" :date-time="post.createdAt"> <hc-user :user="post.author" :date-time="post.createdAt">
<template v-slot:dateTime> <template v-slot:dateTime>