Merge branch 'release'

2015-03-06 08:54:22 -05:00
parent d1af8f354d 849388398c
commit dca05a6095
18 changed files with 225 additions and 596 deletions
--- a/common/test/acceptance/tests/discussion/helpers.py
+++ b/common/test/acceptance/tests/discussion/helpers.py
@@ -5,15 +5,12 @@ Helper functions and classes for discussion tests.
 from uuid import uuid4
 import json

-from ...fixtures import LMS_BASE_URL
-from ...fixtures.course import CourseFixture
 from ...fixtures.discussion import (
    SingleThreadViewFixture,
    Thread,
    Response,
 )
-from ...pages.lms.discussion import DiscussionTabSingleThreadPage
-from ...tests.helpers import UniqueCourseTest
+from ...fixtures import LMS_BASE_URL


 class BaseDiscussionMixin(object):
@@ -86,22 +83,3 @@ class CohortTestMixin(object):
        data = {"users": username}
        response = course_fixture.session.post(url, data=data, headers=course_fixture.headers)
        self.assertTrue(response.ok, "Failed to add user to cohort")
-
-
-class BaseDiscussionTestCase(UniqueCourseTest):
-    def setUp(self):
-        super(BaseDiscussionTestCase, self).setUp()
-
-        self.discussion_id = "test_discussion_{}".format(uuid4().hex)
-        self.course_fixture = CourseFixture(**self.course_info)
-        self.course_fixture.add_advanced_settings(
-            {'discussion_topics': {'value': {'Test Discussion Topic': {'id': self.discussion_id}}}}
-        )
-        self.course_fixture.install()
-
-    def create_single_thread_page(self, thread_id):
-        """
-        Sets up a `DiscussionTabSingleThreadPage` for a given
-        `thread_id`.
-        """
-        return DiscussionTabSingleThreadPage(self.browser, self.course_id, self.discussion_id, thread_id)
--- a/common/test/acceptance/tests/discussion/test_cohorts.py
+++ b/common/test/acceptance/tests/discussion/test_cohorts.py
@@ -3,7 +3,7 @@ Tests related to the cohorting feature.
 """
 from uuid import uuid4

-from .helpers import BaseDiscussionMixin, BaseDiscussionTestCase
+from .helpers import BaseDiscussionMixin
 from .helpers import CohortTestMixin
 from ..helpers import UniqueCourseTest
 from ...pages.lms.auto_auth import AutoAuthPage
@@ -57,17 +57,20 @@ class CohortedDiscussionTestMixin(BaseDiscussionMixin, CohortTestMixin):
        self.assertEquals(self.thread_page.get_group_visibility_label(), "This post is visible to everyone.")


-class DiscussionTabSingleThreadTest(BaseDiscussionTestCase):
+class DiscussionTabSingleThreadTest(UniqueCourseTest):
    """
    Tests for the discussion page displaying a single thread.
    """
    def setUp(self):
        super(DiscussionTabSingleThreadTest, self).setUp()
+        self.discussion_id = "test_discussion_{}".format(uuid4().hex)
+        # Create a course to register for
+        self.course_fixture = CourseFixture(**self.course_info).install()
        self.setup_cohorts()
        AutoAuthPage(self.browser, course_id=self.course_id).visit()

    def setup_thread_page(self, thread_id):
-        self.thread_page = DiscussionTabSingleThreadPage(self.browser, self.course_id, self.discussion_id, thread_id)  # pylint: disable=attribute-defined-outside-init
+        self.thread_page = DiscussionTabSingleThreadPage(self.browser, self.course_id, thread_id)  # pylint: disable=attribute-defined-outside-init
        self.thread_page.visit()

    # pylint: disable=unused-argument
--- a/common/test/acceptance/tests/discussion/test_discussion.py
+++ b/common/test/acceptance/tests/discussion/test_discussion.py
@@ -7,7 +7,6 @@ from pytz import UTC
 from uuid import uuid4
 from nose.plugins.attrib import attr

-from .helpers import BaseDiscussionTestCase
 from ..helpers import UniqueCourseTest
 from ...pages.lms.auto_auth import AutoAuthPage
 from ...pages.lms.courseware import CoursewarePage
@@ -140,17 +139,22 @@ class DiscussionHomePageTest(UniqueCourseTest):


@attr('shard_1')
-class DiscussionTabSingleThreadTest(BaseDiscussionTestCase, DiscussionResponsePaginationTestMixin):
+class DiscussionTabSingleThreadTest(UniqueCourseTest, DiscussionResponsePaginationTestMixin):
    """
    Tests for the discussion page displaying a single thread
    """

    def setUp(self):
        super(DiscussionTabSingleThreadTest, self).setUp()
+        self.discussion_id = "test_discussion_{}".format(uuid4().hex)
+
+        # Create a course to register for
+        CourseFixture(**self.course_info).install()
+
        AutoAuthPage(self.browser, course_id=self.course_id).visit()

    def setup_thread_page(self, thread_id):
-        self.thread_page = self.create_single_thread_page(thread_id)  # pylint: disable=attribute-defined-outside-init
+        self.thread_page = DiscussionTabSingleThreadPage(self.browser, self.course_id, thread_id)  # pylint: disable=attribute-defined-outside-init
        self.thread_page.visit()

    def test_marked_answer_comments(self):
@@ -176,7 +180,7 @@ class DiscussionTabSingleThreadTest(BaseDiscussionTestCase, DiscussionResponsePa


@attr('shard_1')
-class DiscussionOpenClosedThreadTest(BaseDiscussionTestCase):
+class DiscussionOpenClosedThreadTest(UniqueCourseTest):
    """
    Tests for checking the display of attributes on open and closed threads
    """
@@ -184,6 +188,8 @@ class DiscussionOpenClosedThreadTest(BaseDiscussionTestCase):
    def setUp(self):
        super(DiscussionOpenClosedThreadTest, self).setUp()

+        # Create a course to register for
+        CourseFixture(**self.course_info).install()
        self.thread_id = "test_thread_{}".format(uuid4().hex)

    def setup_user(self, roles=[]):
@@ -191,7 +197,6 @@ class DiscussionOpenClosedThreadTest(BaseDiscussionTestCase):
        self.user_id = AutoAuthPage(self.browser, course_id=self.course_id, roles=roles_str).visit().get_user_id()

    def setup_view(self, **thread_kwargs):
-        thread_kwargs.update({'commentable_id': self.discussion_id})
        view = SingleThreadViewFixture(
            Thread(id=self.thread_id, **thread_kwargs)
        )
@@ -204,7 +209,7 @@ class DiscussionOpenClosedThreadTest(BaseDiscussionTestCase):
            self.setup_view(closed=True)
        else:
            self.setup_view()
-        page = self.create_single_thread_page(self.thread_id)
+        page = DiscussionTabSingleThreadPage(self.browser, self.course_id, self.thread_id)
        page.visit()
        page.close_open_thread()
        return page
@@ -225,16 +230,23 @@ class DiscussionOpenClosedThreadTest(BaseDiscussionTestCase):


@attr('shard_1')
-class DiscussionCommentDeletionTest(BaseDiscussionTestCase):
+class DiscussionCommentDeletionTest(UniqueCourseTest):
    """
    Tests for deleting comments displayed beneath responses in the single thread view.
    """
+
+    def setUp(self):
+        super(DiscussionCommentDeletionTest, self).setUp()
+
+        # Create a course to register for
+        CourseFixture(**self.course_info).install()
+
    def setup_user(self, roles=[]):
        roles_str = ','.join(roles)
        self.user_id = AutoAuthPage(self.browser, course_id=self.course_id, roles=roles_str).visit().get_user_id()

    def setup_view(self):
-        view = SingleThreadViewFixture(Thread(id="comment_deletion_test_thread", commentable_id=self.discussion_id))
+        view = SingleThreadViewFixture(Thread(id="comment_deletion_test_thread"))
        view.addResponse(
            Response(id="response1"),
            [Comment(id="comment_other_author", user_id="other"), Comment(id="comment_self_author", user_id=self.user_id)])
@@ -243,7 +255,7 @@ class DiscussionCommentDeletionTest(BaseDiscussionTestCase):
    def test_comment_deletion_as_student(self):
        self.setup_user()
        self.setup_view()
-        page = self.create_single_thread_page("comment_deletion_test_thread")
+        page = DiscussionTabSingleThreadPage(self.browser, self.course_id, "comment_deletion_test_thread")
        page.visit()
        self.assertTrue(page.is_comment_deletable("comment_self_author"))
        self.assertTrue(page.is_comment_visible("comment_other_author"))
@@ -253,7 +265,7 @@ class DiscussionCommentDeletionTest(BaseDiscussionTestCase):
    def test_comment_deletion_as_moderator(self):
        self.setup_user(roles=['Moderator'])
        self.setup_view()
-        page = self.create_single_thread_page("comment_deletion_test_thread")
+        page = DiscussionTabSingleThreadPage(self.browser, self.course_id, "comment_deletion_test_thread")
        page.visit()
        self.assertTrue(page.is_comment_deletable("comment_self_author"))
        self.assertTrue(page.is_comment_deletable("comment_other_author"))
@@ -262,16 +274,23 @@ class DiscussionCommentDeletionTest(BaseDiscussionTestCase):


@attr('shard_1')
-class DiscussionResponseEditTest(BaseDiscussionTestCase):
+class DiscussionResponseEditTest(UniqueCourseTest):
    """
    Tests for editing responses displayed beneath thread in the single thread view.
    """
+
+    def setUp(self):
+        super(DiscussionResponseEditTest, self).setUp()
+
+        # Create a course to register for
+        CourseFixture(**self.course_info).install()
+
    def setup_user(self, roles=[]):
        roles_str = ','.join(roles)
        self.user_id = AutoAuthPage(self.browser, course_id=self.course_id, roles=roles_str).visit().get_user_id()

    def setup_view(self):
-        view = SingleThreadViewFixture(Thread(id="response_edit_test_thread", commentable_id=self.discussion_id))
+        view = SingleThreadViewFixture(Thread(id="response_edit_test_thread"))
        view.addResponse(
            Response(id="response_other_author", user_id="other", thread_id="response_edit_test_thread"),
        )
@@ -298,7 +317,7 @@ class DiscussionResponseEditTest(BaseDiscussionTestCase):
        """
        self.setup_user()
        self.setup_view()
-        page = self.create_single_thread_page("response_edit_test_thread")
+        page = DiscussionTabSingleThreadPage(self.browser, self.course_id, "response_edit_test_thread")
        page.visit()
        self.assertTrue(page.is_response_visible("response_other_author"))
        self.assertFalse(page.is_response_editable("response_other_author"))
@@ -315,7 +334,7 @@ class DiscussionResponseEditTest(BaseDiscussionTestCase):
        """
        self.setup_user(roles=["Moderator"])
        self.setup_view()
-        page = self.create_single_thread_page("response_edit_test_thread")
+        page = DiscussionTabSingleThreadPage(self.browser, self.course_id, "response_edit_test_thread")
        page.visit()
        self.edit_response(page, "response_self_author")
        self.edit_response(page, "response_other_author")
@@ -343,7 +362,7 @@ class DiscussionResponseEditTest(BaseDiscussionTestCase):
        """
        self.setup_user(roles=["Moderator"])
        self.setup_view()
-        page = self.create_single_thread_page("response_edit_test_thread")
+        page = DiscussionTabSingleThreadPage(self.browser, self.course_id, "response_edit_test_thread")
        page.visit()
        self.edit_response(page, "response_self_author")
        self.edit_response(page, "response_other_author")
@@ -356,16 +375,23 @@ class DiscussionResponseEditTest(BaseDiscussionTestCase):


@attr('shard_1')
-class DiscussionCommentEditTest(BaseDiscussionTestCase):
+class DiscussionCommentEditTest(UniqueCourseTest):
    """
    Tests for editing comments displayed beneath responses in the single thread view.
    """
+
+    def setUp(self):
+        super(DiscussionCommentEditTest, self).setUp()
+
+        # Create a course to register for
+        CourseFixture(**self.course_info).install()
+
    def setup_user(self, roles=[]):
        roles_str = ','.join(roles)
        self.user_id = AutoAuthPage(self.browser, course_id=self.course_id, roles=roles_str).visit().get_user_id()

    def setup_view(self):
-        view = SingleThreadViewFixture(Thread(id="comment_edit_test_thread", commentable_id=self.discussion_id))
+        view = SingleThreadViewFixture(Thread(id="comment_edit_test_thread"))
        view.addResponse(
            Response(id="response1"),
            [Comment(id="comment_other_author", user_id="other"), Comment(id="comment_self_author", user_id=self.user_id)])
@@ -380,7 +406,7 @@ class DiscussionCommentEditTest(BaseDiscussionTestCase):
    def test_edit_comment_as_student(self):
        self.setup_user()
        self.setup_view()
-        page = self.create_single_thread_page("comment_edit_test_thread")
+        page = DiscussionTabSingleThreadPage(self.browser, self.course_id, "comment_edit_test_thread")
        page.visit()
        self.assertTrue(page.is_comment_editable("comment_self_author"))
        self.assertTrue(page.is_comment_visible("comment_other_author"))
@@ -390,7 +416,7 @@ class DiscussionCommentEditTest(BaseDiscussionTestCase):
    def test_edit_comment_as_moderator(self):
        self.setup_user(roles=["Moderator"])
        self.setup_view()
-        page = self.create_single_thread_page("comment_edit_test_thread")
+        page = DiscussionTabSingleThreadPage(self.browser, self.course_id, "comment_edit_test_thread")
        page.visit()
        self.assertTrue(page.is_comment_editable("comment_self_author"))
        self.assertTrue(page.is_comment_editable("comment_other_author"))
@@ -400,7 +426,7 @@ class DiscussionCommentEditTest(BaseDiscussionTestCase):
    def test_cancel_comment_edit(self):
        self.setup_user()
        self.setup_view()
-        page = self.create_single_thread_page("comment_edit_test_thread")
+        page = DiscussionTabSingleThreadPage(self.browser, self.course_id, "comment_edit_test_thread")
        page.visit()
        self.assertTrue(page.is_comment_editable("comment_self_author"))
        original_body = page.get_comment_body("comment_self_author")
@@ -412,7 +438,7 @@ class DiscussionCommentEditTest(BaseDiscussionTestCase):
        """Only one editor should be visible at a time within a single response"""
        self.setup_user(roles=["Moderator"])
        self.setup_view()
-        page = self.create_single_thread_page("comment_edit_test_thread")
+        page = DiscussionTabSingleThreadPage(self.browser, self.course_id, "comment_edit_test_thread")
        page.visit()
        self.assertTrue(page.is_comment_editable("comment_self_author"))
        self.assertTrue(page.is_comment_editable("comment_other_author"))