From 0883b3245bf0deb9106c4041e9afbd3521b79280 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 19 Apr 2018 11:01:34 +0200 Subject: Add ability to choose what policy we have for NSFW videos There is a global instance setting and a per user setting --- server/tests/api/users/users.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'server/tests/api/users/users.ts') diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index b6ab4f660..1192ef9e4 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts @@ -168,7 +168,7 @@ describe('Test users', function () { expect(user.username).to.equal('user_1') expect(user.email).to.equal('user_1@example.com') - expect(user.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') expect(user.videoQuota).to.equal(2 * 1024 * 1024) expect(user.roleLabel).to.equal('User') expect(user.id).to.be.a('number') @@ -215,12 +215,12 @@ describe('Test users', function () { const user = users[ 0 ] expect(user.username).to.equal('user_1') expect(user.email).to.equal('user_1@example.com') - expect(user.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') const rootUser = users[ 1 ] expect(rootUser.username).to.equal('root') expect(rootUser.email).to.equal('admin1@example.com') - expect(rootUser.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') userId = user.id }) @@ -239,7 +239,7 @@ describe('Test users', function () { expect(user.username).to.equal('root') expect(user.email).to.equal('admin1@example.com') expect(user.roleLabel).to.equal('Administrator') - expect(user.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') }) it('Should list only the first user by username desc', async function () { @@ -254,7 +254,7 @@ describe('Test users', function () { const user = users[ 0 ] expect(user.username).to.equal('user_1') expect(user.email).to.equal('user_1@example.com') - expect(user.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') }) it('Should list only the second user by createdAt desc', async function () { @@ -269,7 +269,7 @@ describe('Test users', function () { const user = users[ 0 ] expect(user.username).to.equal('user_1') expect(user.email).to.equal('user_1@example.com') - expect(user.displayNSFW).to.be.false + expect(user.nsfwPolicy).to.equal('display') }) it('Should list all the users by createdAt asc', async function () { @@ -283,11 +283,11 @@ describe('Test users', function () { expect(users[ 0 ].username).to.equal('root') expect(users[ 0 ].email).to.equal('admin1@example.com') - expect(users[ 0 ].displayNSFW).to.be.false + expect(users[ 0 ].nsfwPolicy).to.equal('display') expect(users[ 1 ].username).to.equal('user_1') expect(users[ 1 ].email).to.equal('user_1@example.com') - expect(users[ 1 ].displayNSFW).to.be.false + expect(users[ 1 ].nsfwPolicy).to.equal('display') }) it('Should update my password', async function () { @@ -305,7 +305,7 @@ describe('Test users', function () { await updateMyUser({ url: server.url, accessToken: accessTokenUser, - displayNSFW: true + nsfwPolicy: 'do_not_list' }) const res = await getMyUserInformation(server.url, accessTokenUser) @@ -313,7 +313,7 @@ describe('Test users', function () { expect(user.username).to.equal('user_1') expect(user.email).to.equal('user_1@example.com') - expect(user.displayNSFW).to.be.ok + expect(user.nsfwPolicy).to.equal('do_not_list') expect(user.videoQuota).to.equal(2 * 1024 * 1024) expect(user.id).to.be.a('number') expect(user.account.description).to.be.null @@ -344,7 +344,7 @@ describe('Test users', function () { expect(user.username).to.equal('user_1') expect(user.email).to.equal('updated@example.com') - expect(user.displayNSFW).to.be.ok + expect(user.nsfwPolicy).to.equal('do_not_list') expect(user.videoQuota).to.equal(2 * 1024 * 1024) expect(user.id).to.be.a('number') expect(user.account.description).to.be.null @@ -377,7 +377,7 @@ describe('Test users', function () { expect(user.username).to.equal('user_1') expect(user.email).to.equal('updated@example.com') - expect(user.displayNSFW).to.be.ok + expect(user.nsfwPolicy).to.equal('do_not_list') expect(user.videoQuota).to.equal(2 * 1024 * 1024) expect(user.id).to.be.a('number') expect(user.account.description).to.equal('my super description updated') @@ -398,7 +398,7 @@ describe('Test users', function () { expect(user.username).to.equal('user_1') expect(user.email).to.equal('updated2@example.com') - expect(user.displayNSFW).to.be.ok + expect(user.nsfwPolicy).to.equal('do_not_list') expect(user.videoQuota).to.equal(42) expect(user.roleLabel).to.equal('Moderator') expect(user.id).to.be.a('number') -- cgit v1.2.3