aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-07-29 13:46:52 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-07-31 11:35:19 +0200
commit41130b4ce3b925170b03d9d94c46691be66ecf51 (patch)
treea365b72a671d4459b8cd08be89c744988d0a84e9
parent668b7f096ead74d6e7692944a026c936f581dae8 (diff)
downloadPeerTube-41130b4ce3b925170b03d9d94c46691be66ecf51.tar.gz
PeerTube-41130b4ce3b925170b03d9d94c46691be66ecf51.tar.zst
PeerTube-41130b4ce3b925170b03d9d94c46691be66ecf51.zip
Fix tests
-rw-r--r--client/src/app/+my-account/my-account-routing.module.ts2
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts6
-rw-r--r--client/src/app/+my-account/my-account.component.ts2
-rw-r--r--server/tests/api/notifications/moderation-notifications.ts4
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 = [
169 component: MyAccountAbusesListComponent, 169 component: MyAccountAbusesListComponent,
170 data: { 170 data: {
171 meta: { 171 meta: {
172 title: 'My abuses' 172 title: 'My abuse reports'
173 } 173 }
174 } 174 }
175 } 175 }
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 {
42 newFollow: this.i18n('You or your channel(s) has a new follower'), 42 newFollow: this.i18n('You or your channel(s) has a new follower'),
43 commentMention: this.i18n('Someone mentioned you in video comments'), 43 commentMention: this.i18n('Someone mentioned you in video comments'),
44 newInstanceFollower: this.i18n('Your instance has a new follower'), 44 newInstanceFollower: this.i18n('Your instance has a new follower'),
45 autoInstanceFollowing: this.i18n('Your instance auto followed another instance'), 45 autoInstanceFollowing: this.i18n('Your instance automatically followed another instance'),
46 abuseNewMessage: this.i18n('An abuse received a new message'), 46 abuseNewMessage: this.i18n('An abuse report received a new message'),
47 abuseStateChange: this.i18n('One of your abuse has been accepted or rejected by moderators') 47 abuseStateChange: this.i18n('One of your abuse reports has been accepted or rejected by moderators')
48 } 48 }
49 this.notificationSettingKeys = Object.keys(this.labelNotifications) as (keyof UserNotificationSetting)[] 49 this.notificationSettingKeys = Object.keys(this.labelNotifications) as (keyof UserNotificationSetting)[]
50 50
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 {
95 iconName: 'peertube-x' 95 iconName: 'peertube-x'
96 }, 96 },
97 { 97 {
98 label: this.i18n('My abuses'), 98 label: this.i18n('My abuse reports'),
99 routerLink: '/my-account/abuses', 99 routerLink: '/my-account/abuses',
100 iconName: 'flag' 100 iconName: 'flag'
101 }, 101 },
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 () {
267 await addAbuseMessage(servers[0].url, servers[0].accessToken, abuseId, message) 267 await addAbuseMessage(servers[0].url, servers[0].accessToken, abuseId, message)
268 await waitJobs(servers) 268 await waitJobs(servers)
269 269
270 await checkNewAbuseMessage(baseParamsAdmin, abuseId, message, 'admin1@example.com', 'absence') 270 await checkNewAbuseMessage(baseParamsAdmin, abuseId, message, 'admin' + servers[0].internalServerNumber + '@example.com', 'absence')
271 }) 271 })
272 272
273 it('Should send a notification to moderators', async function () { 273 it('Should send a notification to moderators', async function () {
@@ -277,7 +277,7 @@ describe('Test moderation notifications', function () {
277 await addAbuseMessage(servers[0].url, userAccessToken, abuseId2, message) 277 await addAbuseMessage(servers[0].url, userAccessToken, abuseId2, message)
278 await waitJobs(servers) 278 await waitJobs(servers)
279 279
280 await checkNewAbuseMessage(baseParamsAdmin, abuseId2, message, 'admin1@example.com', 'presence') 280 await checkNewAbuseMessage(baseParamsAdmin, abuseId2, message, 'admin' + servers[0].internalServerNumber + '@example.com', 'presence')
281 }) 281 })
282 282
283 it('Should not send a notification to reporter if sent by the reporter', async function () { 283 it('Should not send a notification to reporter if sent by the reporter', async function () {