瀏覽代碼

[home] Refactor tests to easily check for duplicate tag creation

Romain Rigaux 10 年之前
父節點
當前提交
60ad717
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      desktop/core/src/desktop/api_tests.py

+ 4 - 4
desktop/core/src/desktop/api_tests.py

@@ -45,12 +45,12 @@ class TestDocModelTags():
     grant_access(self.user.username, self.user.username, "desktop")
     grant_access(self.user_not_me.username, self.user_not_me.username, "desktop")
 
-  def add_tag(self, name):
+  def add_tag(self, name, expected_status=0):
     response = self.client.post("/desktop/api/tag/add_tag", {'name': name})
     content = json.loads(response.content)
-    assert_equal(content['status'], 0, content)
+    assert_equal(content['status'], expected_status, content)
 
-    return content['id']
+    return content.get('id')
 
   def add_doc(self, name):
     script = PigScript.objects.create(owner=self.user)
@@ -97,7 +97,7 @@ class TestDocModelTags():
     tag_id = self.add_tag(tag_name)
     assert_equal(n + 1, DocumentTag.objects.filter(owner=self.user, tag=tag_name).count())
 
-    tag_id = self.add_tag(tag_name)
+    tag_id = self.add_tag(tag_name, expected_status=-1)
     assert_equal(n + 1, DocumentTag.objects.filter(owner=self.user, tag=tag_name).count())
 
   def test_add_and_clean_duplicate_tag(self):