summaryrefslogtreecommitdiffstats
path: root/js/tests
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-15 18:11:38 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-15 18:11:38 +0200
commit94e82411f7def5b3f79df43eb0279142cea19f1e (patch)
treef352530c4689644dcf58c8fcf8a42dc8b0c6fa2c /js/tests
parentc171e9e381e6d7af9c2dd44ff82f9fef381a2e1a (diff)
fix unittest breakage errors in firefox and phantomjs, bump build tools
Diffstat (limited to 'js/tests')
-rw-r--r--js/tests/controllers/itemcontrollerSpec.coffee6
-rw-r--r--js/tests/services/businesslayer/feedbusinesslayerSpec.coffee6
-rw-r--r--js/tests/services/businesslayer/folderbusinesslayerSpec.coffee6
3 files changed, 9 insertions, 9 deletions
diff --git a/js/tests/controllers/itemcontrollerSpec.coffee b/js/tests/controllers/itemcontrollerSpec.coffee
index c4827a9e8..96e15e292 100644
--- a/js/tests/controllers/itemcontrollerSpec.coffee
+++ b/js/tests/controllers/itemcontrollerSpec.coffee
@@ -26,8 +26,9 @@ describe 'ItemController', ->
beforeEach module 'News'
- beforeEach inject ($controller, @ItemBusinessLayer, @FeedBusinessLayer) =>
- @scope = {}
+ beforeEach inject ($controller, @ItemBusinessLayer, @FeedBusinessLayer,
+ $rootScope) =>
+ @scope = $rootScope.$new()
@persistence = {
getItems: ->
}
@@ -46,4 +47,3 @@ describe 'ItemController', ->
expect(@scope.feedBusinessLayer).toBe(@FeedBusinessLayer)
- it 'should '
diff --git a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
index bcb4476cf..1ee9aaa3d 100644
--- a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
@@ -230,17 +230,17 @@ describe 'FeedBusinessLayer', ->
expect =>
@FeedBusinessLayer.create('john')
- .toThrow(new @_ExistsError())
+ .toThrow(new @_ExistsError('Exists already'))
expect =>
@FeedBusinessLayer.create('johns')
- .not.toThrow(new @_ExistsError())
+ .not.toThrow(new @_ExistsError('Exists already'))
it 'should not create feeds that are empty', =>
expect =>
@FeedBusinessLayer.create(' ')
- .toThrow(new Error())
+ .toThrow(new Error('Url must not be empty'))
it 'should create a feed before theres a response from the server', =>
diff --git a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee
index 8c0264188..32573dde5 100644
--- a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee
@@ -140,17 +140,17 @@ describe 'FolderBusinessLayer', ->
expect =>
@FolderBusinessLayer.create('john')
- .toThrow(new @_ExistsError())
+ .toThrow(new @_ExistsError('Exists already'))
expect =>
@FolderBusinessLayer.create('johns')
- .not.toThrow(new @_ExistsError())
+ .not.toThrow(new @_ExistsError('Exists already'))
it 'should not create folders that are empty', =>
expect =>
@FolderBusinessLayer.create(' ')
- .toThrow(new Error())
+ .toThrow(new Error('Folder name must not be empty'))
it 'should create a folder before theres a response from the server', =>