Skip to content

Commit

Permalink
Merge branch 'master' into generator-change-keywords-to-tags
Browse files Browse the repository at this point in the history
  • Loading branch information
jgraff2 committed Aug 17, 2017
2 parents 263bc87 + ac8db62 commit ad4ed5c
Show file tree
Hide file tree
Showing 148 changed files with 3,902 additions and 3,944 deletions.
418 changes: 210 additions & 208 deletions tests/api/v1/admin/rebuildSampleStore.js

Large diffs are not rendered by default.

402 changes: 202 additions & 200 deletions tests/api/v1/aspects/delete.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/api/v1/aspects/deleteTags.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const Aspect = tu.db.Aspect;
const allDeletePath = '/v1/aspects/{key}/tags';
const oneDeletePath = '/v1/aspects/{key}/tags/{akey}';

describe(`api: aspects: DELETE tags}`, () => {
describe('tests/api/v1/aspects/deleteTags.js >', () => {
let token;
let aspId;
const tag0 = 'tag0';
Expand Down
2 changes: 1 addition & 1 deletion tests/api/v1/aspects/deleteWithoutPerms.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const deleteOneRelLink = '/v1/aspects/{key}/relatedLinks/{akey}';
const deleteOneTag = '/v1/aspects/{key}/tags/{akey}';
const path = '/v1/aspects/{key}';

describe('api: aspects: delete without permission', () => {
describe('tests/api/v1/aspects/deleteWithoutPerms.js >', () => {
// let token;
let i;
let aspect;
Expand Down
6 changes: 3 additions & 3 deletions tests/api/v1/aspects/deleteWriters.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const writersPath = '/v1/aspects/{key}/writers';
const writerPath = '/v1/aspects/{key}/writers/{userNameOrId}';
const aspectPath = '/v1/aspects/{key}';

describe('api: aspects: permissions', () => {
describe('tests/api/v1/aspects/deleteWriters.js >', () => {
let token;
let otherValidToken;
let aspect;
Expand Down Expand Up @@ -70,7 +70,7 @@ describe('api: aspects: permissions', () => {
afterEach(u.forceDelete);
afterEach(tu.forceDeleteUser);

describe('delete resource without permission', () => {
describe('delete resource without permission >', () => {
it('return 403 when deleting aspect without permission', (done) => {
api.delete(aspectPath.replace('{key}', aspect.id))
.set('Authorization', otherValidToken)
Expand All @@ -79,7 +79,7 @@ describe('api: aspects: permissions', () => {
});
});

describe('delete writer(s)', () => {
describe('delete writer(s) >', () => {
it('remove write permission associated with the resource', (done) => {
api.delete(writersPath.replace('{key}', aspect.id))
.set('Authorization', token)
Expand Down
12 changes: 6 additions & 6 deletions tests/api/v1/aspects/get.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const ONE = 1;
const TWO = 2;
const THREE = 3;

describe(`api: GET ${path}`, () => {
describe('tests/api/v1/aspects/get.js >', () => {
let token;
const EXPECTED_ARR = ['toot', 'poop'];
const toCreate = [
Expand Down Expand Up @@ -83,7 +83,7 @@ describe(`api: GET ${path}`, () => {
after(u.forceDelete);
after(tu.forceDeleteUser);

describe('filter with tags', () => {
describe('filter with tags >', () => {
it('filter by single EXCLUDE tags returns expected values', (done) => {
api.get(path + '?tags=-foo')
.set('Authorization', token)
Expand Down Expand Up @@ -161,7 +161,7 @@ describe(`api: GET ${path}`, () => {
});
});

describe('filter with duplicate tags fail', () => {
describe('filter with duplicate tags fail >', () => {
it('EXCLUDE filter', (done) => {
api.get(`${path}?tags=-Foo,-Foo`)
.set('Authorization', token)
Expand Down Expand Up @@ -219,7 +219,7 @@ describe(`api: GET ${path}`, () => {
});
});

describe('Single Values: ', () => {
describe('Single Values >', () => {
it('filter by BOOLEAN returns expected values', (done) => {
api.get(path + '?valueType=PERCENT') // BOOLEAN is default
.set('Authorization', token)
Expand Down Expand Up @@ -342,7 +342,7 @@ describe(`api: GET ${path}`, () => {
});
}); // Single Values

describe('Lists: ', () => {
describe('Lists >', () => {
it('no wildcards', (done) => {
api.get(`${path}?name=${tu.namePrefix}a0,${tu.namePrefix}a1`)
.set('Authorization', token)
Expand All @@ -369,7 +369,7 @@ describe(`api: GET ${path}`, () => {
});
}); // Lists

describe('Aspect Sorting by rank: ', () => {
describe('Aspect Sorting by rank >', () => {
it('sort ascending', (done) => {
api.get(`${path}?sort=rank`)
.set('Authorization', token)
Expand Down
2 changes: 1 addition & 1 deletion tests/api/v1/aspects/getWriters.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const User = tu.db.User;
const getWritersPath = '/v1/aspects/{key}/writers';
const getWriterPath = '/v1/aspects/{key}/writers/{userNameOrId}';

describe('api: aspects: get writer(s)', () => {
describe('tests/api/v1/aspects/getWriters.js >', () => {
let token;
let aspect;
let user;
Expand Down

0 comments on commit ad4ed5c

Please sign in to comment.