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

Merge branch '5059-groups/5385-webapp-post-in-group' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp

Browse Source
This commit is contained in:
Wolfgang Huß 2022-10-19 19:15:40 +02:00
commit d2238269d1
5 changed files with 135 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/ContributionForm/ContributionForm.spec.js
View File

@ -138,6 +138,7 @@ describe('ContributionForm.vue', () => {
categoryIds: [],
id: null,
image: null,
groupId: null,
},
}
postTitleInput = wrapper.find('.ds-input')
@ -260,6 +261,7 @@ describe('ContributionForm.vue', () => {
content: propsData.contribution.content,
categoryIds: [],
id: propsData.contribution.id,
groupId: null,
image: {
sensitive: false,
},

67
webapp/pages/group/_id/_slug.spec.js
View File

@ -8,8 +8,8 @@ localVue.filter('date', (d) => d)
config.stubs['client-only'] = '<span><slot /></span>'
config.stubs['v-popover'] = '<span><slot /></span>'
config.stubs['nuxt-link'] = '<span><slot /></span>'
// config.stubs['infinite-loading'] = '<span><slot /></span>'
// config.stubs['follow-list'] = '<span><slot /></span>'
config.stubs['infinite-loading'] = '<span><slot /></span>'
config.stubs['follow-list'] = '<span><slot /></span>'
describe('GroupProfileSlug', () => {
let wrapper
@ -196,10 +196,11 @@ describe('GroupProfileSlug', () => {
})
describe('mount', () => {
Wrapper = () => {
Wrapper = (data = () => {}) => {
return mount(GroupProfileSlug, {
mocks,
localVue,
data,
})
}
@ -213,8 +214,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...yogaPractice,
@ -222,6 +223,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -365,8 +367,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...yogaPractice,
@ -374,6 +376,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -477,8 +480,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...yogaPractice,
@ -486,6 +489,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -589,8 +593,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...yogaPractice,
@ -598,6 +602,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -705,8 +710,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...schoolForCitizens,
@ -714,6 +719,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -821,8 +827,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...schoolForCitizens,
@ -830,6 +836,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -937,8 +944,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...schoolForCitizens,
@ -946,6 +953,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -1053,8 +1061,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...schoolForCitizens,
@ -1062,6 +1070,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -1173,8 +1182,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...investigativeJournalism,
@ -1182,6 +1191,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -1292,8 +1302,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...investigativeJournalism,
@ -1301,6 +1311,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -1411,8 +1422,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...investigativeJournalism,
@ -1420,6 +1431,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})
@ -1518,8 +1530,8 @@ describe('GroupProfileSlug', () => {
'auth/isModerator': () => false,
},
}
wrapper = Wrapper()
wrapper.setData({
wrapper = Wrapper(() => {
return {
Group: [
{
...investigativeJournalism,
@ -1527,6 +1539,7 @@ describe('GroupProfileSlug', () => {
},
],
GroupMembers: [peterLustig, jennyRostock, bobDerBaumeister, huey],
}
})
})

0
webapp/pages/post/_id.spec.js → webapp/pages/post/_id.spec.js.old
View File

4
webapp/pages/post/_id/_slug/index.spec.js
View File

@ -56,6 +56,10 @@ describe('PostSlug', () => {
},
$route: {
hash: '',
params: {
slug: 'slug',
id: 'id',
},
},
// If you are mocking the router, then don't use VueRouter with localVue: https://vue-test-utils.vuejs.org/guides/using-with-vue-router.html
$router: {

5
webapp/pages/post/create.spec.js
View File

@ -11,6 +11,11 @@ describe('create.vue', () => {
$env: {
CATEGORIES_ACTIVE: false,
},
$route: {
query: {
groupId: null,
},
},
}
describe('mount', () => {