Skip to content

Fix return value for index#list and index#mDelete #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2018
Merged

Fix return value for index#list and index#mDelete #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a85144
Fix return value for index#list and index#mDelete
Aschen Oct 8, 2018
92f9020
Merge branch '6-dev' into fix-index-list-and-mdelete-return
scottinet Oct 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/controllers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class IndexController {
controller: 'index',
action: 'list'
}, options)
.then(response => response.result);
.then(response => response.result.indexes);
}

mDelete (indexes, options) {
Expand All @@ -85,7 +85,7 @@ class IndexController {
indexes
}
}, options)
.then(response => response.result);
.then(response => response.result.deleted);
}

refresh (index, options) {
Expand Down
9 changes: 4 additions & 5 deletions test/controllers/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ describe('Index Controller', () => {
describe('list', () => {
it('should call index/list query and return a Promise which resolves the list of available indexes', () => {
const result = {
total: 3,
hits: ['foo', 'bar', 'baz']
indexes: ['foo', 'bar', 'baz']
};
kuzzle.query.resolves({result});

Expand All @@ -139,7 +138,7 @@ describe('Index Controller', () => {
action: 'list'
}, options);

should(res).be.equal(result);
should(res).be.equal(result.indexes);
});
});
});
Expand Down Expand Up @@ -173,7 +172,7 @@ describe('Index Controller', () => {
body: {indexes: ['foo', 'bar']}
}, options);

should(res).be.equal(result);
should(res).be.equal(result.deleted);
});
});
});
Expand Down Expand Up @@ -273,4 +272,4 @@ describe('Index Controller', () => {
});
});
});
});
});