From bcba311485074e75ad62f338cc8159bf99522fab Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Mon, 22 Apr 2013 10:24:07 +0200 Subject: add http:// to feed url if its not specified, fix #111 and fix #61 --- .../businesslayer/feedbusinesslayerSpec.coffee | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'js/tests') diff --git a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee index d14d50b8d..2bb37c023 100644 --- a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee +++ b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee @@ -243,7 +243,7 @@ describe 'FeedBusinessLayer', -> it 'should not create a feed if it already exists', => - item1 = {url: 'john'} + item1 = {url: 'http://john'} @FeedModel.add(item1) expect => @@ -266,24 +266,32 @@ describe 'FeedBusinessLayer', -> expect(@FeedModel.size()).toBe(1) - it 'should set a title and an url hash to the newly crated feed', => + it 'should set a title and an url to the newly created feed', => url = 'www.google.de' @FeedBusinessLayer.create(url) - feed = @FeedModel.getByUrl(url) + feed = @FeedModel.getByUrl('http://' + url) - expect(feed.title).toBe('www.google.de') - expect(feed.url).toBe(url) + expect(feed.title).toBe('http://www.google.de') + expect(feed.url).toBe('http://' + url) expect(feed.folderId).toBe(0) expect(feed.unreadCount).toBe(0) expect(@imagePath).toHaveBeenCalledWith('core', 'loading.gif') + it 'should not add http when it already is at the start of created feed', => + url = 'https://www.google.de' + @FeedBusinessLayer.create(url) + feed = @FeedModel.getByUrl(url) + + expect(feed.url).toBe(url) + + it 'should make a create feed request', => @persistence.createFeed = jasmine.createSpy('add feed') @FeedBusinessLayer.create(' johns ') - expect(@persistence.createFeed).toHaveBeenCalledWith('johns', 0, + expect(@persistence.createFeed).toHaveBeenCalledWith('http://johns', 0, jasmine.any(Function)) @@ -316,7 +324,7 @@ describe 'FeedBusinessLayer', -> expect(onSuccess).not.toHaveBeenCalled() expect(onFailure).toHaveBeenCalled() - expect(@FeedModel.getByUrl('johns').error).toBe( + expect(@FeedModel.getByUrl('http://johns').error).toBe( @response.msg) -- cgit v1.2.3