Adds staff and instructor users of the master course to CCX

AUTHORS

@@ -266,3 +266,4 @@ Kaloian Doganov <doganov@gmail.com>
 Sanford Student <sstudent@edx.org>
 Florian Haas <florian@hastexo.com>
 Leonardo Quiñonez <leonardo.quinonez@edunext.co>
+Dmitry Viskov <dmitry.viskov@webenterprise.ru>

cms/djangoapps/contentstore/features/component.feature

@@ -2,17 +2,6 @@
 Feature: CMS.Component Adding
     As a course author, I want to be able to add a wide variety of components
 
-    Scenario: I can add single step components
-       Given I am in Studio editing a new unit
-       When I add this type of single step component:
-           | Component    |
-           | Discussion   |
-           | Video        |
-       Then I see this type of single step component:
-           | Component    |
-           | Discussion   |
-           | Video        |
-
     Scenario: I can add HTML components
        Given I am in Studio editing a new unit
        When I add this type of HTML component:
@@ -57,24 +46,6 @@ Feature: CMS.Component Adding
            | Numerical Input      |
            | Text Input           |
 
-    Scenario Outline: I can add Advanced Problem components
-       Given I am in Studio editing a new unit
-       When I add a "<Component>" "Advanced Problem" component
-       Then I see a "<Component>" Problem component
-       # Flush out the database before the next example executes
-       And I reset the database
-
-    Examples:
-           | Component                     |
-           | Blank Advanced Problem        |
-           | Circuit Schematic Builder     |
-           | Custom Python-Evaluated Input |
-           | Drag and Drop                 |
-           | Image Mapped Input            |
-           | Math Expression Input         |
-           | Problem with Adaptive Hint    |
-
-
 # Disabled 1/21/14 due to flakiness seen in master
 #    Scenario: I can add Advanced Latex Problem components
 #       Given I am in Studio editing a new unit
@@ -89,32 +60,6 @@ Feature: CMS.Component Adding
 #           | Problem Written in LaTeX      |
 #           | Problem with Adaptive Hint in Latex  |
 
-    Scenario: I see a prompt on delete
-        Given I am in Studio editing a new unit
-        And I add a "Discussion" "single step" component
-        And I delete a component
-        Then I am shown a prompt
-
-    Scenario: I can delete Components
-        Given I am in Studio editing a new unit
-        And I add a "Discussion" "single step" component
-        And I add a "Text" "HTML" component
-        And I add a "Blank Common Problem" "Problem" component
-        And I add a "Blank Advanced Problem" "Advanced Problem" component
-        And I delete all components
-        Then I see no components
-
-    Scenario: I can duplicate a component
-        Given I am in Studio editing a new unit
-        And I add a "Blank Common Problem" "Problem" component
-        And I add a "Multiple Choice" "Problem" component
-        And I duplicate the first component
-        Then I see a Problem component with display name "Duplicate of 'Blank Common Problem'" in position "1"
-        And I reload the page
-        Then I see a Problem component with display name "Blank Common Problem" in position "0"
-        And I see a Problem component with display name "Duplicate of 'Blank Common Problem'" in position "1"
-        And I see a Problem component with display name "Multiple Choice" in position "2"
-
     Scenario: I can set the display name of a component
         Given I am in Studio editing a new unit
         When I add a "Text" "HTML" component

cms/djangoapps/contentstore/features/component.py

@@ -55,9 +55,9 @@ def see_a_multi_step_component(step, category):
         if category == 'HTML':
             html_matcher = {
                 'Text': '\n    \n',
-                'Announcement': '<h3>Announcement Date</h3>',
-                'Zooming Image Tool': '<h3>Zooming Image Tool</h3>',
-                'E-text Written in LaTeX': '<h3>Example: E-text page</h3>',
+                'Announcement': '<h3 class="hd hd-2">Announcement Date</h3>',
+                'Zooming Image Tool': '<h3 class="hd hd-2">Zooming Image Tool</h3>',
+                'E-text Written in LaTeX': '<h3 class="hd hd-2">Example: E-text page</h3>',
                 'Raw HTML': '<p>This template is similar to the Text template. The only difference is',
             }
             actual_html = world.css_html(selector, index=idx)

cms/djangoapps/contentstore/features/problem-editor.py

@@ -125,6 +125,9 @@ def my_display_name_change_is_persisted_on_save(step):
 
 @step('the problem display name is "(.*)"$')
 def verify_problem_display_name(step, name):
+    """
+    name is uppercased because the heading styles are uppercase in css
+    """
     assert_equal(name, world.browser.find_by_css('.problem-header').text)
 
 

cms/djangoapps/contentstore/tests/test_course_listing.py

@@ -8,6 +8,8 @@
 from mock import patch, Mock
 import ddt
 
+from django.conf import settings
+from ccx_keys.locator import CCXLocator
 from django.test import RequestFactory
 from django.test.client import Client
 
@@ -25,11 +27,13 @@
 from xmodule.modulestore.tests.factories import CourseFactory, check_mongo_calls
 from xmodule.modulestore import ModuleStoreEnum
 from opaque_keys.edx.locations import CourseLocator
+from opaque_keys.edx.keys import CourseKey
 from xmodule.error_module import ErrorDescriptor
 from course_action_state.models import CourseRerunState
 
-TOTAL_COURSES_COUNT = 500
-USER_COURSES_COUNT = 50
+
+TOTAL_COURSES_COUNT = 10
+USER_COURSES_COUNT = 1
 
 
 @ddt.ddt
@@ -99,6 +103,15 @@ def test_course_listing_is_escaped(self):
         self.assertEqual(response.status_code, 200)
         self.assert_no_xss(response, escaping_content)
 
+    def test_empty_course_listing(self):
+        """
+        Test on empty course listing, studio name is properly displayed
+        """
+        message = "Are you staff on an existing {studio_name} course?".format(studio_name=settings.STUDIO_SHORT_NAME)
+        response = self.client.get('/home')
+        self.assertEqual(response.status_code, 200)
+        self.assertIn(message, response.content)
+
     def test_get_course_list(self):
         """
         Test getting courses with new access group format e.g. 'instructor_edx.course.run'
@@ -120,6 +133,39 @@ def test_get_course_list(self):
         # check both course lists have same courses
         self.assertEqual(courses_list, courses_list_by_groups)
 
+    def test_get_course_list_when_ccx(self):
+        """
+        Assert that courses with CCXLocator are filter in course listing.
+        """
+        course_location = self.store.make_course_key('Org1', 'Course1', 'Run1')
+        self._create_course_with_access_groups(course_location, self.user)
+
+        # get courses through iterating all courses
+        courses_list, __ = _accessible_courses_list(self.request)
+        self.assertEqual(len(courses_list), 1)
+
+        # get courses by reversing group name formats
+        courses_list_by_groups, __ = _accessible_courses_list_from_groups(self.request)
+        self.assertEqual(len(courses_list_by_groups), 1)
+
+        # assert no course in listing with ccx id
+        ccx_course = Mock()
+        course_key = CourseKey.from_string('course-v1:FakeOrg+CN1+CR-FALLNEVER1')
+        ccx_course.id = CCXLocator.from_course_locator(course_key, u"1")
+
+        with patch(
+            'xmodule.modulestore.mixed.MixedModuleStore.get_course',
+            return_value=ccx_course
+        ), patch(
+            'xmodule.modulestore.mixed.MixedModuleStore.get_courses',
+            Mock(return_value=[ccx_course])
+        ):
+            courses_list, __ = _accessible_courses_list_from_groups(self.request)
+            self.assertEqual(len(courses_list), 0)
+
+            courses_list, __ = _accessible_courses_list(self.request)
+            self.assertEqual(len(courses_list), 0)
+
     @ddt.data(
         (ModuleStoreEnum.Type.split, 'xmodule.modulestore.split_mongo.split_mongo_kvs.SplitMongoKVS'),
         (ModuleStoreEnum.Type.mongo, 'xmodule.modulestore.mongo.base.MongoKeyValueStore')
@@ -147,8 +193,8 @@ def test_errored_course_global_staff(self, store, path_to_patch):
                 self.assertEqual(courses_list_by_groups, [])
 
     @ddt.data(
-        (ModuleStoreEnum.Type.split, 5),
-        (ModuleStoreEnum.Type.mongo, 3)
+        (ModuleStoreEnum.Type.split, 3),
+        (ModuleStoreEnum.Type.mongo, 2)
     )
     @ddt.unpack
     def test_staff_course_listing(self, default_store, mongo_calls):
@@ -255,8 +301,8 @@ def test_get_course_list_with_invalid_course_location(self, store):
         )
 
     @ddt.data(
-        (ModuleStoreEnum.Type.split, 150, 505),
-        (ModuleStoreEnum.Type.mongo, USER_COURSES_COUNT, 3)
+        (ModuleStoreEnum.Type.split, 3, 13),
+        (ModuleStoreEnum.Type.mongo, USER_COURSES_COUNT, 2)
     )
     @ddt.unpack
     def test_course_listing_performance(self, store, courses_list_from_group_calls, courses_list_calls):

cms/djangoapps/contentstore/views/course.py

@@ -27,6 +27,7 @@
 )
 from .item import create_xblock_info
 from .library import LIBRARIES_ENABLED
+from ccx_keys.locator import CCXLocator
 from contentstore import utils
 from contentstore.course_group_config import (
     COHORT_SCHEME,
@@ -389,6 +390,11 @@ def course_filter(course):
         if isinstance(course, ErrorDescriptor):
             return False
 
+        # Custom Courses for edX (CCX) is an edX feature for re-using course content.
+        # CCXs cannot be edited in Studio (aka cms) and should not be shown in this dashboard.
+        if isinstance(course.id, CCXLocator):
+            return False
+
         # pylint: disable=fixme
         # TODO remove this condition when templates purged from db
         if course.location.course == 'templates':
@@ -433,8 +439,11 @@ def _accessible_courses_list_from_groups(request):
             except ItemNotFoundError:
                 # If a user has access to a course that doesn't exist, don't do anything with that course
                 pass
-            if course is not None and not isinstance(course, ErrorDescriptor):
-                # ignore deleted or errored courses
+
+            # Custom Courses for edX (CCX) is an edX feature for re-using course content.
+            # CCXs cannot be edited in Studio (aka cms) and should not be shown in this dashboard.
+            if course is not None and not isinstance(course, ErrorDescriptor) and not isinstance(course.id, CCXLocator):
+                # ignore deleted, errored or ccx courses
                 courses_list[course_key] = course
 
     return courses_list.values(), in_process_course_actions

cms/djangoapps/contentstore/views/item.py

@@ -886,7 +886,7 @@ def create_xblock_info(xblock, data=None, metadata=None, include_ancestor_info=F
 
     xblock_info = {
         "id": unicode(xblock.location),
-        "display_name": xblock.display_name_with_default_escaped,
+        "display_name": xblock.display_name_with_default,
         "category": xblock.category,
         "edited_on": get_default_time_display(xblock.subtree_edited_on) if xblock.subtree_edited_on else None,
         "published": published,
@@ -1158,4 +1158,4 @@ def _xblock_type_and_display_name(xblock):
     """
     return _('{section_or_subsection} "{display_name}"').format(
         section_or_subsection=xblock_type_display_name(xblock),
-        display_name=xblock.display_name_with_default_escaped)
+        display_name=xblock.display_name_with_default)