undo queue fixes (unittests not adjusted yet: todo fix folderbusinesslayer and feedbusinesslayer specs)

2 files changed, 22 insertions, 59 deletions

diff --git a/js/tests/services/persistenceSpec.coffee b/js/tests/services/persistenceSpec.coffee
index 16f8cbd69..2f1607cff 100644
--- a/js/tests/services/persistenceSpec.coffee
+++ b/js/tests/services/persistenceSpec.coffee
@@ -207,6 +207,17 @@ describe 'Persistence', ->
 		expect(@req.post).toHaveBeenCalledWith('news_feeds_delete', params)
 
 
+	it 'send a correct feed restore request', =>
+		params =
+			onSuccess: ->
+			routeParams:
+				feedId: 3
+
+		@Persistence.restoreFeed(params.routeParams.feedId, params.onSuccess)
+
+		expect(@req.post).toHaveBeenCalledWith('news_feeds_restore', params)
+
+
 	it 'send a correct feed create request', =>
 		params =
 			data:
@@ -294,6 +305,17 @@ describe 'Persistence', ->
 		expect(@req.post).toHaveBeenCalledWith('news_folders_delete', params)
 
 
+	it 'send a correct folder restore request', =>
+		params =
+			onSuccess: ->
+			routeParams:
+				folderId: 3
+
+		@Persistence.restoreFolder(params.routeParams.folderId, params.onSuccess)
+
+		expect(@req.post).toHaveBeenCalledWith('news_folders_restore', params)
+
+
 	it 'should do a proper folder rename request', =>
 		params =
 			routeParams:
diff --git a/js/tests/services/undoqueueSpec.coffee b/js/tests/services/undoqueueSpec.coffee
deleted file mode 100644
index dcb95e9fd..000000000
--- a/js/tests/services/undoqueueSpec.coffee
+++ /dev/null
@@ -1,59 +0,0 @@
-###
-
-ownCloud - App Framework
-
-@author Bernhard Posselt
-@copyright 2012 Bernhard Posselt nukeawhale@gmail.com
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-License as published by the Free Software Foundation; either
-version 3 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-You should have received a copy of the GNU Affero General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-
-###
-
-describe 'UndoQueue', ->
-
-	beforeEach module 'News'
-
-
-	beforeEach inject (@UndoQueue, @$timeout, @$rootScope) =>
-		@queue = @UndoQueue
-	
-
-	it 'should execute a callback', =>
-		executed = false
-		callback = ->
-			executed = true
-
-		@queue.add('hi', callback, 3000)
-
-		@$timeout.flush()
-
-		expect(executed).toBe(true)
-
-
-	it 'should execute a task when a new one is added', =>
-		executed = 0
-		undone = 0
-		callback = ->
-			executed += 1
-
-		undoCallback = ->
-			undone += 1
-
-		@queue.add('hi', callback, 3000, undoCallback)
-		@queue.add('hi', callback, 3000, undoCallback)
-
-		expect(executed).toBe(1)
-		expect(undone).toBe(0)
-
-