mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unit tests

This commit is contained in:
Roeland Jago Douma 2015-12-23 10:49:27 +01:00
parent f99fcd5dd6
commit 49031e0744
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/js/sharedialogview.js
View File

@ -129,7 +129,7 @@
$loading.addClass('hidden');
$loading.removeClass('inlineblock');
if (result.ocs.meta.statuscode == 100) {
var users = [].concat(result.ocs.data.exact.users).concat(result.ocs.data.users);
var users = result.ocs.data.exact.users.concat(result.ocs.data.users);
var groups = result.ocs.data.exact.groups.concat(result.ocs.data.groups);
var remotes = result.ocs.data.exact.remotes.concat(result.ocs.data.remotes);
@ -195,8 +195,12 @@
var suggestions = users.concat(groups).concat(remotes);
$('.shareWithField').autocomplete("option", "autoFocus", true);
response(suggestions);
if (suggestions.length > 0) {
$('.shareWithField').autocomplete("option", "autoFocus", true);
response(suggestions);
} else {
response();
}
} else {
response();
}

30
core/js/tests/specs/sharedialogviewSpec.js
View File

@ -724,15 +724,30 @@ describe('OC.Share.ShareDialogView', function() {
var response = sinon.stub();
dialog.autocompleteHandler({term: 'bob'}, response);
var jsonData = JSON.stringify({
"data": [{"label": "bob", "value": {"shareType": 0, "shareWith": "test"}}],
"status": "success"
'ocs' : {
'meta' : {
'status' : 'success',
'statuscode' : 100,
'message' : null
},
'data' : {
'exact' : {
'users' : [],
'groups' : [],
'remotes': []
},
'users' : [{'label': 'bob', 'value': {'shareType': 0, 'shareWith': 'test'}}],
'groups' : [],
'remotes': []
}
}
});
fakeServer.requests[0].respond(
200,
{'Content-Type': 'application/json'},
jsonData
);
expect(response.calledWithExactly(JSON.parse(jsonData).data)).toEqual(true);
expect(response.calledWithExactly(JSON.parse(jsonData).ocs.data.users)).toEqual(true);
expect(autocompleteStub.calledWith("option", "autoFocus", true)).toEqual(true);
});
@ -740,7 +755,14 @@ describe('OC.Share.ShareDialogView', function() {
dialog.render();
var response = sinon.stub();
dialog.autocompleteHandler({term: 'bob'}, response);
var jsonData = JSON.stringify({"status": "failure"});
var jsonData = JSON.stringify({
'ocs' : {
'meta' : {
'status': 'failure',
'statuscode': 400
}
}
});
fakeServer.requests[0].respond(
200,
{'Content-Type': 'application/json'},