summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-02-22 17:19:08 +0100
committerVincent Petry <pvince81@owncloud.com>2016-02-22 17:25:32 +0100
commit27544144cec06324a5fe4494034e893b7c5a66ff (patch)
tree36c437db587a801f0533e70e22ca5b4f8d3ec4f2 /apps
parent8ea80e114ae508586947db614b37db6b35972a9c (diff)
downloadnextcloud-server-27544144cec06324a5fe4494034e893b7c5a66ff.tar.gz
nextcloud-server-27544144cec06324a5fe4494034e893b7c5a66ff.zip
Fix unit tests affected by side effects
The notification tests were not restoring the clock properly, but indirectly helped other tests pass. Since now we're restoring the clock properly, the other tests were fixed to still work.
Diffstat (limited to 'apps')
-rw-r--r--apps/files/tests/js/fileactionsSpec.js4
-rw-r--r--apps/systemtags/tests/js/systemtagsinfoviewSpec.js3
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index a905a4d969d..4f4d4d3d197 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -20,9 +20,10 @@
*/
describe('OCA.Files.FileActions tests', function() {
- var fileList, fileActions;
+ var fileList, fileActions, clock;
beforeEach(function() {
+ clock = sinon.useFakeTimers();
// init horrible parameters
var $body = $('#testArea');
$body.append('<input type="hidden" id="dir" value="/subdir"></input>');
@@ -63,6 +64,7 @@ describe('OCA.Files.FileActions tests', function() {
fileActions = null;
fileList.destroy();
fileList = undefined;
+ clock.restore();
$('#dir, #permissions, #filestable').remove();
});
it('calling clear() clears file actions', function() {
diff --git a/apps/systemtags/tests/js/systemtagsinfoviewSpec.js b/apps/systemtags/tests/js/systemtagsinfoviewSpec.js
index 0fb4e7b22c2..27724822c2e 100644
--- a/apps/systemtags/tests/js/systemtagsinfoviewSpec.js
+++ b/apps/systemtags/tests/js/systemtagsinfoviewSpec.js
@@ -22,14 +22,17 @@
describe('OCA.SystemTags.SystemTagsInfoView tests', function() {
var isAdminStub;
var view;
+ var clock;
beforeEach(function() {
+ clock = sinon.useFakeTimers();
view = new OCA.SystemTags.SystemTagsInfoView();
$('#testArea').append(view.$el);
isAdminStub = sinon.stub(OC, 'isUserAdmin').returns(true);
});
afterEach(function() {
isAdminStub.restore();
+ clock.restore();
view.remove();
view = undefined;
});