From 7926cb39ba58561533833a332c81750b5a137133 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Tue, 17 Sep 2019 08:50:22 +0200 Subject: [PATCH] Improve English descriptions --- .../src/middleware/hashtags/extractHashtags.spec.js | 4 ++-- backend/src/seed/seed-db.js | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/middleware/hashtags/extractHashtags.spec.js b/backend/src/middleware/hashtags/extractHashtags.spec.js index 0a129682a..739c7de54 100644 --- a/backend/src/middleware/hashtags/extractHashtags.spec.js +++ b/backend/src/middleware/hashtags/extractHashtags.spec.js @@ -8,7 +8,7 @@ describe('extractHashtags', () => { }) describe('searches through links', () => { - it('not `class="hashtag"` but `data-hashtag-id="something"` makes a link a hashtag link', () => { + it('without `class="hashtag"` but `data-hashtag-id="something"`, and extracts the Hashtag to make a Hashtag link', () => { const content = `

{ expect(extractHashtags(content)).toEqual([]) }) - it('ignores hashtag links with not allowed character combinations', () => { + it('ignores hashtag links with unsupported character combinations', () => { // Allowed are all unicode letters '\pL' and all digits '0-9'. There haveto be at least one letter in it. const content = `

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js index 17a20a87d..8c87a3214 100644 --- a/backend/src/seed/seed-db.js +++ b/backend/src/seed/seed-db.js @@ -413,7 +413,7 @@ import { gql } from '../jest/helpers' const mention2 = 'Hey @jenny-rostock, here is another notification for you!' const hashtag1 = - 'See #NaturphilosophieYoga can really help you!' + 'See #NaturphilosophieYoga, it can really help you!' const hashtagAndMention1 = 'The new physics of #QuantenFlussTheorie can explain #QuantumGravity! @peter-lustig got that already. ;-)' const createPostMutation = gql` @@ -470,9 +470,9 @@ import { gql } from '../jest/helpers' authenticatedUser = await dewey.toJson() const mentionInComment1 = - 'I heard @jenny-rostock, practice it since 3 years now.' + 'I heard @jenny-rostock has practiced it for 3 years now.' const mentionInComment2 = - 'Did @peter-lustig told you?' + 'Did @peter-lustig tell you?' const createCommentMutation = gql` mutation($id: ID, $postId: ID!, $content: String!) { CreateComment(id: $id, postId: $postId, content: $content) { @@ -661,21 +661,21 @@ import { gql } from '../jest/helpers' mutate({ mutation: reportMutation, variables: { - description: "I don't like this comment", + description: 'This comment is bigoted', id: 'c1', }, }), mutate({ mutation: reportMutation, variables: { - description: "I don't like this post", + description: 'This post is bigoted', id: 'p1', }, }), mutate({ mutation: reportMutation, variables: { - description: "I don't like this user", + description: 'This user is harassing me with bigoted remarks', id: 'u1', }, }),