From 623c945bb2b069fb739dcd7020de6842d672e059 Mon Sep 17 00:00:00 2001 From: Jose Antonio Gonzalez Date: Fri, 24 Nov 2017 11:25:37 +0200 Subject: [PATCH] change default article name to be course name instead of slug --- common/test/acceptance/tests/lms/test_lms.py | 6 ++---- lms/djangoapps/course_wiki/tests/tests.py | 1 + lms/djangoapps/course_wiki/views.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/test/acceptance/tests/lms/test_lms.py b/common/test/acceptance/tests/lms/test_lms.py index 548034e787..91bd202ee2 100644 --- a/common/test/acceptance/tests/lms/test_lms.py +++ b/common/test/acceptance/tests/lms/test_lms.py @@ -709,10 +709,8 @@ class HighLevelTabTest(UniqueCourseTest): self.assertTrue(self.tab_nav.is_on_tab('Wiki')) # Assert that a default wiki is created - expected_article_name = "{org}.{course_number}.{course_run}".format( - org=self.course_info['org'], - course_number=self.course_info['number'], - course_run=self.course_info['run'] + expected_article_name = "{course_name}".format( + course_name=self.course_info['display_name'] ) self.assertEqual(expected_article_name, course_wiki.article_name) diff --git a/lms/djangoapps/course_wiki/tests/tests.py b/lms/djangoapps/course_wiki/tests/tests.py index 78586cbe1d..87ba1fa69e 100644 --- a/lms/djangoapps/course_wiki/tests/tests.py +++ b/lms/djangoapps/course_wiki/tests/tests.py @@ -104,6 +104,7 @@ class WikiRedirectTestCase(EnterpriseTestConsentRequired, LoginEnrollmentTestCas self.assertEquals(resp.status_code, 200) self.has_course_navigator(resp) + self.assertContains(resp, '

{}

'.format(course.display_name_with_default)) def has_course_navigator(self, resp): """ diff --git a/lms/djangoapps/course_wiki/views.py b/lms/djangoapps/course_wiki/views.py index e6cd127870..2479d46862 100644 --- a/lms/djangoapps/course_wiki/views.py +++ b/lms/djangoapps/course_wiki/views.py @@ -83,7 +83,7 @@ def course_wiki_redirect(request, course_id, wiki_path=""): # pylint: disable=u urlpath = URLPath.create_article( root, course_slug, - title=course_slug, + title=course.display_name_with_default, content=content, user_message=_("Course page automatically created."), user=None,