taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renaming wiki_page to wikipage in timelines

remotes/origin/enhancement/email-actions
Alejandro Alonso 2015-04-14 12:12:07 +02:00 committed by David Barragán Merino
parent cb654e56b5
commit c77ee9f0ad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
taiga/timeline/timeline_implementations.py
View File

@ -51,7 +51,7 @@ def userstory_timeline(instance, extra_data={}):
if instance.milestone is not None: if instance.milestone is not None:
result["milestone"] = service.extract_milestone_info(instance.milestone) result["milestone"] = service.extract_milestone_info(instance.milestone)
result.update(extra_data) result.update(extra_data)
return result return result
@ -85,7 +85,7 @@ def task_timeline(instance, extra_data={}):
@register_timeline_implementation("wiki.wikipage", "delete") @register_timeline_implementation("wiki.wikipage", "delete")
def wiki_page_timeline(instance, extra_data={}): def wiki_page_timeline(instance, extra_data={}):
result ={ result ={
"wiki_page": service.extract_wiki_page_info(instance), "wikipage": service.extract_wiki_page_info(instance),
"project": service.extract_project_info(instance.project), "project": service.extract_project_info(instance.project),
} }
result.update(extra_data) result.update(extra_data)

6
tests/integration/test_timeline.py
View File

@ -183,7 +183,7 @@ def test_create_wiki_page_timeline():
history_services.take_snapshot(page, user=page.owner) history_services.take_snapshot(page, user=page.owner)
project_timeline = service.get_project_timeline(page.project) project_timeline = service.get_project_timeline(page.project)
assert project_timeline[0].event_type == "wiki.wikipage.create" assert project_timeline[0].event_type == "wiki.wikipage.create"
assert project_timeline[0].data["wiki_page"]["slug"] == "test wiki page timeline" assert project_timeline[0].data["wikipage"]["slug"] == "test wiki page timeline"
assert project_timeline[0].data["user"]["id"] == page.owner.id assert project_timeline[0].data["user"]["id"] == page.owner.id
assert project_timeline[0].data["user"]["name"] == page.owner.get_full_name() assert project_timeline[0].data["user"]["name"] == page.owner.get_full_name()
@ -275,7 +275,7 @@ def test_update_wiki_page_timeline():
history_services.take_snapshot(page, user=page.owner) history_services.take_snapshot(page, user=page.owner)
project_timeline = service.get_project_timeline(page.project) project_timeline = service.get_project_timeline(page.project)
assert project_timeline[0].event_type == "wiki.wikipage.change" assert project_timeline[0].event_type == "wiki.wikipage.change"
assert project_timeline[0].data["wiki_page"]["slug"] == "test wiki page timeline updated" assert project_timeline[0].data["wikipage"]["slug"] == "test wiki page timeline updated"
assert project_timeline[0].data["values_diff"]["slug"][0] == "test wiki page timeline" assert project_timeline[0].data["values_diff"]["slug"][0] == "test wiki page timeline"
assert project_timeline[0].data["values_diff"]["slug"][1] == "test wiki page timeline updated" assert project_timeline[0].data["values_diff"]["slug"][1] == "test wiki page timeline updated"
@ -352,7 +352,7 @@ def test_delete_wiki_page_timeline():
history_services.take_snapshot(page, user=page.owner, delete=True) history_services.take_snapshot(page, user=page.owner, delete=True)
project_timeline = service.get_project_timeline(page.project) project_timeline = service.get_project_timeline(page.project)
assert project_timeline[0].event_type == "wiki.wikipage.delete" assert project_timeline[0].event_type == "wiki.wikipage.delete"
assert project_timeline[0].data["wiki_page"]["slug"] == "test wiki page timeline" assert project_timeline[0].data["wikipage"]["slug"] == "test wiki page timeline"
def test_delete_membership_timeline(): def test_delete_membership_timeline():