wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-06 13:41:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into new-regexp-highlighter

Browse Source
This commit is contained in:
Wyatt Johnson
2017-09-14 08:47:40 -06:00
committed by GitHub
parent 76a6a0e82b fce65e616d
commit b3eb3361bb
5 changed files with 95 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/server/routes/api/assets/index.js
+66 -42
View File
@@ -37,78 +37,88 @@ describe('/api/v1/assets', () => {
describe('#get', () => {
it('should return all assets without a search query', async () => {
const res = await chai.request(app)
.get('/api/v1/assets')
.set(passport.inject({roles: ['ADMIN']}));
for (const role of ['ADMIN', 'MODERATOR']) {
const res = await chai.request(app)
.get('/api/v1/assets')
.set(passport.inject({roles: [role]}));
const body = res.body;
const body = res.body;
expect(body).to.have.property('count', 2);
expect(body).to.have.property('result');
expect(body).to.have.property('count', 2);
expect(body).to.have.property('result');
const assets = body.result;
const assets = body.result;
expect(assets).to.have.length(2);
expect(assets).to.have.length(2);
}
});
it('should return assets that we search for', async () => {
const res = await chai.request(app)
.get('/api/v1/assets?search=term2')
.set(passport.inject({roles: ['ADMIN']}));
for (const role of ['ADMIN', 'MODERATOR']) {
const res = await chai.request(app)
.get('/api/v1/assets?search=term2')
.set(passport.inject({roles: [role]}));
const body = res.body;
const body = res.body;
expect(body).to.have.property('count', 1);
expect(body).to.have.property('result');
expect(body).to.have.property('count', 1);
expect(body).to.have.property('result');
const assets = body.result;
const assets = body.result;
expect(assets).to.have.length(1);
expect(assets).to.have.length(1);
const asset = assets[0];
const asset = assets[0];
expect(asset).to.have.property('url', 'https://coralproject.net/news/asset2');
expect(asset).to.have.property('title', 'Asset 2');
expect(asset).to.have.property('url', 'https://coralproject.net/news/asset2');
expect(asset).to.have.property('title', 'Asset 2');
}
});
it('should not return assets that we do not search for', async () => {
const res = await chai.request(app)
.get('/api/v1/assets?search=term3')
.set(passport.inject({roles: ['ADMIN']}));
const body = res.body;
for (const role of ['ADMIN', 'MODERATOR']) {
const res = await chai.request(app)
.get('/api/v1/assets?search=term3')
.set(passport.inject({roles: [role]}));
const body = res.body;
expect(body).to.have.property('count', 0);
expect(body).to.have.property('result');
expect(body).to.have.property('count', 0);
expect(body).to.have.property('result');
expect(body.result).to.be.empty;
expect(body.result).to.be.empty;
}
});
it('should return only closed assets', async () => {
const res = await chai.request(app)
.get('/api/v1/assets?filter=closed')
.set(passport.inject({roles: ['ADMIN']}));
const body = res.body;
for (const role of ['ADMIN', 'MODERATOR']) {
const res = await chai.request(app)
.get('/api/v1/assets?filter=closed')
.set(passport.inject({roles: [role]}));
const body = res.body;
expect(body).to.have.property('count', 1);
expect(body).to.have.property('result');
expect(body).to.have.property('count', 1);
expect(body).to.have.property('result');
const assets = body.result;
const assets = body.result;
expect(assets[0]).to.have.property('title', 'Asset 1');
expect(assets[0]).to.have.property('title', 'Asset 1');
}
});
it('should return only opened assets', async () => {
const res = await chai.request(app)
.get('/api/v1/assets?filter=open')
.set(passport.inject({roles: ['ADMIN']}));
const body = res.body;
for (const role of ['ADMIN', 'MODERATOR']) {
const res = await chai.request(app)
.get('/api/v1/assets?filter=open')
.set(passport.inject({roles: [role]}));
const body = res.body;
expect(body).to.have.property('count', 1);
expect(body).to.have.property('result');
expect(body).to.have.property('count', 1);
expect(body).to.have.property('result');
const assets = body.result;
const assets = body.result;
expect(assets[0]).to.have.property('title', 'Asset 2');
expect(assets[0]).to.have.property('title', 'Asset 2');
}
});
});
@@ -133,6 +143,20 @@ describe('/api/v1/assets', () => {
expect(closedAsset).to.have.property('isClosed', true);
expect(closedAsset).to.have.property('closedAt').and.to.not.equal(null);
});
it('should require ADMIN role', async () => {
const today = Date.now();
const asset = await AssetsService.findOrCreateByUrl('http://test.com');
expect(asset).to.have.property('isClosed', false);
expect(asset).to.have.property('closedAt', null);
const promise = chai.request(app)
.put(`/api/v1/assets/${asset.id}/status`)
.set(passport.inject({roles: ['MODERATOR']}))
.send({closedAt: today});
await expect(promise).to.eventually.be.rejected;
});
});
});
test/server/routes/api/settings/index.js
+19 -11
View File
@@ -16,17 +16,17 @@ describe('/api/v1/settings', () => {
describe('#get', () => {
it('should return a settings object', () => {
return chai.request(app)
.get('/api/v1/settings')
.set(passport.inject({
roles: ['ADMIN']
}))
.then((res) => {
expect(res).to.have.status(200);
expect(res).to.be.json;
expect(res.body).to.have.property('moderation', 'PRE');
});
it('should return a settings object', async () => {
for (let role of ['ADMIN', 'MODERATOR']) {
const res = await chai.request(app)
.get('/api/v1/settings')
.set(passport.inject({
roles: [role]
}));
expect(res).to.have.status(200);
expect(res).to.be.json;
expect(res.body).to.have.property('moderation', 'PRE');
}
});
});
@@ -46,6 +46,14 @@ describe('/api/v1/settings', () => {
expect(settings).to.have.property('moderation', 'POST');
});
});
it('should require ADMIN role', () => {
const promise = chai.request(app)
.put('/api/v1/settings')
.set(passport.inject({roles: ['MODERATOR']}))
.send({moderation: 'POST'});
return expect(promise).to.eventually.be.rejected;
});
});
});