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

3 files changed, 20 insertions, 17 deletions

diff --git a/js/tests/controllers/feedcontrollerSpec.coffee b/js/tests/controllers/feedcontrollerSpec.coffee
index e3ecb357b..f28319bdf 100644
--- a/js/tests/controllers/feedcontrollerSpec.coffee
+++ b/js/tests/controllers/feedcontrollerSpec.coffee
@@ -21,7 +21,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 
-describe '_FeedController', ->
+describe 'FeedController', ->
 
 	beforeEach module 'News'
 
@@ -30,8 +30,9 @@ describe '_FeedController', ->
 			@persistence = {}
 
 
-	beforeEach inject ($controller, @FolderBl, @FeedBl, $rootScope,
-		               @unreadCountFormatter, @SubscriptionsBl, @StarredBl) =>
+	beforeEach inject ($controller, @FolderBusinessLayer, @FeedBusinessLayer,
+	                   $rootScope, @unreadCountFormatter,
+	                   @SubscriptionsBusinessLayer, @StarredBusinessLayer) =>
 		@scope = $rootScope.$new()
 		replace =
 			$scope: @scope
@@ -53,19 +54,20 @@ describe '_FeedController', ->
 		expect(@scope.unreadCountFormatter).toBe(@unreadCountFormatter)
 
 
-	it 'should make FeedBl available', =>
-		expect(@scope.feedBl).toBe(@FeedBl)
+	it 'should make FeedBusinessLayer available', =>
+		expect(@scope.feedBusinessLayer).toBe(@FeedBusinessLayer)
 
 
-	it 'should make FolderBl available', =>
-		expect(@scope.folderBl).toBe(@FolderBl)
+	it 'should make FolderBusinessLayer available', =>
+		expect(@scope.folderBusinessLayer).toBe(@FolderBusinessLayer)
 
 
-	it 'should make SubscriptionsBl available', =>
-		expect(@scope.subscriptionsBl).toBe(@SubscriptionsBl)
+	it 'should make SubscriptionsBusinessLayer available', =>
+		expect(@scope.subscriptionsBusinessLayer).toBe(
+			@SubscriptionsBusinessLayer)
 
-	it 'should make StarredBl available', =>
-		expect(@scope.starredBl).toBe(@StarredBl)
+	it 'should make StarredBusinessLayer available', =>
+		expect(@scope.starredBusinessLayer).toBe(@StarredBusinessLayer)
 
 	it 'should not add folders that have no name', =>
 		@persistence.createFolder = jasmine.createSpy('create')
diff --git a/js/tests/controllers/itemcontrollerSpec.coffee b/js/tests/controllers/itemcontrollerSpec.coffee
index d6a33b68e..c4827a9e8 100644
--- a/js/tests/controllers/itemcontrollerSpec.coffee
+++ b/js/tests/controllers/itemcontrollerSpec.coffee
@@ -26,7 +26,7 @@ describe 'ItemController', ->
 
 	beforeEach module 'News'
 
-	beforeEach inject ($controller, @ItemBl, @FeedBl) =>
+	beforeEach inject ($controller, @ItemBusinessLayer, @FeedBusinessLayer) =>
 		@scope = {}
 		@persistence = {
 			getItems: ->
@@ -38,12 +38,12 @@ describe 'ItemController', ->
 		@controller = $controller('ItemController', replace)
 
 
-	it 'should make ItemBl availabe', =>
-		expect(@scope.itemBl).toBe(@ItemBl)
+	it 'should make ItemBusinessLayer availabe', =>
+		expect(@scope.itemBusinessLayer).toBe(@ItemBusinessLayer)
 
 
-	it 'should make FeedBl availabe', =>
-		expect(@scope.feedBl).toBe(@FeedBl)
+	it 'should make FeedBusinessLayer availabe', =>
+		expect(@scope.feedBusinessLayer).toBe(@FeedBusinessLayer)
 
 
 	it 'should '
diff --git a/js/tests/controllers/settingscontrollerSpec.coffee b/js/tests/controllers/settingscontrollerSpec.coffee
index baedbadaf..ded9232e2 100644
--- a/js/tests/controllers/settingscontrollerSpec.coffee
+++ b/js/tests/controllers/settingscontrollerSpec.coffee
@@ -25,7 +25,8 @@ describe 'SettingsController', ->
 
 	beforeEach module 'News'
 
-	beforeEach inject ($controller, @FeedBl, @FolderBl, @ShowAll) =>
+	beforeEach inject ($controller, @FeedBusinessLayer, @FolderBusinessLayer,
+	                   @ShowAll) =>
 		@scope = {}
 		@replace =
 			'$scope': @scope