fix errors related to persistence data change

3 files changed, 29 insertions, 32 deletions

diff --git a/js/tests/controllers/feedcontrollerSpec.coffee b/js/tests/controllers/feedcontrollerSpec.coffee
index 13ce1bb44..5f35830cb 100644
--- a/js/tests/controllers/feedcontrollerSpec.coffee
+++ b/js/tests/controllers/feedcontrollerSpec.coffee
@@ -144,13 +144,11 @@ describe 'FeedController', ->
 	it 'should reset the add folder form and set the created as selected', =>
 		@persistence.createFolder = jasmine.createSpy('create')
 		data =
-			data:
-				folders: [
-					{id: 3, name: 'soba'}
-				]
-			status: 'success'
+			folders: [
+				{id: 3, name: 'soba'}
+			]
 		@persistence.createFolder.andCallFake (id, parent, onSuccess) =>
-			@FolderModel.handle(data.data.folders)
+			@FolderModel.handle(data.folders)
 			onSuccess(data)
 
 		@scope.addFolder(' Soba')
@@ -201,13 +199,12 @@ describe 'FeedController', ->
 		@persistence.getItems = jasmine.createSpy('load')
 
 		data =
-			data:
-				feeds: [
-					{id: 3, url: 'http://soba', title: 'hi'}
-				]
+			feeds: [
+				{id: 3, url: 'http://soba', title: 'hi'}
+			]
 			status: 'success'
 		@persistence.createFeed.andCallFake (id, parent, onSuccess) =>
-			@FeedModel.handle(data.data.feeds)
+			@FeedModel.handle(data.feeds)
 			onSuccess(data)
 
 		@scope.addFeed(' Soba')
diff --git a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
index 1c9168a4d..b18b47006 100644
--- a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
@@ -287,7 +287,7 @@ describe 'FeedBusinessLayer', ->
 		
 		@FeedBusinessLayer.create(' johns ')
 		expect(@persistence.createFeed).toHaveBeenCalledWith('http://johns', 0,
-			jasmine.any(Function))
+			jasmine.any(Function), jasmine.any(Function))
 
 
 	it 'should call the onSuccess function on response status ok', =>
@@ -295,24 +295,23 @@ describe 'FeedBusinessLayer', ->
 		@persistence.createFeed = jasmine.createSpy('add feed')
 		@persistence.createFeed.andCallFake (folderName, parentId, success) =>
 			@response =
-				status: 'ok'
 				data: 'hi'
 			success(@response)
 
 		@FeedBusinessLayer.create(' johns ', 0, onSuccess)
 
-		expect(onSuccess).toHaveBeenCalledWith(@response.data)
+		expect(onSuccess).toHaveBeenCalledWith(@response)
 
 
 	it 'should call the handle a response error when creating a folder', =>
 		onSuccess = jasmine.createSpy('Success')
 		onFailure = jasmine.createSpy('Failure')
 		@persistence.createFeed = jasmine.createSpy('add feed')
-		@persistence.createFeed.andCallFake (folderName, parentId, success) =>
+		@persistence.createFeed.andCallFake (folderName, parentId, success,
+			failure) =>
 			@response =
-				status: 'error'
 				msg: 'this is an error'
-			success(@response)
+			failure(@response)
 
 		@FeedBusinessLayer.create(' johns ', 0, onSuccess, onFailure)
 
diff --git a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee
index 55914ab4c..1d8431513 100644
--- a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee
@@ -216,7 +216,7 @@ describe 'FolderBusinessLayer', ->
 		
 		@FolderBusinessLayer.create(' johns ')
 		expect(@persistence.createFolder).toHaveBeenCalledWith('johns', 0,
-			jasmine.any(Function))
+			jasmine.any(Function), jasmine.any(Function))
 
 
 	it 'should call the onSuccess function on response status ok', =>
@@ -224,24 +224,23 @@ describe 'FolderBusinessLayer', ->
 		@persistence.createFolder = jasmine.createSpy('add folder')
 		@persistence.createFolder.andCallFake (folderName, parentId, success) =>
 			@response =
-				status: 'ok'
 				data: 'jooo'
 			success(@response)
 
 		@FolderBusinessLayer.create(' johns ', onSuccess)
 
-		expect(onSuccess).toHaveBeenCalledWith(@response.data)
+		expect(onSuccess).toHaveBeenCalledWith(@response)
 
 
 	it 'should call the handle a response error when creating a folder', =>
 		onSuccess = jasmine.createSpy('Success')
 		onFailure = jasmine.createSpy('Failure')
 		@persistence.createFolder = jasmine.createSpy('add folder')
-		@persistence.createFolder.andCallFake (folderName, parentId, success) =>
+		@persistence.createFolder.andCallFake (folderName, parentId, success,
+			onFailure) =>
 			@response =
-				status: 'error'
 				msg: 'this is an error'
-			success(@response)
+			onFailure(@response)
 
 		@FolderBusinessLayer.create(' johns ', onSuccess, onFailure)
 
@@ -332,7 +331,7 @@ describe 'FolderBusinessLayer', ->
 		@FolderBusinessLayer.import(xml)
 
 		expect(@persistence.createFolder).toHaveBeenCalledWith('test', 0,
-			jasmine.any(Function))
+			jasmine.any(Function), jasmine.any(Function))
 		expect(@persistence.createFeed).not.toHaveBeenCalled()
 
 
@@ -367,17 +366,17 @@ describe 'FolderBusinessLayer', ->
 
 		expect(@persistence.createFolder).not.toHaveBeenCalled()
 		expect(@persistence.createFeed).toHaveBeenCalledWith(
-			'http://worrydream.com/feed.xml', 0, jasmine.any(Function))
+			'http://worrydream.com/feed.xml', 0, jasmine.any(Function),
+			jasmine.any(Function))
 
 
 	it 'should import nested folders', =>
 		@persistence.createFolder = jasmine.createSpy('create folder')
 		@persistence.createFolder.andCallFake (name, parentId, onSuccess) ->
 			data =
-				data:
-					folders: [
-						{id: 3}
-					]
+				folders: [
+					{id: 3}
+				]
 			onSuccess(data)
 
 		@persistence.createFeed = jasmine.createSpy('create feed')
@@ -410,9 +409,10 @@ describe 'FolderBusinessLayer', ->
 		@FolderBusinessLayer.import(xml)
 
 		expect(@persistence.createFolder).toHaveBeenCalledWith('Design', 0,
-			jasmine.any(Function))
+			jasmine.any(Function), jasmine.any(Function))
 		expect(@persistence.createFeed).toHaveBeenCalledWith(
-			'http://worrydream.com/feed.xml', 3, jasmine.any(Function))
+			'http://worrydream.com/feed.xml', 3, jasmine.any(Function),
+			jasmine.any(Function))
 
 
 	it 'should use an existing folder when importing a folder', =>
@@ -451,7 +451,8 @@ describe 'FolderBusinessLayer', ->
 
 		expect(@persistence.createFolder).not.toHaveBeenCalled()
 		expect(@persistence.createFeed).toHaveBeenCalledWith(
-			'http://worrydream.com/feed.xml', 2, jasmine.any(Function))
+			'http://worrydream.com/feed.xml', 2, jasmine.any(Function),
+			jasmine.any(Function))
 		expect(folder.opened).toBe(true)
 		expect(@persistence.openFolder).toHaveBeenCalled()