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 'master' into 17-Admin-Remove-user-profile

Browse Source
This commit is contained in:
Alexander Friedland 2020-08-14 17:23:16 +02:00 committed by GitHub
commit 6d856a3edc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 196 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
backend/src/schema/resolvers/users.spec.js
View File

@ -6,11 +6,13 @@ import { createTestClient } from 'apollo-server-testing'
const categoryIds = ['cat9']
let user
let anotherUser
let moderator
let admin
let authenticatedUser
let query
let mutate
let authenticatedUser
let variables
const driver = getDriver()
@ -65,18 +67,21 @@ beforeEach(async () => {
describe('User', () => {
describe('query by email address', () => {
beforeEach(async () => {
await Factory.build('user', { name: 'Johnny' }, { email: 'any-email-address@example.org' })
})
let userQuery
const userQuery = gql`
beforeEach(async () => {
userQuery = gql`
query($email: String) {
User(email: $email) {
name
}
}
`
variables = { email: 'any-email-address@example.org' }
variables = {
email: 'any-email-address@example.org',
}
await Factory.build('user', { name: 'Johnny' }, { email: 'any-email-address@example.org' })
})
it('is forbidden', async () => {
await expect(query({ query: userQuery, variables })).resolves.toMatchObject({
@ -125,16 +130,10 @@ describe('User', () => {
})
describe('UpdateUser', () => {
let variables
let updateUserMutation
beforeEach(async () => {
variables = {
id: 'u47',
name: 'John Doughnut',
}
})
const updateUserMutation = gql`
updateUserMutation = gql`
mutation(
$id: ID!
$name: String
@ -155,8 +154,11 @@ describe('UpdateUser', () => {
}
}
`
variables = {
id: 'u47',
name: 'John Doughnut',
}
beforeEach(async () => {
user = await Factory.build(
'user',
{
@ -288,6 +290,8 @@ describe('Delete a User as admin', () => {
describe('authenticated as Admin', () => {
beforeEach(async () => {
admin = await Factory.build(
'user',
{
role: 'admin',
@ -453,6 +457,7 @@ describe('Delete a User as admin', () => {
await expect(neode.all('SocialMedia')).resolves.toHaveLength(1)
await mutate({ mutation: deleteUserMutation, variables })
await expect(neode.all('SocialMedia')).resolves.toHaveLength(0)
})
})
})

77
webapp/components/CommentList/CommentList.spec.js
View File

@ -1,6 +1,5 @@
import { config, mount } from '@vue/test-utils'
import CommentList from './CommentList'
import CommentCard from '~/components/CommentCard/CommentCard'
import Vuex from 'vuex'
import Vue from 'vue'
@ -26,6 +25,23 @@ describe('CommentList.vue', () => {
id: 'comment134',
contentExcerpt: 'this is a comment',
content: 'this is a comment',
author: {
id: 'some-user',
slug: 'some-slug',
},
},
{
id: 'comment135',
contentExcerpt: 'this is a deleted comment',
content: 'this is a deleted comment',
deleted: true,
author: { id: 'some-user' },
},
{
id: 'comment136',
contentExcerpt: 'this is a disabled comment',
content: 'this is a disabled comment',
disabled: true,
author: { id: 'some-user' },
},
],
@ -35,7 +51,7 @@ describe('CommentList.vue', () => {
getters: {
'auth/isModerator': () => false,
'auth/user': () => {
return {}
return { id: 'some-user' }
},
},
})
@ -70,7 +86,7 @@ describe('CommentList.vue', () => {
})
}
it('displays a comments counter', () => {
it('displays a comments counter that ignores disabled and deleted comments', () => {
wrapper = Wrapper()
expect(wrapper.find('.count').text()).toEqual('1')
})
@ -101,26 +117,63 @@ describe('CommentList.vue', () => {
})
})
describe('Comment', () => {
describe('Respond to Comment', () => {
beforeEach(() => {
wrapper = Wrapper()
})
it('Comment emitted reply()', () => {
wrapper.find(CommentCard).vm.$emit('reply', {
id: 'commentAuthorId',
slug: 'ogerly',
})
Vue.nextTick()
it('emits reply to comment', () => {
wrapper.find('.reply-button').trigger('click')
expect(wrapper.emitted('reply')).toEqual([
[
{
id: 'commentAuthorId',
slug: 'ogerly',
id: 'some-user',
slug: 'some-slug',
},
],
])
})
})
describe('edit Comment', () => {
beforeEach(() => {
wrapper = Wrapper()
})
it('updates comment after edit', () => {
wrapper.vm.updateCommentList({
id: 'comment134',
contentExcerpt: 'this is an edited comment',
content: 'this is an edited comment',
author: {
id: 'some-user',
slug: 'some-slug',
},
})
expect(wrapper.props('post').comments[0].content).toEqual('this is an edited comment')
})
})
describe('delete Comment', () => {
beforeEach(() => {
wrapper = Wrapper()
})
// TODO: Test does not find .count = 0 but 1. Can't understand why...
it.skip('sets counter to 0', async () => {
wrapper.vm.updateCommentList({
id: 'comment134',
contentExcerpt: 'this is another deleted comment',
content: 'this is an another deleted comment',
deleted: true,
author: {
id: 'some-user',
slug: 'some-slug',
},
})
await Vue.nextTick()
await expect(wrapper.find('.count').text()).toEqual('0')
})
})
})
})

17
webapp/components/CommentList/CommentList.vue
View File

@ -1,12 +1,12 @@
<template>
<div id="comments" class="comment-list">
<h3 class="title">
<counter-icon icon="comments" :count="postComments.length" />
<counter-icon icon="comments" :count="commentsCount" />
{{ $t('common.comment', null, 0) }}
</h3>
<div v-if="postComments" id="comments" class="comments">
<div v-if="post.comments" id="comments" class="comments">
<comment-card
v-for="comment in postComments"
v-for="comment in post.comments"
:key="comment.id"
:comment="comment"
:postId="post.id"
@ -36,8 +36,13 @@ export default {
},
},
computed: {
postComments() {
return (this.post && this.post.comments) || []
commentsCount() {
return (
(this.post &&
this.post.comments &&
this.post.comments.filter((comment) => !comment.deleted && !comment.disabled).length) ||
0
)
},
},
methods: {
@ -48,7 +53,7 @@ export default {
return anchor === '#comments'
},
updateCommentList(updatedComment) {
this.postComments = this.postComments.map((comment) => {
this.post.comments = this.post.comments.map((comment) => {
return comment.id === updatedComment.id ? updatedComment : comment
})
},

58
webapp/components/DeleteData/DeleteData.spec.js
View File

@ -15,12 +15,10 @@ describe('DeleteData.vue', () => {
let enableContributionDeletionCheckbox
let enableCommentDeletionCheckbox
const deleteAccountName = 'Delete MyAccount'
const deleteContributionsMessage = 'Delete my 2 posts'
const deleteCommentsMessage = 'Delete my 3 comments'
beforeEach(() => {
mocks = {
$t: jest.fn(),
$t: jest.fn((a) => a),
$apollo: {
mutate: jest
.fn()
@ -45,7 +43,7 @@ describe('DeleteData.vue', () => {
}
getters = {
'auth/user': () => {
return { id: 'u343', name: deleteAccountName, contributionsCount: 2, commentedCount: 3 }
return { id: 'u343', name: deleteAccountName }
},
}
actions = { 'auth/logout': jest.fn() }
@ -68,15 +66,15 @@ describe('DeleteData.vue', () => {
jest.clearAllMocks()
})
it('defaults to deleteContributions to false', () => {
it('checkbox deleteContributions defaults be false', () => {
expect(wrapper.vm.deleteContributions).toEqual(false)
})
it('defaults to deleteComments to false', () => {
it('checkbox deleteComments defaults be false', () => {
expect(wrapper.vm.deleteComments).toEqual(false)
})
it('defaults to deleteEnabled to false', () => {
it('deleteButton defaults be false', () => {
expect(wrapper.vm.deleteEnabled).toEqual(false)
})
@ -93,7 +91,7 @@ describe('DeleteData.vue', () => {
deleteAccountBtn = wrapper.find('[data-test="delete-button"]')
})
it('if deleteEnabled is true and only deletes user by default', () => {
it('if deleteEnabled is true and only deletes user ', () => {
deleteAccountBtn.trigger('click')
expect(mocks.$apollo.mutate).toHaveBeenCalledWith(
expect.objectContaining({
@ -105,9 +103,28 @@ describe('DeleteData.vue', () => {
)
})
it("deletes user's posts and comments if requested by default ", () => {
enableContributionDeletionCheckbox = wrapper.find(
'[data-test="contributions-deletion-checkbox"]',
)
enableContributionDeletionCheckbox.trigger('click')
enableCommentDeletionCheckbox = wrapper.find('[data-test="comments-deletion-checkbox"]')
enableCommentDeletionCheckbox.trigger('click')
deleteAccountBtn.trigger('click')
expect(mocks.$apollo.mutate).toHaveBeenCalledWith(
expect.objectContaining({
variables: {
id: 'u343',
resource: ['Post', 'Comment'],
},
}),
)
})
it("deletes a user's posts if requested", () => {
mocks.$t.mockImplementation(() => deleteContributionsMessage)
enableContributionDeletionCheckbox = wrapper.findAll('input[type="checkbox"]').at(0)
enableContributionDeletionCheckbox = wrapper.find(
'[data-test="contributions-deletion-checkbox"]',
)
enableContributionDeletionCheckbox.trigger('click')
deleteAccountBtn.trigger('click')
expect(mocks.$apollo.mutate).toHaveBeenCalledWith(
@ -121,8 +138,7 @@ describe('DeleteData.vue', () => {
})
it("deletes a user's comments if requested", () => {
mocks.$t.mockImplementation(() => deleteCommentsMessage)
enableCommentDeletionCheckbox = wrapper.findAll('input[type="checkbox"]').at(1)
enableCommentDeletionCheckbox = wrapper.find('[data-test="comments-deletion-checkbox"]')
enableCommentDeletionCheckbox.trigger('click')
deleteAccountBtn.trigger('click')
expect(mocks.$apollo.mutate).toHaveBeenCalledWith(
@ -135,24 +151,6 @@ describe('DeleteData.vue', () => {
)
})
it("deletes a user's posts and comments if requested", () => {
mocks.$t.mockImplementation(() => deleteContributionsMessage)
enableContributionDeletionCheckbox = wrapper.findAll('input[type="checkbox"]').at(0)
enableContributionDeletionCheckbox.trigger('click')
mocks.$t.mockImplementation(() => deleteCommentsMessage)
enableCommentDeletionCheckbox = wrapper.findAll('input[type="checkbox"]').at(1)
enableCommentDeletionCheckbox.trigger('click')
deleteAccountBtn.trigger('click')
expect(mocks.$apollo.mutate).toHaveBeenCalledWith(
expect.objectContaining({
variables: {
id: 'u343',
resource: ['Post', 'Comment'],
},
}),
)
})
it('shows a success toaster after successful mutation', async () => {
await deleteAccountBtn.trigger('click')
expect(mocks.$toast.success).toHaveBeenCalledTimes(1)

38
webapp/components/DeleteData/DeleteData.vue
View File

@ -14,17 +14,25 @@
<label v-if="currentUser.contributionsCount" class="checkbox">
<input type="checkbox" v-model="deleteContributions" />
{{
$t('settings.deleteUserAccount.contributionsCount', {
count: currentUser.contributionsCount,
})
$t(
'settings.deleteUserAccount.contributionsCount',
{
count: currentUserCounts.contributionsCount,
},
currentUserCounts.contributionsCount,
)
}}
</label>
<label v-if="currentUser.commentedCount" class="checkbox">
<input type="checkbox" v-model="deleteComments" />
<label class="checkbox">
<input type="checkbox" v-model="deleteComments" data-test="comments-deletion-checkbox" />
{{
$t('settings.deleteUserAccount.commentedCount', {
count: currentUser.commentedCount,
})
$t(
'settings.deleteUserAccount.commentedCount',
{
count: currentUserCounts.commentedCount,
},
currentUserCounts.commentedCount,
)
}}
</label>
<section class="warning">
@ -44,8 +52,9 @@
</template>
<script>
import { mapGetters, mapActions } from 'vuex'
import { mapActions, mapGetters } from 'vuex'
import gql from 'graphql-tag'
import { currentUserCountQuery } from '~/graphql/User'
export default {
name: 'DeleteData',
@ -54,8 +63,19 @@ export default {
deleteContributions: false,
deleteComments: false,
enableDeletionValue: null,
currentUserCounts: {},
}
},
apollo: {
currentUser: {
query() {
return currentUserCountQuery()
},
update(currentUser) {
this.currentUserCounts = currentUser.currentUser
},
},
},
computed: {
...mapGetters({
currentUser: 'auth/user',

7
webapp/components/Editor/ContentViewer.vue
View File

@ -39,3 +39,10 @@ export default {
},
}
</script>
<style lang="scss">
.ProseMirror h3,
.ProseMirror h4,
.ProseMirror hr {
margin: 24px 0 8px;
}
</style>

8
webapp/components/Embed/EmbedComponent.vue
View File

@ -24,12 +24,12 @@
<h3>{{ $t('editor.embed.data_privacy_warning') }}</h3>
<ds-text>{{ $t('editor.embed.data_privacy_info') }} {{ embedPublisher }}</ds-text>
<div class="buttons">
<base-button primary @click="allowEmbed()" data-test="play-now-button">
{{ $t('editor.embed.play_now') }}
</base-button>
<base-button @click="closeOverlay()" data-test="cancel-button">
<base-button @click="closeOverlay()" data-test="cancel-button" danger>
{{ $t('actions.cancel') }}
</base-button>
<base-button @click="allowEmbed()" data-test="play-now-button" filled>
{{ $t('editor.embed.play_now') }}
</base-button>
</div>
<label class="checkbox">
<input type="checkbox" v-model="checkedAlwaysAllowEmbeds" />

9
webapp/graphql/User.js
View File

@ -283,3 +283,12 @@ export const currentUserQuery = gql`
}
}
`
export const currentUserCountQuery = () => gql`
${userCountsFragment}
query {
currentUser {
...userCounts
}
}
`

2
webapp/locales/de.json
View File

@ -306,7 +306,7 @@
"editor": {
"embed": {
"always_allow": "Einzubettende Inhalte von Drittanbietern immer erlauben (diese Einstellung ist jederzeit änderbar)",
"data_privacy_info": "Deine Daten wurden noch nicht an Drittanbieter weitergegeben. Wenn Du dieses Video jetzt abspielst, registriert der folgende Anbieter wahrscheinlich Deine Nutzerdaten:",
"data_privacy_info": "Deine Daten wurden noch nicht an Drittanbieter weitergegeben. Wenn Du diesen Inhalt jetzt abspielst, registriert der folgende Anbieter wahrscheinlich Deine Nutzerdaten:",
"data_privacy_warning": "Achte auf Deine Daten!",
"play_now": "Jetzt ansehen"
},

4
webapp/locales/en.json
View File

@ -306,9 +306,9 @@
"editor": {
"embed": {
"always_allow": "Always allow embedded content by third party providers (this setting can be changed any time)",
"data_privacy_info": "Your data has not yet been shared with any third party providers. If you proceed to watch this video the following provider will likely collect user data:",
"data_privacy_info": "Your data has not yet been shared with any third party providers. If you proceed to play this content the following provider will likely collect user data:",
"data_privacy_warning": "Data Privacy Warning!",
"play_now": "Watch now"
"play_now": "Continue"
},
"hashtag": {
"addHashtag": "New hashtag",