|
|
@@ -31,6 +31,7 @@ from desktop.lib.test_utils import grant_access
|
|
|
from desktop.models import DocumentTag , Document
|
|
|
from pig.models import PigScript
|
|
|
from useradmin.models import get_default_user_group
|
|
|
+from desktop.api import massaged_documents_for_json, _get_docs
|
|
|
|
|
|
|
|
|
class TestDocModelTags():
|
|
|
@@ -48,7 +49,7 @@ class TestDocModelTags():
|
|
|
def add_tag(self, name):
|
|
|
response = self.client.post("/desktop/api/tag/add_tag", {'name': name})
|
|
|
assert_equal(0, json.loads(response.content)['status'], response.content)
|
|
|
- return json.loads(response.content)['tag_id']
|
|
|
+ return json.loads(response.content)['id']
|
|
|
|
|
|
def add_doc(self, name):
|
|
|
script = PigScript.objects.create(owner=self.user)
|
|
|
@@ -89,30 +90,28 @@ class TestDocModelTags():
|
|
|
|
|
|
def test_remove_tags(self):
|
|
|
response = self.client.post("/desktop/api/tag/add_tag", {'name': 'my_tag'})
|
|
|
- tag_id = json.loads(response.content)['tag_id']
|
|
|
+ tag_id = json.loads(response.content)['id']
|
|
|
|
|
|
- response = self.client.get("/desktop/api/tag/remove_tags")
|
|
|
+ response = self.client.get("/desktop/api/tag/remove_tag")
|
|
|
assert_equal(-1, json.loads(response.content)['status'])
|
|
|
|
|
|
- response = self.client_not_me.post("/desktop/api/tag/remove_tags", {'data': json.dumps({'tag_ids': [tag_id]})})
|
|
|
+ response = self.client_not_me.post("/desktop/api/tag/remove_tag", {'tag_id': tag_id})
|
|
|
assert_equal(-1, json.loads(response.content)['status'], response.content)
|
|
|
|
|
|
- response = self.client.post("/desktop/api/tag/remove_tags", {'data': json.dumps({'tag_ids': [tag_id]})})
|
|
|
+ response = self.client.post("/desktop/api/tag/remove_tag", {'tag_id': tag_id})
|
|
|
assert_equal(0, json.loads(response.content)['status'], response.content)
|
|
|
|
|
|
assert_false(DocumentTag.objects.filter(id=tag_id).exists())
|
|
|
|
|
|
- def test_list_tags(self):
|
|
|
- tag_id = self.add_tag('my_list_tags')
|
|
|
+ def test_massaged_documents_for_json(self):
|
|
|
+ docs = _get_docs(self.user)
|
|
|
+ assert_equal({}, massaged_documents_for_json(docs, self.user))
|
|
|
|
|
|
- response = self.client.get("/desktop/api/tag/list_tags")
|
|
|
- assert_true([tag for tag in json.loads(response.content) if tag['id'] == tag_id], response.content)
|
|
|
+ tag_name = 'test_massaged_documents_for_json'
|
|
|
+ script, doc = self.add_doc('test_massaged_documents_for_json')
|
|
|
|
|
|
- def test_list_docs(self):
|
|
|
- script, doc = self.add_doc('test-pig')
|
|
|
-
|
|
|
- response = self.client.get("/desktop/api/doc/list_docs")
|
|
|
- assert_true([doc for doc in json.loads(response.content) if doc['id'] == script.id], response.content)
|
|
|
+ docs = _get_docs(self.user)
|
|
|
+ assert_not_equal({}, massaged_documents_for_json(docs, self.user))
|
|
|
|
|
|
def test_tag(self):
|
|
|
script, doc = self.add_doc('tag_pig')
|
|
|
@@ -185,17 +184,18 @@ class TestDocModelPermissions():
|
|
|
def test_share_document_permissions(self):
|
|
|
# No doc
|
|
|
response = self.client.get('/home')
|
|
|
- assert_equal([], list(response.context['documents']))
|
|
|
+ assert_equal({}, json.loads(response.context['json_documents']))
|
|
|
response = self.client_not_me.get('/home')
|
|
|
- assert_equal([], list(response.context['documents']))
|
|
|
+ assert_equal({}, json.loads(response.context['json_documents']))
|
|
|
|
|
|
# Add doc
|
|
|
script, doc = self._add_doc('test_update_permissions')
|
|
|
+ doc_id = '%s' % doc.id
|
|
|
|
|
|
response = self.client.get('/home')
|
|
|
- assert_equal([doc], list(response.context['documents']))
|
|
|
+ assert_true(doc_id in json.loads(response.context['json_documents']))
|
|
|
response = self.client_not_me.get('/home')
|
|
|
- assert_equal([], list(response.context['documents']))
|
|
|
+ assert_false(doc_id in json.loads(response.context['json_documents']))
|
|
|
|
|
|
# Share by user
|
|
|
response = self.client.post("/desktop/api/doc/update_permissions", {
|
|
|
@@ -206,9 +206,9 @@ class TestDocModelPermissions():
|
|
|
assert_equal(0, json.loads(response.content)['status'], response.content)
|
|
|
|
|
|
response = self.client.get('/home')
|
|
|
- assert_equal([doc], list(response.context['documents']))
|
|
|
+ assert_true(doc_id in json.loads(response.context['json_documents']))
|
|
|
response = self.client_not_me.get('/home')
|
|
|
- assert_equal([doc], list(response.context['documents']))
|
|
|
+ assert_true(doc_id in json.loads(response.context['json_documents']))
|
|
|
|
|
|
# Un-share
|
|
|
response = self.client.post("/desktop/api/doc/update_permissions", {
|
|
|
@@ -219,9 +219,9 @@ class TestDocModelPermissions():
|
|
|
assert_equal(0, json.loads(response.content)['status'], response.content)
|
|
|
|
|
|
response = self.client.get('/home')
|
|
|
- assert_equal([doc], list(response.context['documents']))
|
|
|
+ assert_true(doc_id in json.loads(response.context['json_documents']))
|
|
|
response = self.client_not_me.get('/home')
|
|
|
- assert_equal([], list(response.context['documents']))
|
|
|
+ assert_false(doc_id in json.loads(response.context['json_documents']))
|
|
|
|
|
|
# Share by group
|
|
|
default_group = get_default_user_group()
|
|
|
@@ -234,6 +234,6 @@ class TestDocModelPermissions():
|
|
|
assert_equal(0, json.loads(response.content)['status'], response.content)
|
|
|
|
|
|
response = self.client.get('/home')
|
|
|
- assert_equal([doc], list(response.context['documents']))
|
|
|
+ assert_true(doc_id in json.loads(response.context['json_documents']))
|
|
|
response = self.client_not_me.get('/home')
|
|
|
- assert_equal([doc], list(response.context['documents']))
|
|
|
+ assert_true(doc_id in json.loads(response.context['json_documents']))
|