From f3091d84e14537a42334e66ea6588cf2b83f9ab6 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Thu, 11 Sep 2014 20:26:04 +0200
Subject: various work on creating feeds, folders and showing folders

---
 js/tests/unit/service/FeedResourceSpec.js   | 40 ++++++++++++++++++++++++++---
 js/tests/unit/service/FolderResourceSpec.js | 25 ++++--------------
 2 files changed, 42 insertions(+), 23 deletions(-)

(limited to 'js/tests/unit/service')

diff --git a/js/tests/unit/service/FeedResourceSpec.js b/js/tests/unit/service/FeedResourceSpec.js
index 839ae650d..4b0f291f8 100644
--- a/js/tests/unit/service/FeedResourceSpec.js
+++ b/js/tests/unit/service/FeedResourceSpec.js
@@ -138,15 +138,15 @@ describe('FeedResource', function () {
 
 
     it ('should move a feed', inject(function (FeedResource) {
-        http.expectPOST('base/feeds/3/move', {
+        http.expectPOST('base/feeds/2/move', {
             parentFolderId: 5
         }).respond(200, {});
 
-        FeedResource.move('1sye', 5);
+        FeedResource.move(2, 5);
 
         http.flush();
 
-        expect(FeedResource.get('1sye').folderId).toBe(5);
+        expect(FeedResource.get('sye').folderId).toBe(5);
     }));
 
 
@@ -165,6 +165,40 @@ describe('FeedResource', function () {
     }));
 
 
+    it ('should display a feed error', inject(function (FeedResource) {
+        http.expectPOST('base/feeds', {
+            parentFolderId: 5,
+            url: 'hey',
+            title: 'ABC'
+        }).respond(400, {message: 'noo'});
+
+        FeedResource.create('hey', 5, 'abc');
+
+        http.flush();
+
+        expect(FeedResource.get('hey').error).toBe('noo');
+        expect(FeedResource.get('hey').faviconLink).toBe('');
+    }));
+
+
+    it ('should create a feed with no folder', inject(function (FeedResource) {
+        http.expectPOST('base/feeds', {
+            parentFolderId: 0,
+            url: 'hey',
+            title: 'ABC'
+        }).respond(200, {});
+
+        FeedResource.create('hey', undefined, 'abc');
+
+        http.flush();
+
+        expect(FeedResource.get('hey').folderId).toBe(0);
+        expect(FeedResource.get('hey').faviconLink).toBe(
+            '/base/apps/news/css/loading.gif');
+    }));
+
+
+
     it ('should not create a feed if it exists', inject(function (
     FeedResource) {
         http.expectPOST('base/feeds', {
diff --git a/js/tests/unit/service/FolderResourceSpec.js b/js/tests/unit/service/FolderResourceSpec.js
index 01858bbc6..2a9108282 100644
--- a/js/tests/unit/service/FolderResourceSpec.js
+++ b/js/tests/unit/service/FolderResourceSpec.js
@@ -58,20 +58,6 @@ describe('FolderResource', function () {
     }));
 
 
-    it ('should not rename a folder if it exists', inject(function (
-    FolderResource) {
-        http.expectPOST('base/folders/1/rename', {
-            folderName: 'SYE'
-        }).respond(200, {});
-
-        FolderResource.rename('ye', 'sye');
-
-        http.flush();
-
-        expect(FolderResource.get('ye').id).toBe(1);
-    }));
-
-
     it ('should open a folder', inject(function (FolderResource) {
         http.expectPOST('base/folders/3/open', {
             folderId: 3,
@@ -99,17 +85,16 @@ describe('FolderResource', function () {
     }));
 
 
-    it ('should not create a folder if it exists', inject(function (
-    FolderResource) {
+    it ('should set a folder error message', inject(function (FolderResource) {
         http.expectPOST('base/folders', {
-            folderName: 'SYE'
-        }).respond(200, {});
+            folderName: 'HEY'
+        }).respond(400, {message: 'carramba'});
 
-        FolderResource.create('SYE');
+        FolderResource.create('hey');
 
         http.flush();
 
-        expect(FolderResource.size()).toBe(3);
+        expect(FolderResource.get('HEY').error).toBe('carramba');
     }));
 
 
-- 
cgit v1.2.3