Skip to content

Fix JavaScript unit tests for "versionmodel.js" #12039

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
MorrisJobke merged 2 commits into from
Oct 25, 2018
Merged

Fix JavaScript unit tests for "versionmodel.js" #12039

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24abfd8
Wait for the promise to be fulfilled before running the next test
danxuliu Oct 25, 2018
661756b
Set error expected by the DAV client for a failed move
danxuliu Oct 25, 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
22 changes: 16 additions & 6 deletions apps/files_versions/tests/js/versionmodelSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe('OCA.Versions.VersionModel', function() {
model.on('revert', revertEventStub);
model.on('error', errorStub);
});
it('tells the server to revert when calling the revert method', function() {
it('tells the server to revert when calling the revert method', function(done) {
var promise = model.revert({
success: successStub
});
Expand All @@ -76,22 +76,32 @@ describe('OCA.Versions.VersionModel', function() {
expect(revertEventStub.calledOnce).toEqual(true);
expect(successStub.calledOnce).toEqual(true);
expect(errorStub.notCalled).toEqual(true);
});

return promise;
done();
});
});
it('triggers error event when server returns a failure', function() {
it('triggers error event when server returns a failure', function(done) {
var promise = model.revert({
success: successStub
});

expect(fakeServer.requests.length).toEqual(1);
fakeServer.requests[0].respond(404);
var responseErrorHeaders = {
"Content-Type": "application/xml"
};
var responseErrorBody =
'<d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">' +
' <s:exception>Sabre\\DAV\\Exception\\SomeException</s:exception>' +
' <s:message>Some error message</s:message>' +
'</d:error>';
fakeServer.requests[0].respond(404, responseErrorHeaders, responseErrorBody);

promise.then(function() {
promise.fail(function() {
expect(revertEventStub.notCalled).toEqual(true);
expect(successStub.notCalled).toEqual(true);
expect(errorStub.calledOnce).toEqual(true);

done();
Copy link
Member

@MorrisJobke MorrisJobke Oct 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the "non-fail" case? Shouldn't there also be a done()?

Copy link
Member Author

@danxuliu danxuliu Oct 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it is not needed; if done() is not called in jasmine.DEFAULT_TIMEOUT_INTERVAL seconds (5 by default) then the test will be marked as failed, so the test will pass (and continue to the next one) only if the promise failed.

});
});
});
Expand Down