From 41130b4ce3b925170b03d9d94c46691be66ecf51 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 29 Jul 2020 13:46:52 +0200
Subject: Fix tests

---
 client/src/app/+my-account/my-account-routing.module.ts             | 2 +-
 .../my-account-notification-preferences.component.ts                | 6 +++---
 client/src/app/+my-account/my-account.component.ts                  | 2 +-
 server/tests/api/notifications/moderation-notifications.ts          | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/src/app/+my-account/my-account-routing.module.ts b/client/src/app/+my-account/my-account-routing.module.ts
index 0a4897d07..48237e133 100644
--- a/client/src/app/+my-account/my-account-routing.module.ts
+++ b/client/src/app/+my-account/my-account-routing.module.ts
@@ -169,7 +169,7 @@ const myAccountRoutes: Routes = [
         component: MyAccountAbusesListComponent,
         data: {
           meta: {
-            title: 'My abuses'
+            title: 'My abuse reports'
           }
         }
       }
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
index 89a04c078..b892ab479 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
@@ -42,9 +42,9 @@ export class MyAccountNotificationPreferencesComponent implements OnInit {
       newFollow: this.i18n('You or your channel(s) has a new follower'),
       commentMention: this.i18n('Someone mentioned you in video comments'),
       newInstanceFollower: this.i18n('Your instance has a new follower'),
-      autoInstanceFollowing: this.i18n('Your instance auto followed another instance'),
-      abuseNewMessage: this.i18n('An abuse received a new message'),
-      abuseStateChange: this.i18n('One of your abuse has been accepted or rejected by moderators')
+      autoInstanceFollowing: this.i18n('Your instance automatically followed another instance'),
+      abuseNewMessage: this.i18n('An abuse report received a new message'),
+      abuseStateChange: this.i18n('One of your abuse reports has been accepted or rejected by moderators')
     }
     this.notificationSettingKeys = Object.keys(this.labelNotifications) as (keyof UserNotificationSetting)[]
 
diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts
index dc2c8f39c..93d000a02 100644
--- a/client/src/app/+my-account/my-account.component.ts
+++ b/client/src/app/+my-account/my-account.component.ts
@@ -95,7 +95,7 @@ export class MyAccountComponent implements OnInit {
           iconName: 'peertube-x'
         },
         {
-          label: this.i18n('My abuses'),
+          label: this.i18n('My abuse reports'),
           routerLink: '/my-account/abuses',
           iconName: 'flag'
         },
diff --git a/server/tests/api/notifications/moderation-notifications.ts b/server/tests/api/notifications/moderation-notifications.ts
index 721a445ab..e7aa5d987 100644
--- a/server/tests/api/notifications/moderation-notifications.ts
+++ b/server/tests/api/notifications/moderation-notifications.ts
@@ -267,7 +267,7 @@ describe('Test moderation notifications', function () {
       await addAbuseMessage(servers[0].url, servers[0].accessToken, abuseId, message)
       await waitJobs(servers)
 
-      await checkNewAbuseMessage(baseParamsAdmin, abuseId, message, 'admin1@example.com', 'absence')
+      await checkNewAbuseMessage(baseParamsAdmin, abuseId, message, 'admin' + servers[0].internalServerNumber + '@example.com', 'absence')
     })
 
     it('Should send a notification to moderators', async function () {
@@ -277,7 +277,7 @@ describe('Test moderation notifications', function () {
       await addAbuseMessage(servers[0].url, userAccessToken, abuseId2, message)
       await waitJobs(servers)
 
-      await checkNewAbuseMessage(baseParamsAdmin, abuseId2, message, 'admin1@example.com', 'presence')
+      await checkNewAbuseMessage(baseParamsAdmin, abuseId2, message, 'admin' + servers[0].internalServerNumber + '@example.com', 'presence')
     })
 
     it('Should not send a notification to reporter if sent by the reporter', async function () {
-- 
cgit v1.2.3