Skip to content

Speed up test_comments by using setUpTestData #2310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2016
Merged

Speed up test_comments by using setUpTestData #2310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 40 additions & 41 deletions readthedocs/rtd_tests/tests/test_comments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,29 @@ def create_node(hash=None, commit=None, **kwargs):


class ModerationTests(TestCase):
def setUp(self):
self.owner = create_user(username='owner', password='test')
@classmethod
def setUpTestData(cls):
cls.owner = create_user(username='owner', password='test')

self.moderated_project = get(Project, comment_moderation=True)
self.moderated_project.users.add(self.owner)
cls.moderated_project = get(Project, comment_moderation=True)
cls.moderated_project.users.add(cls.owner)

self.moderated_node = create_node(project=self.moderated_project)
cls.moderated_node = create_node(project=cls.moderated_project)

self.first_moderated_comment = get(DocumentComment,
node=self.moderated_node)
self.second_moderated_comment = get(DocumentComment,
node=self.moderated_node)
cls.first_moderated_comment = get(DocumentComment,
node=cls.moderated_node)
cls.second_moderated_comment = get(DocumentComment,
node=cls.moderated_node)

self.unmoderated_project = get(Project, comment_moderation=False)
self.unmoderated_project.users.add(self.owner)
cls.unmoderated_project = get(Project, comment_moderation=False)
cls.unmoderated_project.users.add(cls.owner)

self.unmoderated_node = create_node(project=self.unmoderated_project)
cls.unmoderated_node = create_node(project=cls.unmoderated_project)

self.first_unmoderated_comment = get(DocumentComment,
node=self.unmoderated_node)
self.second_unmoderated_comment = get(DocumentComment,
node=self.unmoderated_node)
cls.first_unmoderated_comment = get(DocumentComment,
node=cls.unmoderated_node)
cls.second_unmoderated_comment = get(DocumentComment,
node=cls.unmoderated_node)

def test_approved_comments(self):
c = self.first_unmoderated_comment
Expand Down Expand Up @@ -204,19 +205,20 @@ def test_nodes_with_same_hash_oddness(self):


class CommentModerationViewsTests(TestCase):
def setUp(self):
self.owner = create_user(username='owner', password='test')
@classmethod
def setUpTestData(cls):
cls.owner = create_user(username='owner', password='test')

self.moderated_project = get(Project, comment_moderation=True)
self.moderated_project.users.add(self.owner)
cls.moderated_project = get(Project, comment_moderation=True)
cls.moderated_project.users.add(cls.owner)

self.moderated_node = get(DocumentNode,
project=self.moderated_project)
get(NodeSnapshot, node=self.moderated_node)
cls.moderated_node = get(DocumentNode,
project=cls.moderated_project)
get(NodeSnapshot, node=cls.moderated_node)

self.moderated_comment = get(DocumentComment,
text='Some comment text.',
node=self.moderated_node)
cls.moderated_comment = get(DocumentComment,
text='Some comment text.',
node=cls.moderated_node)

def test_unmoderated_comments_are_listed_in_view(self):

Expand All @@ -232,17 +234,18 @@ class CommentAPIViewsTests(APITestCase):

request_factory = APIRequestFactory()

def setUp(self):
self.owner = create_user(username='owner', password='test')
@classmethod
def setUpTestData(cls):
cls.owner = create_user(username='owner', password='test')

self.moderated_project = get(Project, comment_moderation=True)
self.moderated_project.users.add(self.owner)
self.moderated_version = get(Version, project=self.moderated_project)
cls.moderated_project = get(Project, comment_moderation=True)
cls.moderated_project.users.add(cls.owner)
cls.moderated_version = get(Version, project=cls.moderated_project)

self.moderated_node = get(DocumentNode,
project=self.moderated_project,
version=self.moderated_version)
get(NodeSnapshot, node=self.moderated_node)
cls.moderated_node = get(DocumentNode,
project=cls.moderated_project,
version=cls.moderated_version)
get(NodeSnapshot, node=cls.moderated_node)

def test_get_comments_view(self):

Expand Down Expand Up @@ -425,12 +428,6 @@ def test_add_comment_view_with_changed_hash(self):

self.assertEqual(response.data['results'][0]['text'], comment_text)

def test_retrieve_comment_on_old_hash(self):
pass

def test_post_comment_on_old_hash(self):
pass

def test_moderate_comment_by_approving(self):
user = create_user(username='test', password='test')

Expand Down Expand Up @@ -465,3 +462,5 @@ def test_stranger_cannot_moderate_comments(self):
)

self.assertEqual(response.status_code, 403)

test_retrieve_comment_on_old_hash = test_post_comment_on_old_hash = None