From b54b454f8a36e50e46a71a8cc14c5caa59a778e4 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 11 Apr 2013 11:33:05 +0200 Subject: fixed feedmodel --- js/tests/services/models/feedmodelSpec.coffee | 20 ++++++++++++-------- js/tests/services/models/foldermodelSpec.coffee | 4 +++- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'js/tests/services/models') diff --git a/js/tests/services/models/feedmodelSpec.coffee b/js/tests/services/models/feedmodelSpec.coffee index 8c2043a39..1ac76a65e 100644 --- a/js/tests/services/models/feedmodelSpec.coffee +++ b/js/tests/services/models/feedmodelSpec.coffee @@ -52,8 +52,11 @@ describe 'FeedModel', -> item = {faviconLink: null, urlHash: 'hi'} @FeedModel.add(item) + item2 = {faviconLink: null, urlHash: 'his'} + @FeedModel.add(item2) + expect(@FeedModel.getByUrlHash('hi')).toBe(item) - expect(@FeedModel.size()).toBe(1) + expect(@FeedModel.size()).toBe(2) it 'should clear the url hash cache', => @@ -78,16 +81,14 @@ describe 'FeedModel', -> item = {faviconLink: null, urlHash: 'hi', test: 'heheh'} @FeedModel.add(item) - item = {id: 3, faviconLink: null, urlHash: 'hi', test: 'hoho'} - @FeedModel.add(item) - - item = {id: 4, faviconLink: null, urlHash: 'his'} - @FeedModel.add(item) + item2 = {id: 3, faviconLink: null, urlHash: 'hi', test: 'hoho'} + @FeedModel.add(item2) expect(@FeedModel.getByUrlHash('hi').id).toBe(3) + expect(@FeedModel.getByUrlHash('hi').test).toBe('hoho') expect(@FeedModel.getById(3).id).toBe(3) expect(@FeedModel.getById(3).test).toBe('hoho') - expect(@FeedModel.size()).toBe(2) + expect(@FeedModel.size()).toBe(1) it 'should update normally', => @@ -97,8 +98,11 @@ describe 'FeedModel', -> item2 = {id: 3, faviconLink: null, urlHash: 'his', test: 'hoho'} @FeedModel.add(item2) - expect(@FeedModel.getById(3).id).toBe(3) + expect(@FeedModel.getByUrlHash('hi')).toBe(undefined) + expect(@FeedModel.getByUrlHash('his').id).toBe(3) + expect(@FeedModel.getByUrlHash('his').test).toBe('hoho') expect(@FeedModel.getById(3).test).toBe('hoho') expect(@FeedModel.size()).toBe(1) + diff --git a/js/tests/services/models/foldermodelSpec.coffee b/js/tests/services/models/foldermodelSpec.coffee index 8c2dd4b71..d34b2e309 100644 --- a/js/tests/services/models/foldermodelSpec.coffee +++ b/js/tests/services/models/foldermodelSpec.coffee @@ -35,8 +35,10 @@ describe 'FolderModel', -> it 'should add folders without id but name if they dont exist yet', => item = {name: 'Hi'} @FolderModel.add(item) + item1 = {name: 'His'} + @FolderModel.add(item1) expect(@FolderModel.getByName('hi')).toBe(item) - expect(@FolderModel.size()).toBe(1) + expect(@FolderModel.size()).toBe(2) it 'should clear the fodername cache', => -- cgit v1.2.3