Merge branch 'master' into feature/abarrett/annotatable_xmodule

.pep8

+[pep8]
+ignore=E501
\ No newline at end of file

.ruby-version

-1.8.7-p371
+1.8.7-p371
\ No newline at end of file

apt-packages.txt

@@ -9,6 +9,7 @@ gfortran
 liblapack-dev
 libfreetype6-dev
 libpng12-dev
+libjpeg-dev
 libxml2-dev
 libxslt-dev
 yui-compressor

cms/.coveragerc

 # .coveragerc for cms
 [run]
 data_file = reports/cms/.coverage
-source = cms
+source = cms,common/djangoapps
 omit = cms/envs/*, cms/manage.py
 
 [report]

cms/__init__.py

-

cms/djangoapps/auth/authz.py

@@ -18,6 +18,8 @@ STAFF_ROLE_NAME = 'staff'
 # we're just making a Django group for each location/role combo
 # to do this we're just creating a Group name which is a formatted string
 # of those two variables
+
+
 def get_course_groupname_for_role(location, role):
     loc = Location(location)
     # hack: check for existence of a group name in the legacy LMS format <role>_<course>
@@ -25,11 +27,12 @@ def get_course_groupname_for_role(location, role):
     # more information
     groupname = '{0}_{1}'.format(role, loc.course)
 
-    if len(Group.objects.filter(name = groupname)) == 0:
-        groupname = '{0}_{1}'.format(role,loc.course_id)
+    if len(Group.objects.filter(name=groupname)) == 0:
+        groupname = '{0}_{1}'.format(role, loc.course_id)
 
     return groupname
 
+
 def get_users_in_course_group_by_role(location, role):
     groupname = get_course_groupname_for_role(location, role)
     (group, created) = Group.objects.get_or_create(name=groupname)
@@ -39,6 +42,8 @@ def get_users_in_course_group_by_role(location, role):
 '''
 Create all permission groups for a new course and subscribe the caller into those roles
 '''
+
+
 def create_all_course_groups(creator, location):
     create_new_course_group(creator, location, INSTRUCTOR_ROLE_NAME)
     create_new_course_group(creator, location, STAFF_ROLE_NAME)
@@ -46,7 +51,7 @@ def create_all_course_groups(creator, location):
 
 def create_new_course_group(creator, location, role):
     groupname = get_course_groupname_for_role(location, role)
-    (group, created) =Group.objects.get_or_create(name=groupname)
+    (group, created) = Group.objects.get_or_create(name=groupname)
     if created:
         group.save()
 
@@ -59,6 +64,8 @@ def create_new_course_group(creator, location, role):
 This is to be called only by either a command line code path or through a app which has already
 asserted permissions
 '''
+
+
 def _delete_course_group(location):
     # remove all memberships
     instructors = Group.objects.get(name=get_course_groupname_for_role(location, INSTRUCTOR_ROLE_NAME))
@@ -75,6 +82,8 @@ def _delete_course_group(location):
 This is to be called only by either a command line code path or through an app which has already
 asserted permissions to do this action
 '''
+
+
 def _copy_course_group(source, dest):
     instructors = Group.objects.get(name=get_course_groupname_for_role(source, INSTRUCTOR_ROLE_NAME))
     new_instructors_group = Group.objects.get(name=get_course_groupname_for_role(dest, INSTRUCTOR_ROLE_NAME))
@@ -86,7 +95,7 @@ def _copy_course_group(source, dest):
     new_staff_group = Group.objects.get(name=get_course_groupname_for_role(dest, STAFF_ROLE_NAME))
     for user in staff.user_set.all():
         user.groups.add(new_staff_group)
-        user.save()    
+        user.save()
 
 
 def add_user_to_course_group(caller, user, location, role):
@@ -133,8 +142,6 @@ def remove_user_from_course_group(caller, user, location, role):
 def is_user_in_course_group_role(user, location, role):
     if user.is_active and user.is_authenticated:
         # all "is_staff" flagged accounts belong to all groups
-        return user.is_staff or user.groups.filter(name=get_course_groupname_for_role(location,role)).count() > 0
+        return user.is_staff or user.groups.filter(name=get_course_groupname_for_role(location, role)).count() > 0
 
     return False
-
-    

cms/djangoapps/contentstore/course_info_model.py

@@ -8,6 +8,8 @@ import logging
 
 ## TODO store as array of { date, content } and override  course_info_module.definition_from_xml
 ## This should be in a class which inherits from XmlDescriptor
+
+
 def get_course_updates(location):
     """
     Retrieve the relevant course_info updates and unpack into the model which the client expects:
@@ -21,13 +23,13 @@ def get_course_updates(location):
 
     # current db rep: {"_id" : locationjson, "definition" : { "data" : "<ol>[<li><h2>date</h2>content</li>]</ol>"} "metadata" : ignored}
     location_base = course_updates.location.url()
-    
+
     # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break.
     try:
         course_html_parsed = html.fromstring(course_updates.definition['data'])
     except:
         course_html_parsed = html.fromstring("<ol></ol>")
-        
+
     # Confirm that root is <ol>, iterate over <li>, pull out <h2> subs and then rest of val
     course_upd_collection = []
     if course_html_parsed.tag == 'ol':
@@ -40,25 +42,26 @@ def get_course_updates(location):
                 content = update[0].tail
             else:
                 content = "\n".join([html.tostring(ele) for ele in update[1:]])
-                
+
             # make the id on the client be 1..len w/ 1 being the oldest and len being the newest
-            course_upd_collection.append({"id" : location_base + "/" + str(len(course_html_parsed) - idx),
-                                          "date" : update.findtext("h2"),
-                                          "content" : content})
-            
+            course_upd_collection.append({"id": location_base + "/" + str(len(course_html_parsed) - idx),
+                                          "date": update.findtext("h2"),
+                                          "content": content})
+
     return course_upd_collection
 
+
 def update_course_updates(location, update, passed_id=None):
     """
     Either add or update the given course update. It will add it if the passed_id is absent or None. It will update it if
     it has an passed_id which has a valid value. Until updates have distinct values, the passed_id is the location url + an index
-    into the html structure. 
+    into the html structure.
     """
     try:
         course_updates = modulestore('direct').get_item(location)
     except ItemNotFoundError:
         return HttpResponseBadRequest
-    
+
     # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break.
     try:
         course_html_parsed = html.fromstring(course_updates.definition['data'])
@@ -67,7 +70,7 @@ def update_course_updates(location, update, passed_id=None):
 
     # No try/catch b/c failure generates an error back to client
     new_html_parsed = html.fromstring('<li><h2>' + update['date'] + '</h2>' + update['content'] + '</li>')
-        
+
     # Confirm that root is <ol>, iterate over <li>, pull out <h2> subs and then rest of val
     if course_html_parsed.tag == 'ol':
         # ??? Should this use the id in the json or in the url or does it matter?
@@ -80,14 +83,15 @@ def update_course_updates(location, update, passed_id=None):
 
             idx = len(course_html_parsed)
             passed_id = course_updates.location.url() + "/" + str(idx)
-        
+
         # update db record
         course_updates.definition['data'] = html.tostring(course_html_parsed)
         modulestore('direct').update_item(location, course_updates.definition['data'])
-        
-        return {"id" : passed_id,
-                "date" : update['date'],
-                "content" :update['content']}
+
+        return {"id": passed_id,
+                "date": update['date'],
+                "content": update['content']}
+
 
 def delete_course_update(location, update, passed_id):
     """
@@ -96,19 +100,19 @@ def delete_course_update(location, update, passed_id):
     """
     if not passed_id:
         return HttpResponseBadRequest
-        
+
     try:
         course_updates = modulestore('direct').get_item(location)
     except ItemNotFoundError:
         return HttpResponseBadRequest
-    
+
     # TODO use delete_blank_text parser throughout and cache as a static var in a class
     # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break.
     try:
         course_html_parsed = html.fromstring(course_updates.definition['data'])
     except:
         course_html_parsed = html.fromstring("<ol></ol>")
-        
+
     if course_html_parsed.tag == 'ol':
         # ??? Should this use the id in the json or in the url or does it matter?
         idx = get_idx(passed_id)
@@ -120,10 +124,11 @@ def delete_course_update(location, update, passed_id):
         # update db record
         course_updates.definition['data'] = html.tostring(course_html_parsed)
         store = modulestore('direct')
-        store.update_item(location, course_updates.definition['data'])  
-          
+        store.update_item(location, course_updates.definition['data'])
+
     return get_course_updates(location)
-    
+
+
 def get_idx(passed_id):
     """
     From the url w/ idx appended, get the idx.
@@ -131,4 +136,4 @@ def get_idx(passed_id):
     # TODO compile this regex into a class static and reuse for each call
     idx_matcher = re.search(r'.*/(\d+)$', passed_id)
     if idx_matcher:
-        return int(idx_matcher.group(1))
\ No newline at end of file
+        return int(idx_matcher.group(1))

cms/djangoapps/contentstore/features/common.py

@@ -12,6 +12,8 @@ from logging import getLogger
 logger = getLogger(__name__)
 
 ###########  STEP HELPERS ##############
+
+
 @step('I (?:visit|access|open) the Studio homepage$')
 def i_visit_the_studio_homepage(step):
     # To make this go to port 8001, put
@@ -20,32 +22,37 @@ def i_visit_the_studio_homepage(step):
     world.browser.visit(django_url('/'))
     assert world.browser.is_element_present_by_css('body.no-header', 10)
 
+
 @step('I am logged into Studio$')
 def i_am_logged_into_studio(step):
     log_into_studio()
 
+
 @step('I confirm the alert$')
 def i_confirm_with_ok(step):
     world.browser.get_alert().accept()
 
+
 @step(u'I press the "([^"]*)" delete icon$')
 def i_press_the_category_delete_icon(step, category):
     if category == 'section':
         css = 'a.delete-button.delete-section-button span.delete-icon'
     elif category == 'subsection':
-        css='a.delete-button.delete-subsection-button  span.delete-icon'
+        css = 'a.delete-button.delete-subsection-button  span.delete-icon'
     else:
         assert False, 'Invalid category: %s' % category
     css_click(css)
 
 ####### HELPER FUNCTIONS ##############
+
+
 def create_studio_user(
         uname='robot',
         email='robot+studio@edx.org',
         password='test',
-        is_staff=False): 
+        is_staff=False):
     studio_user = UserFactory.build(
-        username=uname, 
+        username=uname,
         email=email,
         password=password,
         is_staff=is_staff)
@@ -58,6 +65,7 @@ def create_studio_user(
 
     user_profile = UserProfileFactory(user=studio_user)
 
+
 def flush_xmodule_store():
     # Flush and initialize the module store
     # It needs the templates because it creates new records
@@ -70,26 +78,32 @@ def flush_xmodule_store():
     xmodule.modulestore.django.modulestore().collection.drop()
     xmodule.templates.update_templates()
 
-def assert_css_with_text(css,text):
+
+def assert_css_with_text(css, text):
     assert_true(world.browser.is_element_present_by_css(css, 5))
     assert_equal(world.browser.find_by_css(css).text, text)
 
+
 def css_click(css):
     world.browser.find_by_css(css).first.click()
 
+
 def css_fill(css, value):
     world.browser.find_by_css(css).first.fill(value)
 
+
 def clear_courses():
     flush_xmodule_store()
 
+
 def fill_in_course_info(
         name='Robot Super Course',
         org='MITx',
         num='101'):
-    css_fill('.new-course-name',name)
-    css_fill('.new-course-org',org)
-    css_fill('.new-course-number',num)
+    css_fill('.new-course-name', name)
+    css_fill('.new-course-org', org)
+    css_fill('.new-course-number', num)
+
 
 def log_into_studio(
         uname='robot',
@@ -108,24 +122,27 @@ def log_into_studio(
 
     assert_true(world.browser.is_element_present_by_css('.new-course-button', 5))
 
+
 def create_a_course():
     css_click('a.new-course-button')
     fill_in_course_info()
     css_click('input.new-course-save')
     assert_true(world.browser.is_element_present_by_css('a#courseware-tab', 5))
 
+
 def add_section(name='My Section'):
     link_css = 'a.new-courseware-section-button'
     css_click(link_css)
     name_css = '.new-section-name'
     save_css = '.new-section-name-save'
-    css_fill(name_css,name)
+    css_fill(name_css, name)
     css_click(save_css)
 
+
 def add_subsection(name='Subsection One'):
     css = 'a.new-subsection-item'
     css_click(css)
     name_css = 'input.new-subsection-name-input'
     save_css = 'input.new-subsection-name-save'
     css_fill(name_css, name)
-    css_click(save_css)
\ No newline at end of file
+    css_click(save_css)

cms/djangoapps/contentstore/features/courses.py

@@ -2,49 +2,61 @@ from lettuce import world, step
 from common import *
 
 ############### ACTIONS ####################
+
+
 @step('There are no courses$')
 def no_courses(step):
     clear_courses()
 
+
 @step('I click the New Course button$')
 def i_click_new_course(step):
     css_click('.new-course-button')
 
+
 @step('I fill in the new course information$')
 def i_fill_in_a_new_course_information(step):
     fill_in_course_info()
 
+
 @step('I create a new course$')
 def i_create_a_course(step):
     create_a_course()
 
+
 @step('I click the course link in My Courses$')
 def i_click_the_course_link_in_my_courses(step):
     course_css = 'span.class-name'
     css_click(course_css)
 
 ############ ASSERTIONS ###################
+
+
 @step('the Courseware page has loaded in Studio$')
 def courseware_page_has_loaded_in_studio(step):
     courseware_css = 'a#courseware-tab'
     assert world.browser.is_element_present_by_css(courseware_css)
 
+
 @step('I see the course listed in My Courses$')
 def i_see_the_course_in_my_courses(step):
     course_css = 'span.class-name'
-    assert_css_with_text(course_css,'Robot Super Course')
+    assert_css_with_text(course_css, 'Robot Super Course')
+
 
 @step('the course is loaded$')
 def course_is_loaded(step):
     class_css = 'a.class-name'
-    assert_css_with_text(class_css,'Robot Super Course')
+    assert_css_with_text(class_css, 'Robot Super Course')
+
 
 @step('I am on the "([^"]*)" tab$')
 def i_am_on_tab(step, tab_name):
     header_css = 'div.inner-wrapper h1'
-    assert_css_with_text(header_css,tab_name)
+    assert_css_with_text(header_css, tab_name)
+
 
 @step('I see a link for adding a new section$')
 def i_see_new_section_link(step):
     link_css = 'a.new-courseware-section-button'
-    assert_css_with_text(link_css,'New Section')
+    assert_css_with_text(link_css, 'New Section')

cms/djangoapps/contentstore/features/factories.py

@@ -3,6 +3,7 @@ from student.models import User, UserProfile, Registration
 from datetime import datetime
 import uuid
 
+
 class UserProfileFactory(factory.Factory):
     FACTORY_FOR = UserProfile
 
@@ -10,12 +11,14 @@ class UserProfileFactory(factory.Factory):
     name = 'Robot Studio'
     courseware = 'course.xml'
 
+
 class RegistrationFactory(factory.Factory):
     FACTORY_FOR = Registration
 
     user = None
     activation_key = uuid.uuid4().hex
 
+
 class UserFactory(factory.Factory):
     FACTORY_FOR = User
 
@@ -28,4 +31,4 @@ class UserFactory(factory.Factory):
     is_active = True
     is_superuser = False
     last_login = datetime.now()
-    date_joined = datetime.now()
\ No newline at end of file
+    date_joined = datetime.now()

cms/djangoapps/contentstore/features/section.py

@@ -2,54 +2,65 @@ from lettuce import world, step
 from common import *
 
 ############### ACTIONS ####################
+
+
 @step('I have opened a new course in Studio$')
 def i_have_opened_a_new_course(step):
     clear_courses()
     log_into_studio()
     create_a_course()
 
+
 @step('I click the new section link$')
 def i_click_new_section_link(step):
     link_css = 'a.new-courseware-section-button'
     css_click(link_css)
 
+
 @step('I enter the section name and click save$')
 def i_save_section_name(step):
     name_css = '.new-section-name'
     save_css = '.new-section-name-save'
-    css_fill(name_css,'My Section')
+    css_fill(name_css, 'My Section')
     css_click(save_css)
 
+
 @step('I have added a new section$')
 def i_have_added_new_section(step):
     add_section()
-    
+
+
 @step('I click the Edit link for the release date$')
 def i_click_the_edit_link_for_the_release_date(step):
     button_css = 'div.section-published-date a.edit-button'
     css_click(button_css)
 
+
 @step('I save a new section release date$')
 def i_save_a_new_section_release_date(step):
     date_css = 'input.start-date.date.hasDatepicker'
     time_css = 'input.start-time.time.ui-timepicker-input'
-    css_fill(date_css,'12/25/2013')
+    css_fill(date_css, '12/25/2013')
     # click here to make the calendar go away
     css_click(time_css)
-    css_fill(time_css,'12:00am')
+    css_fill(time_css, '12:00am')
     css_click('a.save-button')
 
 ############ ASSERTIONS ###################
+
+
 @step('I see my section on the Courseware page$')
 def i_see_my_section_on_the_courseware_page(step):
     section_css = 'span.section-name-span'
-    assert_css_with_text(section_css,'My Section')
+    assert_css_with_text(section_css, 'My Section')
+
 
 @step('the section does not exist$')
 def section_does_not_exist(step):
     css = 'span.section-name-span'
     assert world.browser.is_element_not_present_by_css(css)
 
+
 @step('I see a release date for my section$')
 def i_see_a_release_date_for_my_section(step):
     import re
@@ -63,18 +74,21 @@ def i_see_a_release_date_for_my_section(step):
     date_regex = '[01][0-9]\/[0-3][0-9]\/[12][0-9][0-9][0-9]'
     time_regex = '[0-2][0-9]:[0-5][0-9]'
     match_string = '%s %s at %s' % (msg, date_regex, time_regex)
-    assert re.match(match_string,status_text)
+    assert re.match(match_string, status_text)
+
 
 @step('I see a link to create a new subsection$')
 def i_see_a_link_to_create_a_new_subsection(step):
     css = 'a.new-subsection-item'
     assert world.browser.is_element_present_by_css(css)
 
+
 @step('the section release date picker is not visible$')
 def the_section_release_date_picker_not_visible(step):
     css = 'div.edit-subsection-publish-settings'
     assert False, world.browser.find_by_css(css).visible
 
+
 @step('the section release date is updated$')
 def the_section_release_date_is_updated(step):
     css = 'span.published-status'

cms/djangoapps/contentstore/features/signup.py

 from lettuce import world, step
 
+
 @step('I fill in the registration form$')
 def i_fill_in_the_registration_form(step):
     register_form = world.browser.find_by_css('form#register_form')
@@ -9,15 +10,18 @@ def i_fill_in_the_registration_form(step):
     register_form.find_by_name('name').fill('Robot Studio')
     register_form.find_by_name('terms_of_service').check()
 
+
 @step('I press the "([^"]*)" button on the registration form$')
 def i_press_the_button_on_the_registration_form(step, button):
     register_form = world.browser.find_by_css('form#register_form')
     register_form.find_by_value(button).click()
 
+
 @step('I should see be on the studio home page$')
 def i_should_see_be_on_the_studio_home_page(step):
     assert world.browser.find_by_css('div.inner-wrapper')
 
+
 @step(u'I should see the message "([^"]*)"$')
 def i_should_see_the_message(step, msg):
-    assert world.browser.is_text_present(msg, 5)
\ No newline at end of file
+    assert world.browser.is_text_present(msg, 5)

cms/djangoapps/contentstore/features/studio-overview-togglesection.py

@@ -6,11 +6,13 @@ from nose.tools import assert_true, assert_false, assert_equal
 from logging import getLogger
 logger = getLogger(__name__)
 
+
 @step(u'I have a course with no sections$')
 def have_a_course(step):
     clear_courses()
     course = CourseFactory.create()
 
+
 @step(u'I have a course with 1 section$')
 def have_a_course_with_1_section(step):
     clear_courses()
@@ -18,8 +20,9 @@ def have_a_course_with_1_section(step):
     section = ItemFactory.create(parent_location=course.location)
     subsection1 = ItemFactory.create(
         parent_location=section.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection One',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection One',)
+
 
 @step(u'I have a course with multiple sections$')
 def have_a_course_with_two_sections(step):
@@ -28,19 +31,20 @@ def have_a_course_with_two_sections(step):
     section = ItemFactory.create(parent_location=course.location)
     subsection1 = ItemFactory.create(
         parent_location=section.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection One',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection One',)
     section2 = ItemFactory.create(
         parent_location=course.location,
         display_name='Section Two',)
     subsection2 = ItemFactory.create(
         parent_location=section2.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection Alpha',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection Alpha',)
     subsection3 = ItemFactory.create(
         parent_location=section2.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection Beta',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection Beta',)
+
 
 @step(u'I navigate to the course overview page$')
 def navigate_to_the_course_overview_page(step):
@@ -48,15 +52,18 @@ def navigate_to_the_course_overview_page(step):
     course_locator = '.class-name'
     css_click(course_locator)
 
+
 @step(u'I navigate to the courseware page of a course with multiple sections')
 def nav_to_the_courseware_page_of_a_course_with_multiple_sections(step):
     step.given('I have a course with multiple sections')
     step.given('I navigate to the course overview page')
 
+
 @step(u'I add a section')
 def i_add_a_section(step):
     add_section(name='My New Section That I Just Added')
 
+
 @step(u'I click the "([^"]*)" link$')
 def i_click_the_text_span(step, text):
     span_locator = '.toggle-button-sections span'
@@ -65,16 +72,19 @@ def i_click_the_text_span(step, text):
     assert_equal(world.browser.find_by_css(span_locator).value, text)
     css_click(span_locator)
 
+
 @step(u'I collapse the first section$')
 def i_collapse_a_section(step):
     collapse_locator = 'section.courseware-section a.collapse'
     css_click(collapse_locator)
 
+
 @step(u'I expand the first section$')
 def i_expand_a_section(step):
     expand_locator = 'section.courseware-section a.expand'
     css_click(expand_locator)
 
+
 @step(u'I see the "([^"]*)" link$')
 def i_see_the_span_with_text(step, text):
     span_locator = '.toggle-button-sections span'
@@ -82,6 +92,7 @@ def i_see_the_span_with_text(step, text):
     assert_equal(world.browser.find_by_css(span_locator).value, text)
     assert_true(world.browser.find_by_css(span_locator).visible)
 
+
 @step(u'I do not see the "([^"]*)" link$')
 def i_do_not_see_the_span_with_text(step, text):
     # Note that the span will exist on the page but not be visible
@@ -89,6 +100,7 @@ def i_do_not_see_the_span_with_text(step, text):
     assert_true(world.browser.is_element_present_by_css(span_locator))
     assert_false(world.browser.find_by_css(span_locator).visible)
 
+
 @step(u'all sections are expanded$')
 def all_sections_are_expanded(step):
     subsection_locator = 'div.subsection-list'
@@ -96,9 +108,10 @@ def all_sections_are_expanded(step):
     for s in subsections:
         assert_true(s.visible)
 
+
 @step(u'all sections are collapsed$')
 def all_sections_are_expanded(step):
     subsection_locator = 'div.subsection-list'
     subsections = world.browser.find_by_css(subsection_locator)
     for s in subsections:
-        assert_false(s.visible)
\ No newline at end of file
+        assert_false(s.visible)

cms/djangoapps/contentstore/features/subsection.py

@@ -2,6 +2,8 @@ from lettuce import world, step
 from common import *
 
 ############### ACTIONS ####################
+
+
 @step('I have opened a new course section in Studio$')
 def i_have_opened_a_new_course_section(step):
     clear_courses()
@@ -9,31 +11,37 @@ def i_have_opened_a_new_course_section(step):
     create_a_course()
     add_section()
 
+
 @step('I click the New Subsection link')
 def i_click_the_new_subsection_link(step):
     css = 'a.new-subsection-item'
     css_click(css)
 
+
 @step('I enter the subsection name and click save$')
 def i_save_subsection_name(step):
     name_css = 'input.new-subsection-name-input'
     save_css = 'input.new-subsection-name-save'
-    css_fill(name_css,'Subsection One')
+    css_fill(name_css, 'Subsection One')
     css_click(save_css)
 
+
 @step('I have added a new subsection$')
 def i_have_added_a_new_subsection(step):
     add_subsection()
 
 ############ ASSERTIONS ###################
+
+
 @step('I see my subsection on the Courseware page$')
 def i_see_my_subsection_on_the_courseware_page(step):
     css = 'span.subsection-name'
-    assert world.browser.is_element_present_by_css(css)    
+    assert world.browser.is_element_present_by_css(css)
     css = 'span.subsection-name-value'
-    assert_css_with_text(css,'Subsection One')
+    assert_css_with_text(css, 'Subsection One')
+
 
 @step('the subsection does not exist$')
 def the_subsection_does_not_exist(step):
     css = 'span.subsection-name'
-    assert world.browser.is_element_not_present_by_css(css)
\ No newline at end of file
+    assert world.browser.is_element_not_present_by_css(css)

cms/djangoapps/contentstore/management/commands/clone.py

@@ -14,6 +14,7 @@ from auth.authz import _copy_course_group
 # To run from command line: rake cms:clone SOURCE_LOC=MITx/111/Foo1 DEST_LOC=MITx/135/Foo3
 #
 
+
 class Command(BaseCommand):
     help = \
 '''Clone a MongoDB backed course to another location'''

cms/djangoapps/contentstore/management/commands/delete_course.py

@@ -15,6 +15,7 @@ from auth.authz import _delete_course_group
 # To run from command line: rake cms:delete_course LOC=MITx/111/Foo1
 #
 
+
 class Command(BaseCommand):
     help = \
 '''Delete a MongoDB backed course'''
@@ -35,6 +36,3 @@ class Command(BaseCommand):
               print 'removing User permissions from course....'
               # in the django layer, we need to remove all the user permissions groups associated with this course
               _delete_course_group(loc)            
-
-
-

cms/djangoapps/contentstore/management/commands/prompt.py

 import sys
 
+
 def query_yes_no(question, default="yes"):
     """Ask a yes/no question via raw_input() and return their answer.
 
@@ -30,4 +31,4 @@ def query_yes_no(question, default="yes"):
             return valid[choice]
         else:
             sys.stdout.write("Please respond with 'yes' or 'no' "\
-                             "(or 'y' or 'n').\n")
\ No newline at end of file
+                             "(or 'y' or 'n').\n")

cms/djangoapps/contentstore/module_info_model.py

-import logging
-from static_replace import replace_urls
+from static_replace import replace_static_urls
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore import Location
-from xmodule.modulestore.django import modulestore
-from lxml import etree
-import re
-from django.http import HttpResponseBadRequest, Http404
+from django.http import Http404
 
-def get_module_info(store, location, parent_location = None, rewrite_static_links = False):
-  try:
-    if location.revision is None:
-        module = store.get_item(location)
-    else:
-        module = store.get_item(location)
-  except ItemNotFoundError:
-    raise Http404
 
-  data = module.definition['data']
-  if rewrite_static_links:
-    data = replace_urls(module.definition['data'], course_namespace = Location([module.location.tag, module.location.org, module.location.course, None, None]))
+def get_module_info(store, location, parent_location=None, rewrite_static_links=False):
+    try:
+        if location.revision is None:
+            module = store.get_item(location)
+        else:
+            module = store.get_item(location)
+    except ItemNotFoundError:
+        # create a new one
+        template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty'])
+        module = store.clone_item(template_location, location)
 
-  return {
+    data = module.definition['data']
+    if rewrite_static_links:
+        data = replace_static_urls(
+            module.definition['data'],
+            None,
+            course_namespace=Location([
+                module.location.tag,
+                module.location.org,
+                module.location.course,
+                None,
+                None
+            ])
+        )
+
+    return {
         'id': module.location.url(),
         'data': data,
         'metadata': module.metadata
     }
 
-def set_module_info(store, location, post_data):
-  module = None
-  isNew = False
-  try:
-    if location.revision is None:
-        module = store.get_item(location)
-    else:
-        module = store.get_item(location)
-  except:
-    pass
-
-  if module is None:
-    # new module at this location
-    # presume that we have an 'Empty' template
-    template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty'])
-    module = store.clone_item(template_location, location)
-    isNew = True
 
-  if post_data.get('data') is not None:
-      data = post_data['data']
-      store.update_item(location, data)
-     
-  # cdodge: note calling request.POST.get('children') will return None if children is an empty array
-  # so it lead to a bug whereby the last component to be deleted in the UI was not actually
-  # deleting the children object from the children collection
-  if 'children' in post_data and post_data['children'] is not None:
-      children = post_data['children']
-      store.update_children(location, children)
-
-  # cdodge: also commit any metadata which might have been passed along in the
-  # POST from the client, if it is there
-  # NOTE, that the postback is not the complete metadata, as there's system metadata which is
-  # not presented to the end-user for editing. So let's fetch the original and
-  # 'apply' the submitted metadata, so we don't end up deleting system metadata
-  if post_data.get('metadata') is not None:
-      posted_metadata = post_data['metadata']
+def set_module_info(store, location, post_data):
+    module = None
+    try:
+        if location.revision is None:
+            module = store.get_item(location)
+        else:
+            module = store.get_item(location)
+    except:
+        pass
 
-      # update existing metadata with submitted metadata (which can be partial)
-      # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it'
-      for metadata_key in posted_metadata.keys():
+    if module is None:
+        # new module at this location
+        # presume that we have an 'Empty' template
+        template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty'])
+        module = store.clone_item(template_location, location)
 
-          # let's strip out any metadata fields from the postback which have been identified as system metadata
-          # and therefore should not be user-editable, so we should accept them back from the client
-          if metadata_key in module.system_metadata_fields:
-              del posted_metadata[metadata_key]
-          elif posted_metadata[metadata_key] is None:
-              # remove both from passed in collection as well as the collection read in from the modulestore
-              if metadata_key in module.metadata:
-                  del module.metadata[metadata_key]
-              del posted_metadata[metadata_key]
+    if post_data.get('data') is not None:
+        data = post_data['data']
+        store.update_item(location, data)
 
-      # overlay the new metadata over the modulestore sourced collection to support partial updates
-      module.metadata.update(posted_metadata)
+    # cdodge: note calling request.POST.get('children') will return None if children is an empty array
+    # so it lead to a bug whereby the last component to be deleted in the UI was not actually
+    # deleting the children object from the children collection
+    if 'children' in post_data and post_data['children'] is not None:
+        children = post_data['children']
+        store.update_children(location, children)
 
-      # commit to datastore
-      store.update_metadata(location, module.metadata)
+    # cdodge: also commit any metadata which might have been passed along in the
+    # POST from the client, if it is there
+    # NOTE, that the postback is not the complete metadata, as there's system metadata which is
+    # not presented to the end-user for editing. So let's fetch the original and
+    # 'apply' the submitted metadata, so we don't end up deleting system metadata
+    if post_data.get('metadata') is not None:
+        posted_metadata = post_data['metadata']
+        
+        # update existing metadata with submitted metadata (which can be partial)
+        # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it'
+        for metadata_key in posted_metadata.keys():
+        
+            # let's strip out any metadata fields from the postback which have been identified as system metadata
+            # and therefore should not be user-editable, so we should accept them back from the client
+            if metadata_key in module.system_metadata_fields:
+                del posted_metadata[metadata_key]
+            elif posted_metadata[metadata_key] is None:
+                # remove both from passed in collection as well as the collection read in from the modulestore
+                if metadata_key in module.metadata:
+                    del module.metadata[metadata_key]
+                del posted_metadata[metadata_key]
+        
+        # overlay the new metadata over the modulestore sourced collection to support partial updates
+        module.metadata.update(posted_metadata)
+        
+        # commit to datastore
+        store.update_metadata(location, module.metadata)

cms/djangoapps/contentstore/tests/factories.py

 from factory import Factory
-from xmodule.modulestore import Location
-from xmodule.modulestore.django import modulestore
-from time import gmtime
+from datetime import datetime
 from uuid import uuid4
-from xmodule.timeparse import stringify_time
+from student.models import (User, UserProfile, Registration,
+                            CourseEnrollmentAllowed)
+from django.contrib.auth.models import Group
 
 
-def XMODULE_COURSE_CREATION(class_to_create, **kwargs): 
-    return XModuleCourseFactory._create(class_to_create, **kwargs)
+class UserProfileFactory(Factory):
+    FACTORY_FOR = UserProfile
 
-def XMODULE_ITEM_CREATION(class_to_create, **kwargs):
-    return XModuleItemFactory._create(class_to_create, **kwargs)
+    user = None
+    name = 'Robot Studio'
+    courseware = 'course.xml'
 
-class XModuleCourseFactory(Factory):
-    """
-    Factory for XModule courses.
-    """
 
-    ABSTRACT_FACTORY = True
-    _creation_function = (XMODULE_COURSE_CREATION,)
+class RegistrationFactory(Factory):
+    FACTORY_FOR = Registration
 
-    @classmethod
-    def _create(cls, target_class, *args, **kwargs):
+    user = None
+    activation_key = uuid4().hex
 
-        template = Location('i4x', 'edx', 'templates', 'course', 'Empty')
-        org = kwargs.get('org')
-        number = kwargs.get('number')
-        display_name = kwargs.get('display_name')
-        location = Location('i4x', org, number, 
-                            'course', Location.clean(display_name))
 
-        store = modulestore('direct')
+class UserFactory(Factory):
+    FACTORY_FOR = User
 
-        # Write the data to the mongo datastore
-        new_course = store.clone_item(template, location)
+    username = 'robot'
+    email = 'robot@edx.org'
+    password = 'test'
+    first_name = 'Robot'
+    last_name = 'Tester'
+    is_staff = False
+    is_active = True
+    is_superuser = False
+    last_login = datetime.now()
+    date_joined = datetime.now()
 
-        # This metadata code was copied from cms/djangoapps/contentstore/views.py
-        if display_name is not None:
-            new_course.metadata['display_name'] = display_name
 
-        new_course.metadata['data_dir'] = uuid4().hex
-        new_course.metadata['start'] = stringify_time(gmtime())
-        new_course.tabs = [{"type": "courseware"}, 
-            {"type": "course_info", "name": "Course Info"}, 
-            {"type": "discussion", "name": "Discussion"},
-            {"type": "wiki", "name": "Wiki"},
-            {"type": "progress", "name": "Progress"}]
+class GroupFactory(Factory):
+    FACTORY_FOR = Group
 
-        # Update the data in the mongo datastore
-        store.update_metadata(new_course.location.url(), new_course.own_metadata)   
+    name = 'test_group'
 
-        return new_course
 
-class Course:
-    pass
+class CourseEnrollmentAllowedFactory(Factory):
+    FACTORY_FOR = CourseEnrollmentAllowed
 
-class CourseFactory(XModuleCourseFactory):
-    FACTORY_FOR = Course
-
-    template = 'i4x://edx/templates/course/Empty'
-    org = 'MITx'
-    number = '999'
-    display_name = 'Robot Super Course'
-
-class XModuleItemFactory(Factory):
-    """
-    Factory for XModule items.
-    """
-
-    ABSTRACT_FACTORY = True
-    _creation_function = (XMODULE_ITEM_CREATION,)
-
-    @classmethod
-    def _create(cls, target_class, *args, **kwargs):
-        """
-        kwargs must include parent_location, template. Can contain display_name
-        target_class is ignored
-        """
-
-        DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info']
-        
-        parent_location = Location(kwargs.get('parent_location'))
-        template = Location(kwargs.get('template'))
-        display_name = kwargs.get('display_name')
-
-        store = modulestore('direct')
-
-        # This code was based off that in cms/djangoapps/contentstore/views.py
-        parent = store.get_item(parent_location)
-        dest_location = parent_location._replace(category=template.category, name=uuid4().hex)
-
-        new_item = store.clone_item(template, dest_location)
-
-        # TODO: This needs to be deleted when we have proper storage for static content
-        new_item.metadata['data_dir'] = parent.metadata['data_dir']
-
-        # replace the display name with an optional parameter passed in from the caller
-        if display_name is not None:
-            new_item.metadata['display_name'] = display_name
-
-        store.update_metadata(new_item.location.url(), new_item.own_metadata)
-
-        if new_item.location.category not in DETACHED_CATEGORIES:
-            store.update_children(parent_location, parent.definition.get('children', []) + [new_item.location.url()])
-
-        return new_item
-
-class Item:
-    pass
-
-class ItemFactory(XModuleItemFactory):
-    FACTORY_FOR = Item
-
-    parent_location = 'i4x://MITx/999/course/Robot_Super_Course'
-    template = 'i4x://edx/templates/chapter/Empty'
-    display_name = 'Section One'
\ No newline at end of file
+    email = 'test@edx.org'
+    course_id = 'edX/test/2012_Fall'

cms/djangoapps/contentstore/tests/test_contentstore.py

+import json
+import shutil
+from django.test.client import Client
+from django.test.utils import override_settings
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from path import path
+from tempfile import mkdtemp
+import json
+from fs.osfs import OSFS
+import copy
+from mock import Mock
+from json import dumps, loads
+
+from student.models import Registration
+from django.contrib.auth.models import User
+from cms.djangoapps.contentstore.utils import get_modulestore
+
+from utils import ModuleStoreTestCase, parse_json
+from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
+
+from xmodule.modulestore import Location
+from xmodule.modulestore.store_utilities import clone_course
+from xmodule.modulestore.store_utilities import delete_course
+from xmodule.modulestore.django import modulestore, _MODULESTORES
+from xmodule.contentstore.django import contentstore
+from xmodule.templates import update_templates
+from xmodule.modulestore.xml_exporter import export_to_xml
+from xmodule.modulestore.xml_importer import import_from_xml
+
+from xmodule.capa_module import CapaDescriptor
+from xmodule.course_module import CourseDescriptor
+from xmodule.seq_module import SequenceDescriptor
+
+TEST_DATA_MODULESTORE = copy.deepcopy(settings.MODULESTORE)
+TEST_DATA_MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data')
+TEST_DATA_MODULESTORE['direct']['OPTIONS']['fs_root'] = path('common/test/data')
+
+
+@override_settings(MODULESTORE=TEST_DATA_MODULESTORE)
+class ContentStoreToyCourseTest(ModuleStoreTestCase):
+    """
+    Tests that rely on the toy courses.
+    TODO: refactor using CourseFactory so they do not.
+    """
+    def setUp(self):
+        uname = 'testuser'
+        email = 'test+courses@edx.org'
+        password = 'foo'
+
+        # Create the use so we can log them in.
+        self.user = User.objects.create_user(uname, email, password)
+
+        # Note that we do not actually need to do anything
+        # for registration if we directly mark them active.
+        self.user.is_active = True
+        # Staff has access to view all courses
+        self.user.is_staff = True
+        self.user.save()
+
+        self.client = Client()
+        self.client.login(username=uname, password=password)
+
+
+    def check_edit_unit(self, test_course_name):
+        import_from_xml(modulestore(), 'common/test/data/', [test_course_name])
+
+        for descriptor in modulestore().get_items(Location(None, None, 'vertical', None, None)):
+            print "Checking ", descriptor.location.url()
+            print descriptor.__class__, descriptor.location
+            resp = self.client.get(reverse('edit_unit', kwargs={'location': descriptor.location.url()}))
+            self.assertEqual(resp.status_code, 200)
+
+    def test_edit_unit_toy(self):
+        self.check_edit_unit('toy')
+
+    def test_edit_unit_full(self):
+        self.check_edit_unit('full')
+
+    def test_static_tab_reordering(self):
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+
+        ms = modulestore('direct')
+        course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
+
+        # reverse the ordering
+        reverse_tabs = []
+        for tab in course.tabs:
+            if tab['type'] == 'static_tab':
+                reverse_tabs.insert(0, 'i4x://edX/full/static_tab/{0}'.format(tab['url_slug']))
+
+        resp = self.client.post(reverse('reorder_static_tabs'), json.dumps({'tabs': reverse_tabs}), "application/json")
+
+        course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
+
+        # compare to make sure that the tabs information is in the expected order after the server call
+        course_tabs = []
+        for tab in course.tabs:
+            if tab['type'] == 'static_tab':
+                course_tabs.append('i4x://edX/full/static_tab/{0}'.format(tab['url_slug']))
+
+        self.assertEqual(reverse_tabs, course_tabs)
+
+    def test_about_overrides(self):
+        '''
+        This test case verifies that a course can use specialized override for about data, e.g. /about/Fall_2012/effort.html
+        while there is a base definition in /about/effort.html
+        '''
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+        ms = modulestore('direct')
+        effort = ms.get_item(Location(['i4x', 'edX', 'full', 'about', 'effort', None]))
+        self.assertEqual(effort.definition['data'], '6 hours')
+
+        # this one should be in a non-override folder
+        effort = ms.get_item(Location(['i4x', 'edX', 'full', 'about', 'end_date', None]))
+        self.assertEqual(effort.definition['data'], 'TBD')
+
+    def test_remove_hide_progress_tab(self):
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+
+        ms = modulestore('direct')
+        cs = contentstore()
+
+        source_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
+        course = ms.get_item(source_location)
+        self.assertNotIn('hide_progress_tab', course.metadata)
+
+    def test_clone_course(self):
+
+        course_data = {
+            'template': 'i4x://edx/templates/course/Empty',
+            'org': 'MITx',
+            'number': '999',
+            'display_name': 'Robot Super Course',
+            }
+
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+
+        resp = self.client.post(reverse('create_new_course'), course_data)
+        self.assertEqual(resp.status_code, 200)
+        data = parse_json(resp)
+        self.assertEqual(data['id'], 'i4x://MITx/999/course/Robot_Super_Course')
+
+        ms = modulestore('direct')
+        cs = contentstore()
+
+        source_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
+        dest_location = CourseDescriptor.id_to_location('MITx/999/Robot_Super_Course')
+
+        clone_course(ms, cs, source_location, dest_location)
+
+        # now loop through all the units in the course and verify that the clone can render them, which
+        # means the objects are at least present
+        items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
+        self.assertGreater(len(items), 0)
+        clone_items = ms.get_items(Location(['i4x', 'MITx', '999', 'vertical', None]))
+        self.assertGreater(len(clone_items), 0)
+        for descriptor in items:
+            new_loc = descriptor.location._replace(org='MITx', course='999')
+            print "Checking {0} should now also be at {1}".format(descriptor.location.url(), new_loc.url())
+            resp = self.client.get(reverse('edit_unit', kwargs={'location': new_loc.url()}))
+            self.assertEqual(resp.status_code, 200)
+
+    def test_delete_course(self):
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+
+        ms = modulestore('direct')
+        cs = contentstore()
+
+        location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
+
+        delete_course(ms, cs, location)
+
+        items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
+        self.assertEqual(len(items), 0)
+
+    def verify_content_existence(self, modulestore, root_dir, location, dirname, category_name, filename_suffix=''):
+        fs = OSFS(root_dir / 'test_export')
+        self.assertTrue(fs.exists(dirname))
+
+        query_loc = Location('i4x', location.org, location.course, category_name, None)
+        items = modulestore.get_items(query_loc)
+
+        for item in items:
+            fs = OSFS(root_dir / ('test_export/' + dirname))
+            self.assertTrue(fs.exists(item.location.name + filename_suffix))
+
+    def test_export_course(self):
+        ms = modulestore('direct')
+        cs = contentstore()
+
+        import_from_xml(ms, 'common/test/data/', ['full'])
+        location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
+
+        root_dir = path(mkdtemp())
+
+        print 'Exporting to tempdir = {0}'.format(root_dir)
+
+        # export out to a tempdir
+        export_to_xml(ms, cs, location, root_dir, 'test_export')
+
+        # check for static tabs
+        self.verify_content_existence(ms, root_dir, location, 'tabs', 'static_tab', '.html')
+
+        # check for custom_tags
+        self.verify_content_existence(ms, root_dir, location, 'info', 'course_info', '.html')
+
+        # check for custom_tags
+        self.verify_content_existence(ms, root_dir, location, 'custom_tags', 'custom_tag_template')
+
+        # check for graiding_policy.json
+        fs = OSFS(root_dir / 'test_export/policies/6.002_Spring_2012')
+        self.assertTrue(fs.exists('grading_policy.json'))
+
+        # compare what's on disk compared to what we have in our course
+        with fs.open('grading_policy.json','r') as grading_policy:
+            on_disk = loads(grading_policy.read())
+            course = ms.get_item(location)
+            self.assertEqual(on_disk, course.definition['data']['grading_policy'])
+
+        # remove old course
+        delete_course(ms, cs, location)
+
+        # reimport
+        import_from_xml(ms, root_dir, ['test_export'])
+
+        items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
+        self.assertGreater(len(items), 0)
+        for descriptor in items:
+            print "Checking {0}....".format(descriptor.location.url())
+            resp = self.client.get(reverse('edit_unit', kwargs={'location': descriptor.location.url()}))
+            self.assertEqual(resp.status_code, 200)
+
+        shutil.rmtree(root_dir)
+
+    def test_course_handouts_rewrites(self):
+        ms = modulestore('direct')
+        cs = contentstore()
+
+        # import a test course
+        import_from_xml(ms, 'common/test/data/', ['full'])
+
+        handout_location = Location(['i4x', 'edX', 'full', 'course_info', 'handouts'])
+
+        # get module info
+        resp = self.client.get(reverse('module_info', kwargs={'module_location': handout_location}))
+
+        # make sure we got a successful response
+        self.assertEqual(resp.status_code, 200)
+
+        # check that /static/ has been converted to the full path
+        # note, we know the link it should be because that's what in the 'full' course in the test data
+        self.assertContains(resp, '/c4x/edX/full/asset/handouts_schematic_tutorial.pdf')
+
+
+class ContentStoreTest(ModuleStoreTestCase):
+    """
+    Tests for the CMS ContentStore application.
+    """
+    def setUp(self):
+        """
+        These tests need a user in the DB so that the django Test Client
+        can log them in.
+        They inherit from the ModuleStoreTestCase class so that the mongodb collection
+        will be cleared out before each test case execution and deleted
+        afterwards.
+        """
+        uname = 'testuser'
+        email = 'test+courses@edx.org'
+        password = 'foo'
+
+        # Create the use so we can log them in.
+        self.user = User.objects.create_user(uname, email, password)
+
+        # Note that we do not actually need to do anything
+        # for registration if we directly mark them active.
+        self.user.is_active = True
+        # Staff has access to view all courses
+        self.user.is_staff = True
+        self.user.save()
+
+        self.client = Client()
+        self.client.login(username=uname, password=password)
+
+        self.course_data = {
+            'template': 'i4x://edx/templates/course/Empty',
+            'org': 'MITx',
+            'number': '999',
+            'display_name': 'Robot Super Course',
+            }
+
+    def test_create_course(self):
+        """Test new course creation - happy path"""
+        resp = self.client.post(reverse('create_new_course'), self.course_data)
+        self.assertEqual(resp.status_code, 200)
+        data = parse_json(resp)
+        self.assertEqual(data['id'], 'i4x://MITx/999/course/Robot_Super_Course')
+
+    def test_create_course_duplicate_course(self):
+        """Test new course creation - error path"""
+        resp = self.client.post(reverse('create_new_course'), self.course_data)
+        resp = self.client.post(reverse('create_new_course'), self.course_data)
+        data = parse_json(resp)
+        self.assertEqual(resp.status_code, 200)
+        self.assertEqual(data['ErrMsg'], 'There is already a course defined with this name.')
+
+    def test_create_course_duplicate_number(self):
+        """Test new course creation - error path"""
+        resp = self.client.post(reverse('create_new_course'), self.course_data)
+        self.course_data['display_name'] = 'Robot Super Course Two'
+
+        resp = self.client.post(reverse('create_new_course'), self.course_data)
+        data = parse_json(resp)
+
+        self.assertEqual(resp.status_code, 200)
+        self.assertEqual(data['ErrMsg'],
+            'There is already a course defined with the same organization and course number.')
+
+    def test_create_course_with_bad_organization(self):
+        """Test new course creation - error path for bad organization name"""
+        self.course_data['org'] = 'University of California, Berkeley'
+        resp = self.client.post(reverse('create_new_course'), self.course_data)
+        data = parse_json(resp)
+
+        self.assertEqual(resp.status_code, 200)
+        self.assertEqual(data['ErrMsg'],
+            "Unable to create course 'Robot Super Course'.\n\nInvalid characters in 'University of California, Berkeley'.")
+
+    def test_course_index_view_with_no_courses(self):
+        """Test viewing the index page with no courses"""
+        # Create a course so there is something to view
+        resp = self.client.get(reverse('index'))
+        self.assertContains(resp,
+            '<h1>My Courses</h1>',
+            status_code=200,
+            html=True)
+
+    def test_course_factory(self):
+        """Test that the course factory works correctly."""
+        course = CourseFactory.create()
+        self.assertIsInstance(course, CourseDescriptor)
+
+    def test_item_factory(self):
+        """Test that the item factory works correctly."""
+        course = CourseFactory.create()
+        item = ItemFactory.create(parent_location=course.location)
+        self.assertIsInstance(item, SequenceDescriptor)
+
+    def test_course_index_view_with_course(self):
+        """Test viewing the index page with an existing course"""
+        CourseFactory.create(display_name='Robot Super Educational Course')
+        resp = self.client.get(reverse('index'))
+        self.assertContains(resp,
+            '<span class="class-name">Robot Super Educational Course</span>',
+            status_code=200,
+            html=True)
+
+    def test_course_overview_view_with_course(self):
+        """Test viewing the course overview page with an existing course"""
+        CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
+
+        data = {
+                'org': 'MITx',
+                'course': '999',
+                'name': Location.clean('Robot Super Course'),
+                }
+
+        resp = self.client.get(reverse('course_index', kwargs=data))
+        self.assertContains(resp,
+            '<a href="/MITx/999/course/Robot_Super_Course" class="class-name">Robot Super Course</a>',
+            status_code=200,
+            html=True)
+
+    def test_clone_item(self):
+        """Test cloning an item. E.g. creating a new section"""
+        CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
+
+        section_data = {
+            'parent_location': 'i4x://MITx/999/course/Robot_Super_Course',
+            'template': 'i4x://edx/templates/chapter/Empty',
+            'display_name': 'Section One',
+            }
+
+        resp = self.client.post(reverse('clone_item'), section_data)
+
+        self.assertEqual(resp.status_code, 200)
+        data = parse_json(resp)
+        self.assertRegexpMatches(data['id'],
+            '^i4x:\/\/MITx\/999\/chapter\/([0-9]|[a-f]){32}$')
+
+    def test_capa_module(self):
+        """Test that a problem treats markdown specially."""
+        CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
+
+        problem_data = {
+            'parent_location': 'i4x://MITx/999/course/Robot_Super_Course',
+            'template': 'i4x://edx/templates/problem/Empty'
+            }
+
+        resp = self.client.post(reverse('clone_item'), problem_data)
+
+        self.assertEqual(resp.status_code, 200)
+        payload = parse_json(resp)
+        problem_loc = payload['id']
+        problem = get_modulestore(problem_loc).get_item(problem_loc)
+        # should be a CapaDescriptor
+        self.assertIsInstance(problem, CapaDescriptor, "New problem is not a CapaDescriptor")
+        context = problem.get_context()
+        self.assertIn('markdown', context, "markdown is missing from context")
+        self.assertIn('markdown', problem.metadata, "markdown is missing from metadata")
+        self.assertNotIn('markdown', problem.editable_metadata_fields, "Markdown slipped into the editable metadata fields")