From 6099a986c92545c8ec10638ccf0f3098469d3f3e Mon Sep 17 00:00:00 2001 From: Matt Rider Date: Wed, 14 Aug 2019 14:29:35 +0200 Subject: [PATCH] Improve English, update case for English translations --- .../blocked-users/Blocking.feature | 50 +++++++++---------- .../blocked-users/Content.feature | 26 +++++----- webapp/locales/en.json | 5 +- 3 files changed, 40 insertions(+), 41 deletions(-) diff --git a/cypress/integration/user_profile/blocked-users/Blocking.feature b/cypress/integration/user_profile/blocked-users/Blocking.feature index 6a106fc9e..07d84d7bf 100644 --- a/cypress/integration/user_profile/blocked-users/Blocking.feature +++ b/cypress/integration/user_profile/blocked-users/Blocking.feature @@ -1,36 +1,36 @@ Feature: Block a User As a user I'd like to have a button to block another user - To prevent him to see and interact with my contributions and also to avoid to see his/her posts + To prevent him from seeing and interacting with my contributions and also to avoid seeing his/her posts Background: Given I have a user account And there is an annoying user called "Spammy Spammer" And I am logged in - Scenario: Block a user - Given I am on the profile page of the annoying user - When I click on "Block User" from the content menu in the user info box - And I navigate to my "Blocked users" settings page - Then I can see the following table: - | Avatar | Name | - | | Spammy Spammer | + Scenario: Block a user + Given I am on the profile page of the annoying user + When I click on "Block User" from the content menu in the user info box + And I navigate to my "Blocked users" settings page + Then I can see the following table: + | Avatar | Name | + | | Spammy Spammer | - Scenario: Block a previously followed user - Given I follow the user "Spammy Spammer" - And "Spammy Spammer" wrote a post "Spam Spam Spam" - When I visit the profile page of the annoying user - And I click on "Block User" from the content menu in the user info box - Then the list of posts of this user is empty - And nobody is following the user profile anymore + Scenario: Block a previously followed user + Given I follow the user "Spammy Spammer" + And "Spammy Spammer" wrote a post "Spam Spam Spam" + When I visit the profile page of the annoying user + And I click on "Block User" from the content menu in the user info box + Then the list of posts of this user is empty + And nobody is following the user profile anymore - Scenario: Posts of blocked users are filtered from search results - Given "Spammy Spammer" wrote a post "Spam Spam Spam" - When I search for "Spam" - Then I should see the following posts in the select dropdown: - | title | - | Spam Spam Spam | - When I block the user "Spammy Spammer" - And I refresh the page - And I search for "Spam" - Then the search has no results + Scenario: Posts of blocked users are filtered from search results + Given "Spammy Spammer" wrote a post "Spam Spam Spam" + When I search for "Spam" + Then I should see the following posts in the select dropdown: + | title | + | Spam Spam Spam | + When I block the user "Spammy Spammer" + And I refresh the page + And I search for "Spam" + Then the search has no results diff --git a/cypress/integration/user_profile/blocked-users/Content.feature b/cypress/integration/user_profile/blocked-users/Content.feature index 8bbad7e8c..edc0d63b9 100644 --- a/cypress/integration/user_profile/blocked-users/Content.feature +++ b/cypress/integration/user_profile/blocked-users/Content.feature @@ -1,22 +1,22 @@ Feature: Block a User As a user I'd like to have a button to block another user - To prevent him to see and interact with my contributions and also to avoid to see his/her posts + To prevent him from seeing and interacting with my contributions and also to avoid seeing his/her posts Background: Given I have a user account And there is an annoying user called "Spammy Spammer" - Scenario Outline: Blocked users cannot see each others posts - Given "Spammy Spammer" wrote a post "Spam Spam Spam" - And I wrote a post "I hate spammers" - And I block the user "Spammy Spammer" - When I log in with: - | Email | Password | - | | | - Then I see only one post with the title "" - Examples: - | email | password | expected_title | - | peterpan@example.org | 1234 | I hate spammers | - | spammy-spammer@example.org | 1234 | Spam Spam Spam | + Scenario Outline: Blocked users cannot see each others posts + Given "Spammy Spammer" wrote a post "Spam Spam Spam" + And I wrote a post "I hate spammers" + And I block the user "Spammy Spammer" + When I log in with: + | Email | Password | + | | | + Then I see only one post with the title "" + Examples: + | email | password | expected_title | + | peterpan@example.org | 1234 | I hate spammers | + | spammy-spammer@example.org | 1234 | Spam Spam Spam | diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 03724e7cf..a045352db 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -199,7 +199,6 @@ "search": "Posts of blocked people disappear from your search results.", "notifications": "Blocked users will no longer receive notifications if they are mentioned in your posts.", "closing": "This should be sufficient for now so that blocked users can no longer bother you." - }, "columns": { "name": "Name", @@ -207,8 +206,8 @@ }, "empty": "So far, you have not blocked anybody.", "how-to": "You can block other users on their profile page via the content menu.", - "block": "Block User", - "unblock": "Unblock User" + "block": "Block user", + "unblock": "Unblock user" } }, "admin": {