fixing test

jaesivsm · Feb 26, 2016 · be6b923 · be6b923
1 parent f1f7c6a
commit be6b923
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 14 deletions.
diff --git a/src/tests/api/__init__.py b/src/tests/api/__init__.py
@@ -1,6 +0,0 @@
-from tests.api.category import CategoryApiTest
-from tests.api.feed import FeedApiTest
-from tests.api.article import ArticleApiTest
-
-
-__all__ = ['CategoryApiTest', 'FeedApiTest', 'ArticleApiTest']

diff --git a/src/tests/api/article.py → src/tests/api/article_test.py b/src/tests/api/article.py → src/tests/api/article_test.py
diff --git a/src/tests/api/category.py → src/tests/api/category_test.py b/src/tests/api/category.py → src/tests/api/category_test.py
diff --git a/src/tests/api/feed.py → src/tests/api/feed_test.py b/src/tests/api/feed.py → src/tests/api/feed_test.py
@@ -1,5 +1,6 @@
 from tests.base import JarrFlaskCommon
 from tests.api.common import ApiCommon
+from web.controllers import UserController
 
 
 class FeedApiTest(JarrFlaskCommon, ApiCommon):
@@ -69,8 +70,13 @@ def test_feed_article_deletion(self):
 
     def test_feed_list_fetchable(self):
         resp = self._api('get', 'feeds/fetchable', user='user1')
+        self.assertEquals(403, resp.status_code)
+        UserController().update({'login__in': ['admin', 'user1']},
+                                {'is_api': True})
+        resp = self._api('get', 'feeds/fetchable', user='user1')
         self.assertEquals(3, len(resp.json()))
         self.assertEquals(200, resp.status_code)
+
         resp = self._api('get', 'feeds/fetchable', user='user1')
         self.assertEquals(204, resp.status_code)
 

diff --git a/src/tests/controllers/__init__.py b/src/tests/controllers/__init__.py
@@ -1,8 +0,0 @@
-from tests.controllers.user import UserControllerTest
-from tests.controllers.category import CategoryControllerTest
-from tests.controllers.feed import FeedControllerTest
-from tests.controllers.article import ArticleControllerTest
-
-
-__all__ = ['UserControllerTest', 'CategoryControllerTest',
-           'FeedControllerTest', 'ArticleControllerTest']

diff --git a/src/tests/controllers/article.py → src/tests/controllers/article_test.py b/src/tests/controllers/article.py → src/tests/controllers/article_test.py
diff --git a/src/tests/controllers/category.py → src/tests/controllers/category_test.py b/src/tests/controllers/category.py → src/tests/controllers/category_test.py
diff --git a/src/tests/controllers/feed.py → src/tests/controllers/feed_test.py b/src/tests/controllers/feed.py → src/tests/controllers/feed_test.py
diff --git a/src/tests/controllers/user.py → src/tests/controllers/user_test.py b/src/tests/controllers/user.py → src/tests/controllers/user_test.py
diff --git a/src/tests/crawler.py → src/tests/crawler_test.py b/src/tests/crawler.py → src/tests/crawler_test.py