IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken tests

Browse Source
This commit is contained in:
mattwr18 2019-11-29 20:49:46 +01:00
parent c088c6eac4
commit 985d53e52b
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cypress/integration/common/report.js
View File

@ -130,7 +130,7 @@ Given('somebody reported the following posts:', table => {
.authenticateAs(submitter) .authenticateAs(submitter)
.mutate(`mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) { .mutate(`mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
fileReport(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) { fileReport(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
type id
} }
}`, { }`, {
resourceId, resourceId,

12
webapp/components/ContentMenu/ContentMenu.spec.js
View File

@ -85,7 +85,7 @@ describe('ContentMenu.vue', () => {
.filter(item => item.text() === 'post.menu.delete') .filter(item => item.text() === 'post.menu.delete')
.at(0) .at(0)
.trigger('click') .trigger('click')
expect(openModalSpy).toHaveBeenCalledWith('delete') expect(openModalSpy).toHaveBeenCalledWith('confirm', 'delete')
}) })
}) })
@ -166,7 +166,7 @@ describe('ContentMenu.vue', () => {
.filter(item => item.text() === 'comment.menu.delete') .filter(item => item.text() === 'comment.menu.delete')
.at(0) .at(0)
.trigger('click') .trigger('click')
expect(openModalSpy).toHaveBeenCalledWith('delete') expect(openModalSpy).toHaveBeenCalledWith('confirm', 'delete')
}) })
}) })
@ -332,7 +332,7 @@ describe('ContentMenu.vue', () => {
.filter(item => item.text() === 'release.contribution.title') .filter(item => item.text() === 'release.contribution.title')
.at(0) .at(0)
.trigger('click') .trigger('click')
expect(openModalSpy).toHaveBeenCalledWith('release', 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8') expect(openModalSpy).toHaveBeenCalledWith('release')
}) })
it('can release comments', () => { it('can release comments', () => {
@ -350,7 +350,7 @@ describe('ContentMenu.vue', () => {
.filter(item => item.text() === 'release.comment.title') .filter(item => item.text() === 'release.comment.title')
.at(0) .at(0)
.trigger('click') .trigger('click')
expect(openModalSpy).toHaveBeenCalledWith('release', 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8') expect(openModalSpy).toHaveBeenCalledWith('release')
}) })
it('can release users', () => { it('can release users', () => {
@ -368,7 +368,7 @@ describe('ContentMenu.vue', () => {
.filter(item => item.text() === 'release.user.title') .filter(item => item.text() === 'release.user.title')
.at(0) .at(0)
.trigger('click') .trigger('click')
expect(openModalSpy).toHaveBeenCalledWith('release', 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8') expect(openModalSpy).toHaveBeenCalledWith('release')
}) })
it('can release organizations', () => { it('can release organizations', () => {
@ -386,7 +386,7 @@ describe('ContentMenu.vue', () => {
.filter(item => item.text() === 'release.organization.title') .filter(item => item.text() === 'release.organization.title')
.at(0) .at(0)
.trigger('click') .trigger('click')
expect(openModalSpy).toHaveBeenCalledWith('release', 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8') expect(openModalSpy).toHaveBeenCalledWith('release')
}) })
}) })

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

@ -64,9 +64,9 @@ describe('DropdownFilter.vue', () => {
expect(unreadLink.text()).toEqual('Unread') expect(unreadLink.text()).toEqual('Unread')
}) })
it('clicking on menu item emits filterNotifications', () => { it('clicking on menu item emits filter', () => {
allLink.trigger('click') allLink.trigger('click')
expect(wrapper.emitted().filterNotifications[0]).toEqual( expect(wrapper.emitted().filter[0]).toEqual(
propsData.filterOptions.filter(option => option.label === 'All'), propsData.filterOptions.filter(option => option.label === 'All'),
) )
}) })

4
webapp/components/DropdownFilter/DropdownFilter.story.js
View File

@ -20,10 +20,10 @@ storiesOf('DropdownFilter', module)
selected: filterOptions[0].label, selected: filterOptions[0].label,
}), }),
methods: { methods: {
filterNotifications: action('filterNotifications'), filter: action('filter'),
}, },
template: `<dropdown-filter template: `<dropdown-filter
@filterNotifications="filterNotifications" @filter="filter"
:filterOptions="filterOptions" :filterOptions="filterOptions"
:selected="selected" :selected="selected"
/>`, />`,

1
webapp/components/_new/generic/ReportsTable/ReportsTable.vue
View File

@ -64,7 +64,6 @@
params: params(report.resource), params: params(report.resource),
hash: hashParam(report.resource), hash: hashParam(report.resource),
}" }"
@click.native="markNotificationAsRead(report.resource.id)"
> >
<b>{{ report.resource.title || report.resource.contentExcerpt | truncate(50) }}</b> <b>{{ report.resource.title || report.resource.contentExcerpt | truncate(50) }}</b>
</nuxt-link> </nuxt-link>

4
webapp/pages/notifications/index.spec.js
View File

@ -71,7 +71,7 @@ describe('PostIndex', () => {
} }
}) })
describe('filterNotifications', () => { describe('filter', () => {
beforeEach(() => { beforeEach(() => {
propsData.filterOptions = [ propsData.filterOptions = [
{ label: 'All', value: null }, { label: 'All', value: null },
@ -79,7 +79,7 @@ describe('PostIndex', () => {
{ label: 'Unread', value: false }, { label: 'Unread', value: false },
] ]
wrapper = Wrapper() wrapper = Wrapper()
wrapper.find(DropdownFilter).vm.$emit('filterNotifications', propsData.filterOptions[1]) wrapper.find(DropdownFilter).vm.$emit('filter', propsData.filterOptions[1])
}) })
it('sets `notificationRead` to value of received option', () => { it('sets `notificationRead` to value of received option', () => {