Merge pull request #2466 from edx/christina/move-tests

Move tests related to views files into views/tests.

cms/djangoapps/contentstore/transcripts_utils.py

@@ -17,7 +17,6 @@ from xmodule.exceptions import NotFoundError
 from xmodule.contentstore.content import StaticContent
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore import Location
-from xmodule.modulestore.inheritance import own_metadata
 
 from .utils import get_modulestore
 

cms/djangoapps/contentstore/views/checklist.py

@@ -11,9 +11,6 @@ from django.http import HttpResponseNotFound
 from django.core.exceptions import PermissionDenied
 from xmodule.modulestore.django import loc_mapper
 
-from xmodule.modulestore.inheritance import own_metadata
-
-
 from ..utils import get_modulestore
 from .access import has_course_access
 from xmodule.course_module import CourseDescriptor

cms/djangoapps/contentstore/views/course.py

@@ -20,7 +20,6 @@ from edxmako.shortcuts import render_to_response
 
 from xmodule.error_module import ErrorDescriptor
 from xmodule.modulestore.django import modulestore, loc_mapper
-from xmodule.modulestore.inheritance import own_metadata
 from xmodule.contentstore.content import StaticContent
 
 from xmodule.modulestore.exceptions import (

cms/djangoapps/contentstore/views/tabs.py

@@ -10,8 +10,6 @@ from django.core.exceptions import PermissionDenied
 from django_future.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_http_methods
 from edxmako.shortcuts import render_to_response
-from xmodule.modulestore import Location
-from xmodule.modulestore.inheritance import own_metadata
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.django import loc_mapper
 from xmodule.modulestore.locator import BlockUsageLocator

cms/djangoapps/contentstore/tests/test_access.py → cms/djangoapps/contentstore/views/tests/test_access.py

@@ -11,6 +11,7 @@ from student.tests.factories import AdminFactory
 from student.auth import add_users
 from contentstore.views.access import get_user_role
 
+
 class RolesTest(TestCase):
     """
     Tests for user roles.

cms/djangoapps/contentstore/tests/test_assets.py → cms/djangoapps/contentstore/views/tests/test_assets.py

@@ -10,7 +10,7 @@ from datetime import datetime
 from io import BytesIO
 from pytz import UTC
 import json
-from .utils import CourseTestCase
+from contentstore.tests.utils import CourseTestCase
 from contentstore.views import assets
 from xmodule.contentstore.content import StaticContent
 from xmodule.modulestore import Location
@@ -114,6 +114,7 @@ class PaginationTestCase(AssetsTestCase):
             self.assertGreaterEqual(name1, name2)
             self.assertGreaterEqual(name2, name3)
 
+
 class UploadTestCase(AssetsTestCase):
     """
     Unit tests for uploading a file

cms/djangoapps/contentstore/tests/test_checklists.py → cms/djangoapps/contentstore/views/tests/test_checklists.py

 """ Unit tests for checklist methods in views.py. """
 from contentstore.utils import get_modulestore
 from contentstore.views.checklist import expand_checklist_action_url
-from xmodule.modulestore.inheritance import own_metadata
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.django import loc_mapper
 
 import json
-from .utils import CourseTestCase
+from contentstore.tests.utils import CourseTestCase
 
 
 class ChecklistTestCase(CourseTestCase):
@@ -113,7 +112,6 @@ class ChecklistTestCase(CourseTestCase):
         self.assertEqual('CourseOutline', get_first_item(persisted_checklist).get('action_url'))
         self.compare_checklists(persisted_checklist, returned_checklist)
 
-
     def test_update_checklists_delete_unsupported(self):
         """ Delete operation is not supported. """
         update_url = self.location.url_reverse('checklists/', '100')

cms/djangoapps/contentstore/tests/test_course_index.py → cms/djangoapps/contentstore/views/tests/test_course_index.py

@@ -9,6 +9,7 @@ from xmodule.modulestore.django import loc_mapper
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from xmodule.modulestore import parsers
 
+
 class TestCourseIndex(CourseTestCase):
     """
     Unit tests for getting the list of courses and the course outline.
@@ -25,7 +26,6 @@ class TestCourseIndex(CourseTestCase):
             display_name='dotted.course.name-2',
         )
 
-
     def check_index_and_outline(self, authed_client):
         """
         Test getting the list of courses and then pulling up their outlines

cms/djangoapps/contentstore/tests/test_course_updates.py → cms/djangoapps/contentstore/views/tests/test_course_updates.py

@@ -53,7 +53,6 @@ class CourseUpdateTest(CourseTestCase):
             content, json.loads(refetched.content)['content'], "get w/ provided id"
         )
 
-
         # now put in an evil update
         content = '<ol/>'
         payload = get_response(content, 'January 11, 2013')

cms/djangoapps/contentstore/tests/test_import_export.py → cms/djangoapps/contentstore/views/tests/test_import_export.py

@@ -12,7 +12,7 @@ import logging
 from uuid import uuid4
 from pymongo import MongoClient
 
-from .utils import CourseTestCase
+from contentstore.tests.utils import CourseTestCase
 from django.test.utils import override_settings
 from django.conf import settings
 from xmodule.modulestore.django import loc_mapper
@@ -25,6 +25,7 @@ TEST_DATA_CONTENTSTORE['DOC_STORE_CONFIG']['db'] = 'test_xcontent_%s' % uuid4().
 
 log = logging.getLogger(__name__)
 
+
 @override_settings(CONTENTSTORE=TEST_DATA_CONTENTSTORE)
 class ImportTestCase(CourseTestCase):
     """
@@ -178,7 +179,7 @@ class ImportTestCase(CourseTestCase):
 
         def try_tar(tarpath):
             with open(tarpath) as tar:
-                args = { "name": tarpath, "course-data": [tar] }
+                args = {"name": tarpath, "course-data": [tar]}
                 resp = self.client.post(self.url, args)
             self.assertEquals(resp.status_code, 400)
             self.assertTrue("SuspiciousFileOperation" in resp.content)

cms/djangoapps/contentstore/tests/test_textbooks.py → cms/djangoapps/contentstore/views/tests/test_textbooks.py

 import json
 from unittest import TestCase
-from .utils import CourseTestCase
-from django.core.urlresolvers import reverse
+from contentstore.tests.utils import CourseTestCase
 from contentstore.utils import get_modulestore
-from xmodule.modulestore.inheritance import own_metadata
 
 from contentstore.views.course import (
     validate_textbooks_json, validate_textbook_json, TextbookValidationError)

cms/djangoapps/contentstore/tests/test_transcripts.py → cms/djangoapps/contentstore/views/tests/test_transcripts.py

@@ -333,17 +333,6 @@ class TestDownloadtranscripts(Basetranscripts):
         del_cached_content(content_location)
         return content_location
 
-    def remove_subs_from_store(self, subs_id):
-        """Remove from store, if transcripts content exists."""
-        filename = 'subs_{0}.srt.sjson'.format(subs_id)
-        content_location = StaticContent.compute_location(
-            self.org, self.number, filename)
-        try:
-            content = contentstore().find(content_location)
-            contentstore().delete(content.get_id())
-        except NotFoundError:
-            pass
-
     def test_success_download_youtube(self):
         self.item.data = '<video youtube="1:JMD_ifUUfsU" />'
         modulestore().update_item(self.item, self.user.id)
@@ -521,17 +510,6 @@ class TestChecktranscripts(Basetranscripts):
         del_cached_content(content_location)
         return content_location
 
-    def remove_subs_from_store(self, subs_id):
-        """Remove from store, if transcripts content exists."""
-        filename = 'subs_{0}.srt.sjson'.format(subs_id)
-        content_location = StaticContent.compute_location(
-            self.org, self.number, filename)
-        try:
-            content = contentstore().find(content_location)
-            contentstore().delete(content.get_id())
-        except NotFoundError:
-            pass
-
     def test_success_download_nonyoutube(self):
         subs_id = str(uuid4())
         self.item.data = textwrap.dedent("""

cms/djangoapps/contentstore/tests/test_users.py → cms/djangoapps/contentstore/views/tests/test_user.py

@@ -2,8 +2,8 @@
 Tests for contentstore/views/user.py.
 """
 import json
-from .utils import CourseTestCase
-from django.contrib.auth.models import User, Group
+from contentstore.tests.utils import CourseTestCase
+from django.contrib.auth.models import User
 from student.models import CourseEnrollment
 from xmodule.modulestore.django import loc_mapper
 from student.roles import CourseStaffRole, CourseInstructorRole