aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-05 15:26:28 +0200
committerChocobozzz <me@florianbigard.com>2021-05-05 15:26:28 +0200
commitb31d72625dd32143a45277528b90bb67a881f249 (patch)
tree7721accc994121de668933672a3d51b892e3cb77 /server/tests
parent7a22a0a56aa75fbb1ba986a5d2c606e1343f30c2 (diff)
downloadPeerTube-b31d72625dd32143a45277528b90bb67a881f249.tar.gz
PeerTube-b31d72625dd32143a45277528b90bb67a881f249.tar.zst
PeerTube-b31d72625dd32143a45277528b90bb67a881f249.zip
Plugin user.getAuthUser is now async
So we can load the full user
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/fixtures/peertube-plugin-test-four/main.js5
-rw-r--r--server/tests/plugins/plugin-helpers.ts1
2 files changed, 4 insertions, 2 deletions
diff --git a/server/tests/fixtures/peertube-plugin-test-four/main.js b/server/tests/fixtures/peertube-plugin-test-four/main.js
index 6ed0c20d2..b9b207b81 100644
--- a/server/tests/fixtures/peertube-plugin-test-four/main.js
+++ b/server/tests/fixtures/peertube-plugin-test-four/main.js
@@ -88,8 +88,8 @@ async function register ({
88 return res.json({ routerRoute }) 88 return res.json({ routerRoute })
89 }) 89 })
90 90
91 router.get('/user', (req, res) => { 91 router.get('/user', async (req, res) => {
92 const user = peertubeHelpers.user.getAuthUser(res) 92 const user = await peertubeHelpers.user.getAuthUser(res)
93 if (!user) return res.sendStatus(404) 93 if (!user) return res.sendStatus(404)
94 94
95 const isAdmin = user.role === 0 95 const isAdmin = user.role === 0
@@ -98,6 +98,7 @@ async function register ({
98 98
99 return res.json({ 99 return res.json({
100 username: user.username, 100 username: user.username,
101 displayName: user.Account.name,
101 isAdmin, 102 isAdmin,
102 isModerator, 103 isModerator,
103 isUser 104 isUser
diff --git a/server/tests/plugins/plugin-helpers.ts b/server/tests/plugins/plugin-helpers.ts
index 20020ec41..f72de8229 100644
--- a/server/tests/plugins/plugin-helpers.ts
+++ b/server/tests/plugins/plugin-helpers.ts
@@ -133,6 +133,7 @@ describe('Test plugin helpers', function () {
133 }) 133 })
134 134
135 expect(res.body.username).to.equal('root') 135 expect(res.body.username).to.equal('root')
136 expect(res.body.displayName).to.equal('root')
136 expect(res.body.isAdmin).to.be.true 137 expect(res.body.isAdmin).to.be.true
137 expect(res.body.isModerator).to.be.false 138 expect(res.body.isModerator).to.be.false
138 expect(res.body.isUser).to.be.false 139 expect(res.body.isUser).to.be.false