aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-08-17 16:36:00 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-08-17 16:36:00 +0200
commite350a8bfd070b3742e0c5e6cbb2b9a0e69d7473f (patch)
treee75a4ee3a6aca7ff0bfc1891bc3276902cd7ff50
parent637edfde24eefd9e9723ce3d438a7d627059681c (diff)
downloadnextcloud-server-e350a8bfd070b3742e0c5e6cbb2b9a0e69d7473f.tar.gz
nextcloud-server-e350a8bfd070b3742e0c5e6cbb2b9a0e69d7473f.zip
fixing the unit tests
-rw-r--r--settings/tests/js/users/deleteHandlerSpec.js27
1 files changed, 25 insertions, 2 deletions
diff --git a/settings/tests/js/users/deleteHandlerSpec.js b/settings/tests/js/users/deleteHandlerSpec.js
index c6d88b32411..371eae5941d 100644
--- a/settings/tests/js/users/deleteHandlerSpec.js
+++ b/settings/tests/js/users/deleteHandlerSpec.js
@@ -63,6 +63,17 @@ describe('DeleteHandler tests', function() {
expect(fakeServer.requests.length).toEqual(0);
});
it('deletes first entry and reshows notification on second delete', function() {
+ fakeServer.respondWith(/\/index\.php\/dummyendpoint.php\/some_uid/, [
+ 204,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({status: 'success'})
+ ]);
+ fakeServer.respondWith(/\/index\.php\/dummyendpoint.php\/some_other_uid/, [
+ 204,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({status: 'success'})
+ ]);
+
var handler = init(markCallback, removeCallback, undoCallback);
handler.mark('some_uid');
@@ -79,7 +90,8 @@ describe('DeleteHandler tests', function() {
expect(markCallback.calledTwice).toEqual(true);
expect(markCallback.getCall(0).args[0]).toEqual('some_uid');
expect(markCallback.getCall(1).args[0]).toEqual('some_other_uid');
- expect(removeCallback.notCalled).toEqual(true);
+ // called only once, because it is called once the second user is deleted
+ expect(removeCallback.calledOnce).toEqual(true);
expect(undoCallback.notCalled).toEqual(true);
// previous one was delete
@@ -88,6 +100,12 @@ describe('DeleteHandler tests', function() {
expect(request.url).toEqual(OC.webroot + '/index.php/dummyendpoint.php/some_uid');
});
it('automatically deletes after timeout', function() {
+ fakeServer.respondWith(/\/index\.php\/dummyendpoint.php\/some_uid/, [
+ 204,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({status: 'success'})
+ ]);
+
var handler = init(markCallback, removeCallback, undoCallback);
handler.mark('some_uid');
@@ -101,6 +119,11 @@ describe('DeleteHandler tests', function() {
expect(request.url).toEqual(OC.webroot + '/index.php/dummyendpoint.php/some_uid');
});
it('deletes when deleteEntry is called', function() {
+ fakeServer.respondWith(/\/index\.php\/dummyendpoint.php\/some_uid/, [
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({status: 'success'})
+ ]);
var handler = init(markCallback, removeCallback, undoCallback);
handler.mark('some_uid');
@@ -157,7 +180,7 @@ describe('DeleteHandler tests', function() {
// stub t to avoid extra calls
var tStub = sinon.stub(window, 't').returns('text');
fakeServer.respondWith(/\/index\.php\/dummyendpoint.php\/some_uid/, [
- 200,
+ 403,
{ 'Content-Type': 'application/json' },
JSON.stringify({status: 'error', data: {message: 'test error'}})
]);