aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-11-27 10:13:31 +0100
committerChocobozzz <me@florianbigard.com>2019-11-27 10:29:27 +0100
commit2fa9c40e20ce386c9cdedd219f0753e14bda332a (patch)
tree0d21e3509fdba6134311e9b625ac6fdbb95e7447
parenta18bb55e9b72664dff4043785842d6d406dd15a3 (diff)
downloadPeerTube-2fa9c40e20ce386c9cdedd219f0753e14bda332a.tar.gz
PeerTube-2fa9c40e20ce386c9cdedd219f0753e14bda332a.tar.zst
PeerTube-2fa9c40e20ce386c9cdedd219f0753e14bda332a.zip
Fix tests
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts2
-rw-r--r--server/lib/activitypub/actor.ts2
-rw-r--r--server/tests/api/server/reverse-proxy.ts8
3 files changed, 8 insertions, 4 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 5f23c80a2..1f6751297 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -36,7 +36,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
36 super() 36 super()
37 37
38 this.resolutions = [ 38 this.resolutions = [
39 { 39 {
40 id: '0p', 40 id: '0p',
41 label: this.i18n('Audio-only') 41 label: this.i18n('Audio-only')
42 }, 42 },
diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts
index 14dd1b9b9..f802658cf 100644
--- a/server/lib/activitypub/actor.ts
+++ b/server/lib/activitypub/actor.ts
@@ -177,7 +177,7 @@ async function updateActorAvatarInstance (actor: MActorDefault, info: AvatarInfo
177 177
178 if (actor.Avatar) { 178 if (actor.Avatar) {
179 // Don't update the avatar if the filename did not change 179 // Don't update the avatar if the filename did not change
180 if (actor.Avatar.filename === info.name) return actor 180 if (actor.Avatar.fileUrl === info.fileUrl) return actor
181 181
182 try { 182 try {
183 await actor.Avatar.destroy({ transaction: t }) 183 await actor.Avatar.destroy({ transaction: t })
diff --git a/server/tests/api/server/reverse-proxy.ts b/server/tests/api/server/reverse-proxy.ts
index 39b9fecc0..b6b33a884 100644
--- a/server/tests/api/server/reverse-proxy.ts
+++ b/server/tests/api/server/reverse-proxy.ts
@@ -103,8 +103,12 @@ describe('Test application behind a reverse proxy', function () {
103 }) 103 })
104 104
105 it('Should rate limit signup', async function () { 105 it('Should rate limit signup', async function () {
106 for (let i = 0; i < 3; i++) { 106 for (let i = 0; i < 10; i++) {
107 await registerUser(server.url, 'test' + i, 'password') 107 try {
108 await registerUser(server.url, 'test' + i, 'password')
109 } catch {
110 // empty
111 }
108 } 112 }
109 113
110 await registerUser(server.url, 'test42', 'password', 429) 114 await registerUser(server.url, 'test42', 'password', 429)