renamed bl to businesslayer, handle exception in update routine, fix #69

6 files changed, 0 insertions, 1232 deletions

diff --git a/js/tests/services/bl/blSpec.coffee b/js/tests/services/bl/blSpec.coffee
deleted file mode 100644
index 6da4724ec..000000000
--- a/js/tests/services/bl/blSpec.coffee
+++ /dev/null
@@ -1,86 +0,0 @@
-###
-
-ownCloud - News
-
-@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 'Bl', ->
-
-	beforeEach module 'News'
-
-	beforeEach inject (@_Bl, @ActiveFeed, @FeedType, @ItemModel) =>
-		type = @FeedType.Starred
-		angular.module('News').factory 'Persistence', =>
-		@getItemsSpy = jasmine.createSpy('getItems')
-		@persistence = {
-			getItems: @getItemsSpy
-		}
-
-		class TestBl extends @_Bl
-
-			constructor: (activeFeed, persistence, itemModel) ->
-				super(activeFeed, persistence, itemModel, type)
-
-		@bl = new TestBl(@ActiveFeed, @persistence, @ItemModel)
-
-
-	it 'should reset the item cache when a different feed is being loaded', =>
-		@ItemModel.clear = jasmine.createSpy('clear')
-		@ActiveFeed.handle({id: 0, type: @FeedType.Starred})
-		@bl.load(0)
-
-		expect(@ItemModel.clear).not.toHaveBeenCalled()
-		
-		@bl.load(2)
-		expect(@ItemModel.clear).toHaveBeenCalled()
-
-		@ActiveFeed.handle({id: 2, type: @FeedType.Feed})
-		@bl.load(2)
-		expect(@ItemModel.clear).toHaveBeenCalled()
-
-
-
-	it 'should send a get latest items query when feed did not change', =>
-		@ItemModel.add({id: 1, lastModified: 5})
-		@ItemModel.add({id: 2, lastModified: 1})
-		@ItemModel.add({id: 4, lastModified: 323})
-		@ItemModel.add({id: 6, lastModified: 44})
-		@persistence.getItems = jasmine.createSpy('latest')
-		@ActiveFeed.handle({id: 3, type: @FeedType.Starred})
-		@bl.load(3)
-
-		expect(@persistence.getItems).toHaveBeenCalledWith(@FeedType.Starred, 3,
-			0, null, 6)
-
-
-	it 'should send a get all items query when feed changed', =>
-		@persistence.getItems = jasmine.createSpy('latest')
-		@ActiveFeed.handle({id: 3, type: @FeedType.Feed})
-		@bl.load(3)
-
-		expect(@persistence.getItems).toHaveBeenCalledWith(@FeedType.Starred, 3,
-			0)
-
-
-	it 'should be active when its selected', =>
-		expect(@bl.isActive(0)).toBe(false)
-
-		@ActiveFeed.handle({type: @FeedType.Starred, id:0})
-		expect(@bl.isActive(0)).toBe(true)
\ No newline at end of file
diff --git a/js/tests/services/bl/feedblSpec.coffee b/js/tests/services/bl/feedblSpec.coffee
deleted file mode 100644
index 0c538e2e3..000000000
--- a/js/tests/services/bl/feedblSpec.coffee
+++ /dev/null
@@ -1,346 +0,0 @@
-###
-
-ownCloud - News
-
-@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 'FeedBl', ->
-
-	beforeEach module 'News'
-
-	beforeEach =>
-		angular.module('News').factory 'Persistence', =>
-			@setFeedReadSpy = jasmine.createSpy('setFeedRead')
-			@getItemsSpy = jasmine.createSpy('Get Items')
-			@persistence = {
-				setFeedRead: @setFeedReadSpy
-				getItems: @getItemsSpy
-				createFeed: ->
-			}
-		angular.module('News').factory 'Utils', =>
-			@imagePath = jasmine.createSpy('imagePath')
-			@utils = {
-				imagePath: @imagePath
-			}
-
-
-	beforeEach inject (@FeedBl, @FeedModel, @ItemModel, @FeedType,
-	                   @ShowAll, @ActiveFeed, @_ExistsError) =>
-		@ShowAll.setShowAll(false)
-		@ActiveFeed.handle({type: @FeedType.Folder, id:0})
-
-	it 'should delete feeds', =>
-		@FeedModel.removeById = jasmine.createSpy('remove')
-		@persistence.deleteFeed = jasmine.createSpy('deletequery')
-		@FeedBl.delete(3)
-
-		expect(@FeedModel.removeById).toHaveBeenCalledWith(3)
-		expect(@persistence.deleteFeed).toHaveBeenCalledWith(3)
-		
-
-	it 'should return the number of unread feeds', =>
-		@FeedModel.add({id: 3, unreadCount:134, urlHash: 'a1'})
-		count = @FeedBl.getUnreadCount(3)
-
-		expect(count).toBe(134)
-
-
-	it 'should return all feeds of a folder', =>
-		feed1 = {id: 3, unreadCount:134, urlHash: 'a1', folderId: 3}
-		feed2 = {id: 4, unreadCount:134, urlHash: 'a2', folderId: 2}
-		feed3 = {id: 5, unreadCount:134, urlHash: 'a3', folderId: 3}
-		@FeedModel.add(feed1)
-		@FeedModel.add(feed2)
-		@FeedModel.add(feed3)
-
-		feeds = @FeedBl.getFeedsOfFolder(3)
-
-		expect(feeds).toContain(feed1)
-		expect(feeds).toContain(feed3)
-
-
-	it 'should get the correct unread count for folders', =>
-		@FeedModel.add({id: 3, unreadCount:134, folderId: 3, urlHash: 'a1'})
-		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a2'})
-		@FeedModel.add({id: 1, unreadCount:12, folderId: 5, urlHash: 'a3'})
-		@FeedModel.add({id: 2, unreadCount:35, folderId: 3, urlHash: 'a4'})
-		count = @FeedBl.getFolderUnreadCount(3)
-
-		expect(count).toBe(169)
-
-
-	it 'should mark feed as read', =>
-		@persistence.setFeedRead = jasmine.createSpy('setFeedRead')
-		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a1'})
-		@ItemModel.add({id: 6, feedId: 5, guidHash: 'a1'})
-		@ItemModel.add({id: 3, feedId: 5, guidHash: 'a2'})
-		@ItemModel.add({id: 2, feedId: 5, guidHash: 'a3'})
-		@FeedBl.markFeedRead(5)
-
-		expect(@persistence.setFeedRead).toHaveBeenCalledWith(5, 6)
-		expect(@FeedModel.getById(5).unreadCount).toBe(0)
-		expect(@ItemModel.getById(6).isRead()).toBeTruthy()
-		expect(@ItemModel.getById(3).isRead()).toBeTruthy()
-		expect(@ItemModel.getById(2).isRead()).toBeTruthy()
-
-
-	it 'should mark all as read', =>
-		@persistence.setFeedRead = jasmine.createSpy('setFeedRead')
-		@FeedModel.add({id: 3, unreadCount:134, folderId: 3, urlHash: 'a1'})
-		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a2'})
-		@FeedModel.add({id: 1, unreadCount:12, folderId: 3, urlHash: 'a3'})
-
-		@FeedBl.markAllRead()
-
-		expect(@FeedModel.getById(3).unreadCount).toBe(0)
-		expect(@FeedModel.getById(1).unreadCount).toBe(0)
-		expect(@FeedModel.getById(5).unreadCount).toBe(0)
-
-
-	it 'should get the correct unread count for subscribtions', =>
-		@FeedModel.add({id: 3, unreadCount:134, urlHash: 'a1'})
-		@FeedModel.add({id: 5, unreadCount:2, urlHash: 'a2'})
-		count = @FeedBl.getAllUnreadCount()
-
-		expect(count).toBe(136)
-
-
-	it 'should return the correct number of feeds', =>
-		@FeedModel.add({id: 3, unreadCount:134, urlHash: 'a1'})
-		@FeedModel.add({id: 5, unreadCount:2, urlHash: 'a2'})
-		count = @FeedBl.getNumberOfFeeds()
-
-		expect(count).toBe(2)
-
-
-	it 'should be visible if its active', =>
-		@ActiveFeed.handle({type: @FeedType.Feed, id:3})
-		expect(@FeedBl.isVisible(3)).toBe(true)
-
-
-	it 'should be visible if show all is true', =>
-		expect(@FeedBl.isVisible(3)).toBe(false)
-
-		@ShowAll.setShowAll(true)
-		expect(@FeedBl.isVisible(3)).toBe(true)
-
-
-	it 'should be visible if unreadcount bigger than 0', =>
-		@FeedModel.add({id: 2, unreadCount:134, urlHash: 'a1'})
-		expect(@FeedBl.isVisible(2)).toBe(true)
-
-	
-	it 'should not move the feed to a new folder', =>
-		@persistence.moveFeed = jasmine.createSpy('Move feed')
-		@FeedModel.add({id: 2, unreadCount:134, urlHash: 'a1', folderId: 3})
-		@FeedBl.move(2, 4)
-
-		expect(@persistence.moveFeed).toHaveBeenCalledWith(2, 4)
-		expect(@FeedModel.getById(2).folderId).toBe(4)
-
-
-	it 'should not move the feed to the same folder', =>
-		@persistence.moveFeed = jasmine.createSpy('Move feed')
-		@FeedModel.add({id: 2, unreadCount:134, urlHash: 'a1', folderId: 3})
-		@FeedBl.move(2, 3)
-
-		expect(@persistence.moveFeed).not.toHaveBeenCalled()
-
-
-	it 'should set the show all setting', =>
-		@persistence.userSettingsReadShow = jasmine.createSpy('Show All')
-		@FeedBl.setShowAll(true)
-
-		expect(@persistence.userSettingsReadShow).toHaveBeenCalled()
-
-
-
-	it 'should set the hide read setting', =>
-		@persistence.userSettingsReadHide = jasmine.createSpy('Hide Read')
-		@FeedBl.setShowAll(false)
-
-		expect(@persistence.userSettingsReadHide).toHaveBeenCalled()
-
-
-	it 'should return all feeds', =>
-		item1 = {id: 2, unreadCount:134, urlHash: 'a1', folderId: 3}
-		item2 = {id: 4, unreadCount:134, urlHash: 'a2', folderId: 3}
-		@FeedModel.add(item1)
-		@FeedModel.add(item2)
-
-		expect(@FeedBl.getAll()).toContain(item1)
-		expect(@FeedBl.getAll()).toContain(item2)
-
-
-	it 'should return if ShowAll is set', =>
-		@persistence.userSettingsReadShow = jasmine.createSpy('Show All')
-		expect(@FeedBl.isShowAll()).toBe(false)
-		@FeedBl.setShowAll(true)
-
-		expect(@FeedBl.isShowAll()).toBe(true)
-
-
-	it 'should return all feeds of a folder', =>
-		item1 = {id: 2, unreadCount:134, urlHash: 'a1', folderId: 3}
-		item2 = {id: 4, unreadCount:134, urlHash: 'a2', folderId: 2}
-		item3 = {id: 5, unreadCount:134, urlHash: 'a3', folderId: 3}
-		@FeedModel.add(item1)
-		@FeedModel.add(item2)
-		@FeedModel.add(item3)
-
-		folders = @FeedBl.getFeedsOfFolder(3)
-
-		expect(folders).toContain(item1)
-		expect(folders).toContain(item3)
-
-
-	it 'should return the correct feed link', =>
-		item2 =
-			id: 4,
-			unreadCount:134,
-			urlHash: 'a2',
-			folderId: 3,
-			link: 'test.com'
-		@FeedModel.add(item2)
-
-		expect(@FeedBl.getFeedLink(4)).toBe('test.com')
-
-
-
-	it 'should not create a feed if it already exists', =>
-		item1 = {urlHash: hex_md5('john')}
-		@FeedModel.add(item1)
-
-		expect =>
-			@FeedBl.create('john')
-		.toThrow(new @_ExistsError())
-		
-		expect =>
-			@FeedBl.create('johns')
-		.not.toThrow(new @_ExistsError())
-
-
-	it 'should not create feeds that are empty', =>
-		expect =>
-			@FeedBl.create('   ')
-		.toThrow(new Error())
-
-
-	it 'should create a feed before theres a response from the server', =>
-		@FeedBl.create('johns')
-		expect(@FeedModel.size()).toBe(1)
-
-
-	it 'should set a title and an url hash to the newly crated feed', =>
-		url = 'www.google.de'
-		@FeedBl.create(url)
-		hash = hex_md5(url)
-
-		feed = @FeedModel.getByUrlHash(hash)
-
-		expect(feed.title).toBe('google.de')
-		expect(feed.url).toBe(url)
-		expect(feed.urlHash).toBe(hash)
-		expect(feed.folderId).toBe(0)
-		expect(feed.unreadCount).toBe(0)
-		expect(@imagePath).toHaveBeenCalledWith('core', 'loading.gif')
-	
-	it 'should transform urls correctly', =>
-		urls = [
-			'www.google.de'
-			'www.google.de/'
-			'google.de'
-			'http://google.de'
-			'http://www.google.de/'
-		]
-		for url in urls
-			@FeedModel.clear()
-			@FeedBl.create(url)
-			hash = hex_md5(url)
-			feed = @FeedModel.getByUrlHash(hash)
-			expect(feed.title).toBe('google.de')
-
-
-	it 'should make a create feed request', =>
-		@persistence.createFeed = jasmine.createSpy('add feed')
-		
-		@FeedBl.create(' johns ')
-		expect(@persistence.createFeed).toHaveBeenCalledWith('johns', 0,
-			jasmine.any(Function))
-
-
-	it 'should call the onSuccess function on response status ok', =>
-		onSuccess = jasmine.createSpy('Success')
-		@persistence.createFeed = jasmine.createSpy('add feed')
-		@persistence.createFeed.andCallFake (folderName, parentId, success) =>
-			@response =
-				status: 'ok'
-				data: 'hi'
-			success(@response)
-
-		@FeedBl.create(' johns ', 0, onSuccess)
-
-		expect(onSuccess).toHaveBeenCalledWith(@response.data)
-
-
-	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) =>
-			@response =
-				status: 'error'
-				msg: 'this is an error'
-			success(@response)
-
-		@FeedBl.create(' johns ', 0, onSuccess, onFailure)
-
-		expect(onSuccess).not.toHaveBeenCalled()
-		expect(onFailure).toHaveBeenCalled()
-
-		expect(@FeedModel.getByUrlHash(hex_md5('johns')).error).toBe(
-			@response.msg)
-
-
-	it 'should mark a feed error as read by removing it', =>
-		@FeedModel.add({id: 3, urlHash: 'john'})
-
-		@FeedBl.markErrorRead('john')
-
-		expect(@FeedModel.size()).toBe(0)
-		expect(@FeedModel.getByUrlHash('john')).toBe(undefined)
-
-
-	it 'should update all feeds', =>
-		@persistence.updateFeed = jasmine.createSpy('update')
-		@FeedModel.add({id: 3, urlHash: 'john'})
-
-		@FeedBl.updateFeeds()
-
-		expect(@persistence.updateFeed).toHaveBeenCalledWith(3)
-
-
-	it 'should not update feeds without ids', =>
-		@persistence.updateFeed = jasmine.createSpy('update')
-		@FeedModel.add({urlHash: 'john'})
-
-		@FeedBl.updateFeeds()
-
-		expect(@persistence.updateFeed).not.toHaveBeenCalled()
\ No newline at end of file
diff --git a/js/tests/services/bl/folderblSpec.coffee b/js/tests/services/bl/folderblSpec.coffee
deleted file mode 100644
index 49f68634f..000000000
--- a/js/tests/services/bl/folderblSpec.coffee
+++ /dev/null
@@ -1,440 +0,0 @@
-###
-
-ownCloud - News
-
-@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 'FolderBl', ->
-
-	beforeEach module 'News'
-
-	beforeEach =>
-		angular.module('News').factory 'Persistence', =>
-			@persistence =
-				createFolder: ->
-				createFeed: ->
-				openFolder: ->
-
-	beforeEach inject (@FolderBl, @FolderModel,	@FeedModel, @ShowAll,
-		               @ActiveFeed, @FeedType, @_ExistsError) =>
-		@ShowAll.setShowAll(false)
-		@ActiveFeed.handle({type: @FeedType.Feed, id:0})
-
-
-
-	it 'should delete folders', =>
-		@FolderModel.removeById = jasmine.createSpy('remove')
-		@persistence.deleteFolder = jasmine.createSpy('deletequery')
-		@FolderBl.delete(3)
-
-		expect(@FolderModel.removeById).toHaveBeenCalledWith(3)
-		expect(@persistence.deleteFolder).toHaveBeenCalledWith(3)
-
-
-	it 'should return true when folder has feeds', =>
-		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a1'})
-		expect(@FolderBl.hasFeeds(3)).toBeFalsy()
-
-		@FeedModel.add({id: 2, unreadCount:35, folderId: 3, urlHash: 'a2'})
-		expect(@FolderBl.hasFeeds(3)).toBeTruthy()
-
-
-	it 'should toggle folder', =>
-		@persistence.openFolder = jasmine.createSpy('open')
-		@persistence.collapseFolder = jasmine.createSpy('collapse')
-
-		@FolderModel.add({id: 3, opened: false, name: 'ho'})
-		@FolderBl.toggleFolder(4)
-		expect(@FolderModel.getById(3).opened).toBeFalsy()
-
-		@FolderBl.toggleFolder(3)
-		expect(@FolderModel.getById(3).opened).toBeTruthy()
-		expect(@persistence.openFolder).toHaveBeenCalledWith(3)
-
-		@FolderBl.toggleFolder(3)
-		expect(@FolderModel.getById(3).opened).toBeFalsy()
-		expect(@persistence.collapseFolder).toHaveBeenCalledWith(3)
-
-
-	it 'should mark folder as read', =>
-		@persistence.setFeedRead = jasmine.createSpy('setFeedRead')
-		@FeedModel.add({id: 3, unreadCount:134, folderId: 3, urlHash: 'a1'})
-		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a2'})
-		@FeedModel.add({id: 1, unreadCount:12, folderId: 3, urlHash: 'a3'})
-
-		@FolderBl.markFolderRead(3)
-
-		expect(@FeedModel.getById(3).unreadCount).toBe(0)
-		expect(@FeedModel.getById(1).unreadCount).toBe(0)
-		expect(@FeedModel.getById(5).unreadCount).toBe(2)
-
-
-	it 'should get the correct unread count', =>
-		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a1'})
-		@FeedModel.add({id: 6, unreadCount:3, folderId: 3, urlHash: 'a2'})
-		@FeedModel.add({id: 7, unreadCount:4, folderId: 2, urlHash: 'a3'})
-
-		expect(@FolderBl.getUnreadCount(2)).toBe(6)
-
-
-	it 'should be visible if show all is true', =>
-		expect(@FolderBl.isVisible(3)).toBe(false)
-
-		@ShowAll.setShowAll(true)
-		expect(@FolderBl.isVisible(3)).toBe(true)
-
-
-	it 'should be visible if its active', =>
-		@ActiveFeed.handle({type: @FeedType.Folder, id:3})
-		expect(@FolderBl.isVisible(3)).toBe(true)
-
-
-	it 'should be visible if one of its subfeeds is active', =>
-		@FeedModel.add({id: 5, unreadCount:0, folderId: 2, urlHash: 'a1'})
-		@FeedModel.add({id: 6, unreadCount:0, folderId: 3, urlHash: 'a2'})
-		@FeedModel.add({id: 7, unreadCount:0, folderId: 2, urlHash: 'a3'})
-
-		@ActiveFeed.handle({type: @FeedType.Feed, id:6})
-		expect(@FolderBl.isVisible(3)).toBe(true)
-
-
-	it 'should be visible if showAll is false and it has unread items', =>
-		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a1'})
-		@FeedModel.add({id: 6, unreadCount:3, folderId: 3, urlHash: 'a2'})
-		@FeedModel.add({id: 7, unreadCount:4, folderId: 2, urlHash: 'a3'})
-
-		@ActiveFeed.handle({type: @FeedType.Folder, id:2})
-		expect(@FolderBl.isVisible(3)).toBe(true)
-
-
-	it 'should return all folders', =>
-		item1 = {id: 3, open: false, name: 'ho'}
-		item2 = {id: 4, open: true, name: 'hod'}
-		@FolderModel.add(item1)
-		@FolderModel.add(item2)
-
-		expect(@FolderBl.getAll()).toContain(item1)
-		expect(@FolderBl.getAll()).toContain(item2)
-
-
-	it 'should not create a folder if it already exists', =>
-		item1 = {id: 4, open: true, name: 'john'}
-		@FolderModel.add(item1)
-
-		expect =>
-			@FolderBl.create('john')
-		.toThrow(new @_ExistsError())
-		
-		expect =>
-			@FolderBl.create('johns')
-		.not.toThrow(new @_ExistsError())
-
-
-	it 'should not create folders that are empty', =>
-		expect =>
-			@FolderBl.create('   ')
-		.toThrow(new Error())
-
-
-	it 'should create a folder before theres a response from the server', =>
-		@FolderBl.create('johns')
-		expect(@FolderModel.size()).toBe(1)
-		expect(@FolderModel.getByName('johns').opened).toBe(true)
-
-
-	it 'should make a create folder request', =>
-		@persistence.createFolder = jasmine.createSpy('add folder')
-		
-		@FolderBl.create(' johns ')
-		expect(@persistence.createFolder).toHaveBeenCalledWith('johns', 0,
-			jasmine.any(Function))
-
-
-	it 'should call the onSuccess function on response status ok', =>
-		onSuccess = jasmine.createSpy('Success')
-		@persistence.createFolder = jasmine.createSpy('add folder')
-		@persistence.createFolder.andCallFake (folderName, parentId, success) =>
-			@response =
-				status: 'ok'
-				data: 'jooo'
-			success(@response)
-
-		@FolderBl.create(' johns ', onSuccess)
-
-		expect(onSuccess).toHaveBeenCalledWith(@response.data)
-
-
-	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) =>
-			@response =
-				status: 'error'
-				msg: 'this is an error'
-			success(@response)
-
-		@FolderBl.create(' johns ', onSuccess, onFailure)
-
-		expect(onSuccess).not.toHaveBeenCalled()
-		expect(onFailure).toHaveBeenCalled()
-
-		expect(@FolderModel.getByName('johns').error).toBe(@response.msg)
-
-
-	it 'should mark a folder error as read by removing it', =>
-		@FolderModel.add({id: 3, name: 'john'})
-
-		@FolderBl.markErrorRead('John')
-
-		expect(@FolderModel.size()).toBe(0)
-		expect(@FolderModel.getByName('john')).toBe(undefined)
-
-
-	it 'should return the corret folder for id', =>
-		item = {id: 3, name: 'john'}
-		@FolderModel.add(item)
-
-		expect(@FolderBl.getById(3)).toBe(item)
-
-
-	it 'should open a folder', =>
-		@persistence.openFolder = jasmine.createSpy('open')
-
-		@FolderModel.add({id: 3, opened: false, name: 'ho'})
-		@FolderBl.open(3)
-		expect(@FolderModel.getById(3).opened).toBeTruthy()
-		expect(@persistence.openFolder).toHaveBeenCalledWith(3)
-
-
-	it 'should not import on empty opml', =>
-		@persistence.createFolder = jasmine.createSpy('create folder')
-		@persistence.createFeed = jasmine.createSpy('create feed')
-
-		xml = '<?xml version="1.0" ?>
-			<opml version="1.1">
-			  <!--Generated by NewsBlur - www.newsblur.com-->
-			  <head>
-			    <title>
-			      NewsBlur Feeds
-			    </title>
-			    <dateCreated>
-			      2013-03-14 16:44:01.356965
-			    </dateCreated>
-			    <dateModified>
-			      2013-03-14 16:44:01.356965
-			    </dateModified>
-			  </head>
-			  <body>
-
-			  </body>
-			</opml>'
-
-		@FolderBl.import(xml)
-
-		expect(@persistence.createFolder).not.toHaveBeenCalled()
-		expect(@persistence.createFeed).not.toHaveBeenCalled()
-
-
-	it 'should import a folder', =>
-		@persistence.createFolder = jasmine.createSpy('create folder')
-		@persistence.createFeed = jasmine.createSpy('create feed')
-
-		xml = '<?xml version="1.0" ?>
-			<opml version="1.1">
-			  <!--Generated by NewsBlur - www.newsblur.com-->
-			  <head>
-			    <title>
-			      NewsBlur Feeds
-			    </title>
-			    <dateCreated>
-			      2013-03-14 16:44:01.356965
-			    </dateCreated>
-			    <dateModified>
-			      2013-03-14 16:44:01.356965
-			    </dateModified>
-			  </head>
-			  <body>
-			  		<outline text="Design" title="Design" />
-			  		<outline text="test" title="test"></outline>
-			  </body>
-			</opml>'
-
-		@FolderBl.import(xml)
-
-		expect(@persistence.createFolder).toHaveBeenCalledWith('test', 0,
-			jasmine.any(Function))
-		expect(@persistence.createFeed).not.toHaveBeenCalled()
-
-
-	it 'should import a feed', =>
-		@persistence.createFolder = jasmine.createSpy('create folder')
-		@persistence.createFeed = jasmine.createSpy('create feed')
-
-		xml = '<?xml version="1.0" ?>
-			<opml version="1.1">
-			  <!--Generated by NewsBlur - www.newsblur.com-->
-			  <head>
-			    <title>
-			      NewsBlur Feeds
-			    </title>
-			    <dateCreated>
-			      2013-03-14 16:44:01.356965
-			    </dateCreated>
-			    <dateModified>
-			      2013-03-14 16:44:01.356965
-			    </dateModified>
-			  </head>
-			  <body>
-			  		<outline htmlUrl="http://worrydream.com/" text=
-			      "&lt;div&gt;Bret Victor\'s website&lt;/div&gt;"
-			      title="&lt;div&gt;Bret Victor\'s website&lt;/div&gt;"
-			      type="rss"
-			      version="RSS" xmlUrl="http://worrydream.com/feed.xml"/>
-			  </body>
-			</opml>'
-
-		@FolderBl.import(xml)
-
-		expect(@persistence.createFolder).not.toHaveBeenCalled()
-		expect(@persistence.createFeed).toHaveBeenCalledWith(
-			'http://worrydream.com/feed.xml', 0, 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}
-					]
-			onSuccess(data)
-
-		@persistence.createFeed = jasmine.createSpy('create feed')
-
-		xml = '<?xml version="1.0" ?>
-			<opml version="1.1">
-			  <!--Generated by NewsBlur - www.newsblur.com-->
-			  <head>
-			    <title>
-			      NewsBlur Feeds
-			    </title>
-			    <dateCreated>
-			      2013-03-14 16:44:01.356965
-			    </dateCreated>
-			    <dateModified>
-			      2013-03-14 16:44:01.356965
-			    </dateModified>
-			  </head>
-			  <body>
-			  	<outline text="Design" title="Design">
-			  		<outline htmlUrl="http://worrydream.com/" text=
-			      "&lt;div&gt;Bret Victor\'s website&lt;/div&gt;"
-			      title="&lt;div&gt;Bret Victor\'s website&lt;/div&gt;"
-			      type="rss"
-			      version="RSS" xmlUrl="http://worrydream.com/feed.xml"/>
-			    </outline>
-			  </body>
-			</opml>'
-
-		@FolderBl.import(xml)
-
-		expect(@persistence.createFolder).toHaveBeenCalledWith('Design', 0,
-			jasmine.any(Function))
-		expect(@persistence.createFeed).toHaveBeenCalledWith(
-			'http://worrydream.com/feed.xml', 3, jasmine.any(Function))
-
-
-	it 'should use an existing folder when importing a folder', =>
-		@persistence.createFolder = jasmine.createSpy('create folder')
-		@persistence.createFeed = jasmine.createSpy('create feed')
-		@persistence.openFolder = jasmine.createSpy('open folder')
-
-		folder = {id: 2, name: 'design', opened: false}
-		@FolderModel.add(folder)
-		xml = '<?xml version="1.0" ?>
-			<opml version="1.1">
-			  <!--Generated by NewsBlur - www.newsblur.com-->
-			  <head>
-			    <title>
-			      NewsBlur Feeds
-			    </title>
-			    <dateCreated>
-			      2013-03-14 16:44:01.356965
-			    </dateCreated>
-			    <dateModified>
-			      2013-03-14 16:44:01.356965
-			    </dateModified>
-			  </head>
-			  <body>
-			  	<outline text="Design" title="Design">
-			  		<outline htmlUrl="http://worrydream.com/" text=
-			      "&lt;div&gt;Bret Victor\'s website&lt;/div&gt;"
-			      title="&lt;div&gt;Bret Victor\'s website&lt;/div&gt;"
-			      type="rss"
-			      version="RSS" xmlUrl="http://worrydream.com/feed.xml"/>
-			    </outline>
-			  </body>
-			</opml>'
-
-		@FolderBl.import(xml)
-
-		expect(@persistence.createFolder).not.toHaveBeenCalled()
-		expect(@persistence.createFeed).toHaveBeenCalledWith(
-			'http://worrydream.com/feed.xml', 2, jasmine.any(Function))
-		expect(folder.opened).toBe(true)
-		expect(@persistence.openFolder).toHaveBeenCalled()
-
-
-
-	it 'should not import a feed if it already exists', =>
-		@persistence.createFolder = jasmine.createSpy('create folder')
-		@persistence.createFeed = jasmine.createSpy('create feed')
-
-		@FeedModel.add({urlHash: hex_md5('http://worrydream.com/feed.xml')})
-
-		xml = '<?xml version="1.0" ?>
-			<opml version="1.1">
-			  <!--Generated by NewsBlur - www.newsblur.com-->
-			  <head>
-			    <title>
-			      NewsBlur Feeds
-			    </title>
-			    <dateCreated>
-			      2013-03-14 16:44:01.356965
-			    </dateCreated>
-			    <dateModified>
-			      2013-03-14 16:44:01.356965
-			    </dateModified>
-			  </head>
-			  <body>
-			  		<outline htmlUrl="http://worrydream.com/" text=
-			      "&lt;div&gt;Bret Victor\'s website&lt;/div&gt;"
-			      title="&lt;div&gt;Bret Victor\'s website&lt;/div&gt;"
-			      type="rss"
-			      version="RSS" xmlUrl="http://worrydream.com/feed.xml"/>
-			  </body>
-			</opml>'
-
-		@FolderBl.import(xml)
-
-		expect(@persistence.createFolder).not.toHaveBeenCalled()
-		expect(@persistence.createFeed).not.toHaveBeenCalled()
\ No newline at end of file
diff --git a/js/tests/services/bl/itemblSpec.coffee b/js/tests/services/bl/itemblSpec.coffee
deleted file mode 100644
index 4c2a5d660..000000000
--- a/js/tests/services/bl/itemblSpec.coffee
+++ /dev/null
@@ -1,217 +0,0 @@
-###
-
-ownCloud - News
-
-@author Bernhard Posselt
-@copyright 2012 Bernhard Posselt nukeawhale@gmail.com