From c77ee9f0adecb6f88a028238fbd04984ed3c2786 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 14 Apr 2015 12:12:07 +0200 Subject: [PATCH] Renaming wiki_page to wikipage in timelines --- taiga/timeline/timeline_implementations.py | 4 ++-- tests/integration/test_timeline.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/taiga/timeline/timeline_implementations.py b/taiga/timeline/timeline_implementations.py index 4bcc6a65..f23d7401 100644 --- a/taiga/timeline/timeline_implementations.py +++ b/taiga/timeline/timeline_implementations.py @@ -51,7 +51,7 @@ def userstory_timeline(instance, extra_data={}): if instance.milestone is not None: result["milestone"] = service.extract_milestone_info(instance.milestone) - + result.update(extra_data) return result @@ -85,7 +85,7 @@ def task_timeline(instance, extra_data={}): @register_timeline_implementation("wiki.wikipage", "delete") def wiki_page_timeline(instance, extra_data={}): result ={ - "wiki_page": service.extract_wiki_page_info(instance), + "wikipage": service.extract_wiki_page_info(instance), "project": service.extract_project_info(instance.project), } result.update(extra_data) diff --git a/tests/integration/test_timeline.py b/tests/integration/test_timeline.py index c90ff72e..bb35e8c3 100644 --- a/tests/integration/test_timeline.py +++ b/tests/integration/test_timeline.py @@ -183,7 +183,7 @@ def test_create_wiki_page_timeline(): history_services.take_snapshot(page, user=page.owner) project_timeline = service.get_project_timeline(page.project) 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"]["name"] == page.owner.get_full_name() @@ -275,7 +275,7 @@ def test_update_wiki_page_timeline(): history_services.take_snapshot(page, user=page.owner) project_timeline = service.get_project_timeline(page.project) 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"][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) project_timeline = service.get_project_timeline(page.project) 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():