subs and then rest of val
course_upd_collection = []
@@ -64,9 +68,11 @@ def update_course_updates(location, update, passed_id=None):
# purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break.
try:
- course_html_parsed = etree.fromstring(course_updates.data)
- except etree.XMLSyntaxError:
- course_html_parsed = etree.fromstring("
")
+ course_html_parsed = html.fromstring(course_updates.data)
+ except:
+ log.error("Cannot parse: " + course_updates.data)
+ escaped = django.utils.html.escape(course_updates.data)
+ course_html_parsed = html.fromstring("- " + escaped + "
")
# No try/catch b/c failure generates an error back to client
new_html_parsed = html.fromstring('
' + update['date'] + '
' + update['content'] + '- " + escaped + "
div
'
+ first_update_url = reverse('course_info_json',
+ kwargs={'org': self.course_location.org,
+ 'course': self.course_location.course,
+ 'provided_id': payload['id']})
+ content += 'p
div
'
payload['content'] = content
+ resp = self.client.post(first_update_url, json.dumps(payload),
+ "application/json")
+
+ self.assertHTMLEqual(content, json.loads(resp.content)['content'],
+ "iframe w/ div")
+
+ # now put in an evil update
+ content = 'p
-
-
-
diff --git a/cms/urls.py b/cms/urls.py
index d050821318..8054757c36 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -43,7 +43,7 @@ urlpatterns = ('',
url(r'^(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)/remove_user$',
'contentstore.views.remove_user', name='remove_user'),
url(r'^(?P[^/]+)/(?P[^/]+)/info/(?P[^/]+)$', 'contentstore.views.course_info', name='course_info'),
- url(r'^(?P[^/]+)/(?P[^/]+)/course_info/updates/(?P.*)$', 'contentstore.views.course_info_updates', name='course_info'),
+ url(r'^(?P[^/]+)/(?P[^/]+)/course_info/updates/(?P.*)$', 'contentstore.views.course_info_updates', name='course_info_json'),
url(r'^(?P[^/]+)/(?P[^/]+)/settings-details/(?P[^/]+)$', 'contentstore.views.get_course_settings', name='course_settings'),
url(r'^(?P[^/]+)/(?P[^/]+)/settings-grading/(?P[^/]+)$', 'contentstore.views.course_config_graders_page', name='course_settings'),
url(r'^(?P[^/]+)/(?P[^/]+)/settings-details/(?P[^/]+)/section/(?P[^/]+).*$', 'contentstore.views.course_settings_updates', name='course_settings'),
@@ -101,12 +101,12 @@ urlpatterns += (
)
if settings.ENABLE_JASMINE:
- ## Jasmine
+ # # Jasmine
urlpatterns = urlpatterns + (url(r'^_jasmine/', include('django_jasmine.urls')),)
urlpatterns = patterns(*urlpatterns)
-#Custom error pages
+# Custom error pages
handler404 = 'contentstore.views.render_404'
handler500 = 'contentstore.views.render_500'
diff --git a/common/djangoapps/course_groups/cohorts.py b/common/djangoapps/course_groups/cohorts.py
index c362ed4e89..7924012bfe 100644
--- a/common/djangoapps/course_groups/cohorts.py
+++ b/common/djangoapps/course_groups/cohorts.py
@@ -15,6 +15,24 @@ from .models import CourseUserGroup
log = logging.getLogger(__name__)
+# tl;dr: global state is bad. capa reseeds random every time a problem is loaded. Even
+# if and when that's fixed, it's a good idea to have a local generator to avoid any other
+# code that messes with the global random module.
+_local_random = None
+
+def local_random():
+ """
+ Get the local random number generator. In a function so that we don't run
+ random.Random() at import time.
+ """
+ # ironic, isn't it?
+ global _local_random
+
+ if _local_random is None:
+ _local_random = random.Random()
+
+ return _local_random
+
def is_course_cohorted(course_id):
"""
Given a course id, return a boolean for whether or not the course is
@@ -129,13 +147,7 @@ def get_cohort(user, course_id):
return None
# Put user in a random group, creating it if needed
- choice = random.randrange(0, n)
- group_name = choices[choice]
-
- # Victor: we are seeing very strange behavior on prod, where almost all users
- # end up in the same group. Log at INFO to try to figure out what's going on.
- log.info("DEBUG: adding user {0} to cohort {1}. choice={2}".format(
- user, group_name,choice))
+ group_name = local_random().choice(choices)
group, created = CourseUserGroup.objects.get_or_create(
course_id=course_id,
diff --git a/common/djangoapps/student/tests/__init__.py b/common/djangoapps/student/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/common/djangoapps/student/tests/factories.py b/common/djangoapps/student/tests/factories.py
new file mode 100644
index 0000000000..f74188725a
--- /dev/null
+++ b/common/djangoapps/student/tests/factories.py
@@ -0,0 +1,59 @@
+from student.models import (User, UserProfile, Registration,
+ CourseEnrollmentAllowed, CourseEnrollment)
+from django.contrib.auth.models import Group
+from datetime import datetime
+from factory import Factory, SubFactory
+from uuid import uuid4
+
+
+class GroupFactory(Factory):
+ FACTORY_FOR = Group
+
+ name = 'staff_MITx/999/Robot_Super_Course'
+
+
+class UserProfileFactory(Factory):
+ FACTORY_FOR = UserProfile
+
+ user = None
+ name = 'Robot Test'
+ level_of_education = None
+ gender = 'm'
+ mailing_address = None
+ goals = 'World domination'
+
+
+class RegistrationFactory(Factory):
+ FACTORY_FOR = Registration
+
+ user = None
+ activation_key = uuid4().hex
+
+
+class UserFactory(Factory):
+ FACTORY_FOR = User
+
+ username = 'robot'
+ email = 'robot+test@edx.org'
+ password = 'test'
+ first_name = 'Robot'
+ last_name = 'Test'
+ is_staff = False
+ is_active = True
+ is_superuser = False
+ last_login = datetime(2012, 1, 1)
+ date_joined = datetime(2011, 1, 1)
+
+
+class CourseEnrollmentFactory(Factory):
+ FACTORY_FOR = CourseEnrollment
+
+ user = SubFactory(UserFactory)
+ course_id = 'edX/toy/2012_Fall'
+
+
+class CourseEnrollmentAllowedFactory(Factory):
+ FACTORY_FOR = CourseEnrollmentAllowed
+
+ email = 'test@edx.org'
+ course_id = 'edX/test/2012_Fall'
diff --git a/common/djangoapps/student/tests.py b/common/djangoapps/student/tests/tests.py
similarity index 97%
rename from common/djangoapps/student/tests.py
rename to common/djangoapps/student/tests/tests.py
index 6a2d75e3d8..4638da44b2 100644
--- a/common/djangoapps/student/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -9,8 +9,8 @@ import logging
from django.test import TestCase
from mock import Mock
-from .models import unique_id_for_user
-from .views import process_survey_link, _cert_info
+from student.models import unique_id_for_user
+from student.views import process_survey_link, _cert_info
COURSE_1 = 'edX/toy/2012_Fall'
COURSE_2 = 'edx/full/6.002_Spring_2012'
diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py
index 6394959532..c8cc0c9e4b 100644
--- a/common/djangoapps/terrain/browser.py
+++ b/common/djangoapps/terrain/browser.py
@@ -1,7 +1,6 @@
from lettuce import before, after, world
from splinter.browser import Browser
from logging import getLogger
-import time
# Let the LMS and CMS do their one-time setup
# For example, setting up mongo caches
@@ -16,6 +15,9 @@ from django.core.management import call_command
@before.harvest
def initial_setup(server):
+ '''
+ Launch the browser once before executing the tests
+ '''
# Launch the browser app (choose one of these below)
world.browser = Browser('chrome')
# world.browser = Browser('phantomjs')
@@ -24,14 +26,18 @@ def initial_setup(server):
@before.each_scenario
def reset_data(scenario):
- # Clean out the django test database defined in the
- # envs/acceptance.py file: mitx_all/db/test_mitx.db
+ '''
+ Clean out the django test database defined in the
+ envs/acceptance.py file: mitx_all/db/test_mitx.db
+ '''
logger.debug("Flushing the test database...")
call_command('flush', interactive=False)
@after.all
def teardown_browser(total):
- # Quit firefox
+ '''
+ Quit the browser after executing the tests
+ '''
world.browser.quit()
pass
diff --git a/common/djangoapps/terrain/factories.py b/common/djangoapps/terrain/factories.py
index c36bf935f1..768c51b25e 100644
--- a/common/djangoapps/terrain/factories.py
+++ b/common/djangoapps/terrain/factories.py
@@ -1,190 +1,64 @@
-from student.models import User, UserProfile, Registration
-from django.contrib.auth.models import Group
-from datetime import datetime
-from factory import Factory
-from xmodule.modulestore import Location
-from xmodule.modulestore.django import modulestore
-from time import gmtime
-from uuid import uuid4
-from xmodule.timeparse import stringify_time
-from xmodule.modulestore.inheritance import own_metadata
+'''
+Factories are defined in other modules and absorbed here into the
+lettuce world so that they can be used by both unit tests
+and integration / BDD tests.
+'''
+import student.tests.factories as sf
+import xmodule.modulestore.tests.factories as xf
+from lettuce import world
-class GroupFactory(Factory):
- FACTORY_FOR = Group
-
- name = 'staff_MITx/999/Robot_Super_Course'
-
-
-class UserProfileFactory(Factory):
- FACTORY_FOR = UserProfile
-
- user = None
- name = 'Robot Test'
- level_of_education = None
- gender = 'm'
- mailing_address = None
- goals = 'World domination'
-
-
-class RegistrationFactory(Factory):
- FACTORY_FOR = Registration
-
- user = None
- activation_key = uuid4().hex
-
-
-class UserFactory(Factory):
- FACTORY_FOR = User
-
- username = 'robot'
- email = 'robot+test@edx.org'
- password = 'test'
- first_name = 'Robot'
- last_name = 'Test'
- is_staff = False
- is_active = True
- is_superuser = False
- last_login = datetime(2012, 1, 1)
- date_joined = datetime(2011, 1, 1)
-
-
-def XMODULE_COURSE_CREATION(class_to_create, **kwargs):
- return XModuleCourseFactory._create(class_to_create, **kwargs)
-
-
-def XMODULE_ITEM_CREATION(class_to_create, **kwargs):
- return XModuleItemFactory._create(class_to_create, **kwargs)
-
-
-class XModuleCourseFactory(Factory):
+@world.absorb
+class UserFactory(sf.UserFactory):
"""
- Factory for XModule courses.
+ User account for lms / cms
"""
-
- ABSTRACT_FACTORY = True
- _creation_function = (XMODULE_COURSE_CREATION,)
-
- @classmethod
- def _create(cls, target_class, *args, **kwargs):
-
- 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')
-
- # Write the data to the mongo datastore
- new_course = store.clone_item(template, location)
-
- # This metadata code was copied from cms/djangoapps/contentstore/views.py
- if display_name is not None:
- new_course.display_name = display_name
-
- new_course.lms.start = gmtime()
- new_course.tabs = [{"type": "courseware"},
- {"type": "course_info", "name": "Course Info"},
- {"type": "discussion", "name": "Discussion"},
- {"type": "wiki", "name": "Wiki"},
- {"type": "progress", "name": "Progress"}]
-
- # Update the data in the mongo datastore
- store.update_metadata(new_course.location.url(), own_metadata(new_course))
-
- return new_course
-
-
-class Course:
pass
-class CourseFactory(XModuleCourseFactory):
- FACTORY_FOR = Course
-
- template = 'i4x://edx/templates/course/Empty'
- org = 'MITx'
- number = '999'
- display_name = 'Robot Super Course'
-
-
-class XModuleItemFactory(Factory):
+@world.absorb
+class UserProfileFactory(sf.UserProfileFactory):
"""
- Factory for XModule items.
+ Demographics etc for the User
"""
-
- ABSTRACT_FACTORY = True
- _creation_function = (XMODULE_ITEM_CREATION,)
-
- @classmethod
- def _create(cls, target_class, *args, **kwargs):
- """
- Uses *kwargs*:
-
- *parent_location* (required): the location of the parent module
- (e.g. the parent course or section)
-
- *template* (required): the template to create the item from
- (e.g. i4x://templates/section/Empty)
-
- *data* (optional): the data for the item
- (e.g. XML problem definition for a problem item)
-
- *display_name* (optional): the display name of the item
-
- *metadata* (optional): dictionary of metadata attributes
-
- *target_class* is ignored
- """
-
- DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info']
-
- parent_location = Location(kwargs.get('parent_location'))
- template = Location(kwargs.get('template'))
- data = kwargs.get('data')
- display_name = kwargs.get('display_name')
- metadata = kwargs.get('metadata', {})
-
- store = modulestore('direct')
-
- # This code was based off that in cms/djangoapps/contentstore/views.py
- parent = store.get_item(parent_location)
-
- # If a display name is set, use that
- dest_name = display_name.replace(" ", "_") if display_name is not None else uuid4().hex
- dest_location = parent_location._replace(category=template.category,
- name=dest_name)
-
- new_item = store.clone_item(template, dest_location)
-
- # replace the display name with an optional parameter passed in from the caller
- if display_name is not None:
- new_item.display_name = display_name
-
- # Add additional metadata or override current metadata
- item_metadata = own_metadata(new_item)
- item_metadata.update(metadata)
- store.update_metadata(new_item.location.url(), item_metadata)
-
- # replace the data with the optional *data* parameter
- if data is not None:
- store.update_item(new_item.location, data)
-
- if new_item.location.category not in DETACHED_CATEGORIES:
- store.update_children(parent_location, parent.children + [new_item.location.url()])
-
- return new_item
-
-
-class Item:
pass
-class ItemFactory(XModuleItemFactory):
- FACTORY_FOR = Item
+@world.absorb
+class RegistrationFactory(sf.RegistrationFactory):
+ """
+ Activation key for registering the user account
+ """
+ pass
- parent_location = 'i4x://MITx/999/course/Robot_Super_Course'
- template = 'i4x://edx/templates/chapter/Empty'
- display_name = 'Section One'
+
+@world.absorb
+class GroupFactory(sf.GroupFactory):
+ """
+ Groups for user permissions for courses
+ """
+ pass
+
+
+@world.absorb
+class CourseEnrollmentAllowedFactory(sf.CourseEnrollmentAllowed):
+ """
+ Users allowed to enroll in the course outside of the usual window
+ """
+ pass
+
+
+@world.absorb
+class CourseFactory(xf.CourseFactory):
+ """
+ Courseware courses
+ """
+ pass
+
+
+@world.absorb
+class ItemFactory(xf.ItemFactory):
+ """
+ Everything included inside a course
+ """
+ pass
diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py
index 52eeb23c4a..890d5fe450 100644
--- a/common/djangoapps/terrain/steps.py
+++ b/common/djangoapps/terrain/steps.py
@@ -1,7 +1,12 @@
from lettuce import world, step
from .factories import *
from lettuce.django import django_url
+from django.conf import settings
+from django.http import HttpRequest
from django.contrib.auth.models import User
+from django.contrib.auth import authenticate, login
+from django.contrib.auth.middleware import AuthenticationMiddleware
+from django.contrib.sessions.middleware import SessionMiddleware
from student.models import CourseEnrollment
from urllib import quote_plus
from nose.tools import assert_equals
@@ -9,6 +14,7 @@ from bs4 import BeautifulSoup
import time
import re
import os.path
+from selenium.common.exceptions import WebDriverException
from logging import getLogger
logger = getLogger(__name__)
@@ -77,7 +83,7 @@ def the_page_title_should_contain(step, title):
@step('I am a logged in user$')
def i_am_logged_in_user(step):
create_user('robot')
- log_in('robot@edx.org', 'test')
+ log_in('robot', 'test')
@step('I am not logged in$')
@@ -92,7 +98,7 @@ def i_am_staff_for_course_by_id(step, course_id):
@step('I log in$')
def i_log_in(step):
- log_in('robot@edx.org', 'test')
+ log_in('robot', 'test')
@step(u'I am an edX user$')
@@ -119,38 +125,46 @@ def create_user(uname):
portal_user.set_password('test')
portal_user.save()
- registration = RegistrationFactory(user=portal_user)
+ registration = world.RegistrationFactory(user=portal_user)
registration.register(portal_user)
registration.activate()
- user_profile = UserProfileFactory(user=portal_user)
+ user_profile = world.UserProfileFactory(user=portal_user)
@world.absorb
-def log_in(email, password):
- world.browser.cookies.delete()
- world.browser.visit(django_url('/'))
- world.browser.is_element_present_by_css('header.global', 10)
- world.browser.click_link_by_href('#login-modal')
+def log_in(username, password):
+ '''
+ Log the user in programatically
+ '''
- # Wait for the login dialog to load
- # This is complicated by the fact that sometimes a second #login_form
- # dialog loads, while the first one remains hidden.
- # We give them both time to load, starting with the second one.
- world.browser.is_element_present_by_css('section.content-wrapper form#login_form', wait_time=4)
- world.browser.is_element_present_by_css('form#login_form', wait_time=2)
+ # Authenticate the user
+ user = authenticate(username=username, password=password)
+ assert(user is not None and user.is_active)
- # For some reason, the page sometimes includes two #login_form
- # elements, the first of which is not visible.
- # To avoid this, we always select the last of the two #login_form dialogs
- login_form = world.browser.find_by_css('form#login_form').last
+ # Send a fake HttpRequest to log the user in
+ # We need to process the request using
+ # Session middleware and Authentication middleware
+ # to ensure that session state can be stored
+ request = HttpRequest()
+ SessionMiddleware().process_request(request)
+ AuthenticationMiddleware().process_request(request)
+ login(request, user)
- login_form.find_by_name('email').fill(email)
- login_form.find_by_name('password').fill(password)
- login_form.find_by_name('submit').click()
+ # Save the session
+ request.session.save()
- # wait for the page to redraw
- assert world.browser.is_element_present_by_css('.content-wrapper', wait_time=10)
+ # Retrieve the sessionid and add it to the browser's cookies
+ cookie_dict = {settings.SESSION_COOKIE_NAME: request.session.session_key}
+ try:
+ world.browser.cookies.add(cookie_dict)
+
+ # WebDriver has an issue where we cannot set cookies
+ # before we make a GET request, so if we get an error,
+ # we load the '/' page and try again
+ except:
+ world.browser.visit(django_url('/'))
+ world.browser.cookies.add(cookie_dict)
@world.absorb
@@ -207,6 +221,7 @@ def save_the_course_content(path='/tmp'):
u = world.browser.url
section_url = u[u.find('courseware/') + 11:]
+
if not os.path.exists(path):
os.makedirs(path)
@@ -214,3 +229,15 @@ def save_the_course_content(path='/tmp'):
f = open('%s/%s' % (path, filename), 'w')
f.write(output)
f.close
+
+@world.absorb
+def css_click(css_selector):
+ try:
+ world.browser.find_by_css(css_selector).click()
+
+ except WebDriverException:
+ # Occassionally, MathJax or other JavaScript can cover up
+ # an element temporarily.
+ # If this happens, wait a second, then try again
+ time.sleep(1)
+ world.browser.find_by_css(css_selector).click()
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py
index 1bf4763723..f6fa98fc28 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo.py
@@ -8,7 +8,7 @@ from collections import namedtuple
from fs.osfs import OSFS
from itertools import repeat
from path import path
-from datetime import datetime, timedelta
+from datetime import datetime
from importlib import import_module
from xmodule.errortracker import null_error_tracker, exc_info_to_str
@@ -246,6 +246,7 @@ class MongoModuleStore(ModuleStoreBase):
self.fs_root = path(fs_root)
self.error_tracker = error_tracker
self.render_template = render_template
+ self.ignore_write_events_on_courses = []
def get_metadata_inheritance_tree(self, location):
'''
@@ -330,6 +331,11 @@ class MongoModuleStore(ModuleStoreBase):
return tree
+ def refresh_cached_metadata_inheritance_tree(self, location):
+ pseudo_course_id = '/'.join([location.org, location.course])
+ if pseudo_course_id not in self.ignore_write_events_on_courses:
+ self.get_cached_metadata_inheritance_tree(location, force_refresh = True)
+
def clear_cached_metadata_inheritance_tree(self, location):
key_name = '{0}/{1}'.format(location.org, location.course)
if self.metadata_inheritance_cache is not None:
@@ -376,7 +382,7 @@ class MongoModuleStore(ModuleStoreBase):
return data
- def _load_item(self, item, data_cache):
+ def _load_item(self, item, data_cache, should_apply_metadata_inheritence=True):
"""
Load an XModuleDescriptor from item, using the children stored in data_cache
"""
@@ -388,7 +394,10 @@ class MongoModuleStore(ModuleStoreBase):
resource_fs = OSFS(root)
- metadata_inheritance_tree = self.get_cached_metadata_inheritance_tree(Location(item['location']))
+ metadata_inheritance_tree = None
+
+ if should_apply_metadata_inheritence:
+ metadata_inheritance_tree = self.get_cached_metadata_inheritance_tree(Location(item['location']))
# TODO (cdodge): When the 'split module store' work has been completed, we should remove
# the 'metadata_inheritance_tree' parameter
@@ -410,7 +419,10 @@ class MongoModuleStore(ModuleStoreBase):
"""
data_cache = self._cache_children(items, depth)
- return [self._load_item(item, data_cache) for item in items]
+ # if we are loading a course object, if we're not prefetching children (depth != 0) then don't
+ # bother with the metadata inheritence
+ return [self._load_item(item, data_cache,
+ should_apply_metadata_inheritence=(item['location']['category'] != 'course' or depth != 0)) for item in items]
def get_courses(self):
'''
@@ -493,10 +505,12 @@ class MongoModuleStore(ModuleStoreBase):
try:
source_item = self.collection.find_one(location_to_query(source))
source_item['_id'] = Location(location).dict()
- self.collection.insert(source_item,
+ self.collection.insert(
+ source_item,
# Must include this to avoid the django debug toolbar (which defines the deprecated "safe=False")
# from overriding our default value set in the init method.
- safe=self.collection.safe)
+ safe=self.collection.safe
+ )
item = self._load_items([source_item])[0]
# VS[compat] cdodge: This is a hack because static_tabs also have references from the course module, so
@@ -518,7 +532,7 @@ class MongoModuleStore(ModuleStoreBase):
raise DuplicateItemError(location)
# recompute (and update) the metadata inheritance tree which is cached
- self.get_cached_metadata_inheritance_tree(Location(location), force_refresh = True)
+ self.refresh_cached_metadata_inheritance_tree(Location(location))
def get_course_for_item(self, location, depth=0):
'''
@@ -588,7 +602,7 @@ class MongoModuleStore(ModuleStoreBase):
self._update_single_item(location, {'definition.children': children})
# recompute (and update) the metadata inheritance tree which is cached
- self.get_cached_metadata_inheritance_tree(Location(location), force_refresh = True)
+ self.refresh_cached_metadata_inheritance_tree(Location(location))
def update_metadata(self, location, metadata):
"""
@@ -614,7 +628,7 @@ class MongoModuleStore(ModuleStoreBase):
self._update_single_item(location, {'metadata': metadata})
# recompute (and update) the metadata inheritance tree which is cached
- self.get_cached_metadata_inheritance_tree(loc, force_refresh = True)
+ self.refresh_cached_metadata_inheritance_tree(loc)
def delete_item(self, location):
"""
@@ -637,8 +651,7 @@ class MongoModuleStore(ModuleStoreBase):
# from overriding our default value set in the init method.
safe=self.collection.safe)
# recompute (and update) the metadata inheritance tree which is cached
- self.get_cached_metadata_inheritance_tree(Location(location), force_refresh = True)
-
+ self.refresh_cached_metadata_inheritance_tree(Location(location))
def get_parent_locations(self, location, course_id):
'''Find all locations that are the parents of this location in this
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/factories.py b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
index b842ffe9dd..1a82e1b708 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/factories.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
@@ -25,8 +25,7 @@ class XModuleCourseFactory(Factory):
@classmethod
def _create(cls, target_class, *args, **kwargs):
- # This logic was taken from the create_new_course method in
- # cms/djangoapps/contentstore/views.py
+
template = Location('i4x', 'edx', 'templates', 'course', 'Empty')
org = kwargs.get('org')
number = kwargs.get('number')
@@ -43,8 +42,7 @@ class XModuleCourseFactory(Factory):
if display_name is not None:
new_course.display_name = display_name
- new_course.start = gmtime()
-
+ new_course.lms.start = gmtime()
new_course.tabs = [{"type": "courseware"},
{"type": "course_info", "name": "Course Info"},
{"type": "discussion", "name": "Discussion"},
@@ -81,21 +79,41 @@ class XModuleItemFactory(Factory):
@classmethod
def _create(cls, target_class, *args, **kwargs):
"""
- kwargs must include parent_location, template. Can contain display_name
- target_class is ignored
+ Uses *kwargs*:
+
+ *parent_location* (required): the location of the parent module
+ (e.g. the parent course or section)
+
+ *template* (required): the template to create the item from
+ (e.g. i4x://templates/section/Empty)
+
+ *data* (optional): the data for the item
+ (e.g. XML problem definition for a problem item)
+
+ *display_name* (optional): the display name of the item
+
+ *metadata* (optional): dictionary of metadata attributes
+
+ *target_class* is ignored
"""
DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info']
parent_location = Location(kwargs.get('parent_location'))
template = Location(kwargs.get('template'))
+ data = kwargs.get('data')
display_name = kwargs.get('display_name')
+ metadata = kwargs.get('metadata', {})
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)
+
+ # If a display name is set, use that
+ dest_name = display_name.replace(" ", "_") if display_name is not None else uuid4().hex
+ dest_location = parent_location._replace(category=template.category,
+ name=dest_name)
new_item = store.clone_item(template, dest_location)
@@ -103,7 +121,14 @@ class XModuleItemFactory(Factory):
if display_name is not None:
new_item.display_name = display_name
- store.update_metadata(new_item.location.url(), own_metadata(new_item))
+ # Add additional metadata or override current metadata
+ item_metadata = own_metadata(new_item)
+ item_metadata.update(metadata)
+ store.update_metadata(new_item.location.url(), item_metadata)
+
+ # replace the data with the optional *data* parameter
+ if data is not None:
+ store.update_item(new_item.location, data)
if new_item.location.category not in DETACHED_CATEGORIES:
store.update_children(parent_location, parent.children + [new_item.location.url()])
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
index fa232596f2..6a4ce5131b 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
@@ -4,6 +4,8 @@ import mimetypes
from lxml.html import rewrite_links as lxml_rewrite_links
from path import path
+from xblock.core import Scope
+
from .xml import XMLModuleStore
from .exceptions import DuplicateItemError
from xmodule.modulestore import Location
@@ -201,100 +203,127 @@ def import_from_xml(store, data_dir, course_dirs=None,
course_items = []
for course_id in module_store.modules.keys():
- course_data_path = None
- course_location = None
+ if target_location_namespace is not None:
+ pseudo_course_id = '/'.join([target_location_namespace.org, target_location_namespace.course])
+ else:
+ course_id_components = course_id.split('/')
+ pseudo_course_id = '/'.join([course_id_components[0], course_id_components[1]])
- if verbose:
- log.debug("Scanning {0} for course module...".format(course_id))
+ try:
+ # turn off all write signalling while importing as this is a high volume operation
+ if pseudo_course_id not in store.ignore_write_events_on_courses:
+ store.ignore_write_events_on_courses.append(pseudo_course_id)
- # Quick scan to get course module as we need some info from there. Also we need to make sure that the
- # course module is committed first into the store
- for module in module_store.modules[course_id].itervalues():
- if module.category == 'course':
- course_data_path = path(data_dir) / module.data_dir
- course_location = module.location
-
- module = remap_namespace(module, target_location_namespace)
-
- # cdodge: more hacks (what else). Seems like we have a problem when importing a course (like 6.002) which
- # does not have any tabs defined in the policy file. The import goes fine and then displays fine in LMS,
- # but if someone tries to add a new tab in the CMS, then the LMS barfs because it expects that -
- # if there is *any* tabs - then there at least needs to be some predefined ones
- if module.tabs is None or len(module.tabs) == 0:
- module.tabs = [{"type": "courseware"},
- {"type": "course_info", "name": "Course Info"},
- {"type": "discussion", "name": "Discussion"},
- {"type": "wiki", "name": "Wiki"}] # note, add 'progress' when we can support it on Edge
-
-
- if hasattr(module, 'data'):
- store.update_item(module.location, module.data)
- store.update_children(module.location, module.children)
- store.update_metadata(module.location, dict(own_metadata(module)))
-
- # a bit of a hack, but typically the "course image" which is shown on marketing pages is hard coded to /images/course_image.jpg
- # so let's make sure we import in case there are no other references to it in the modules
- verify_content_links(module, course_data_path, static_content_store, '/static/images/course_image.jpg')
-
- course_items.append(module)
-
-
- # then import all the static content
- if static_content_store is not None:
- _namespace_rename = target_location_namespace if target_location_namespace is not None else course_location
-
- # first pass to find everything in /static/
- import_static_content(module_store.modules[course_id], course_location, course_data_path, static_content_store,
- _namespace_rename, subpath='static', verbose=verbose)
-
- # finally loop through all the modules
- for module in module_store.modules[course_id].itervalues():
-
- if module.category == 'course':
- # we've already saved the course module up at the top of the loop
- # so just skip over it in the inner loop
- continue
-
- # remap module to the new namespace
- if target_location_namespace is not None:
- module = remap_namespace(module, target_location_namespace)
+ course_data_path = None
+ course_location = None
if verbose:
- log.debug('importing module location {0}'.format(module.location))
+ log.debug("Scanning {0} for course module...".format(course_id))
- if hasattr(module, 'data'):
- module_data = module.data
+ # Quick scan to get course module as we need some info from there. Also we need to make sure that the
+ # course module is committed first into the store
+ for module in module_store.modules[course_id].itervalues():
+ if module.category == 'course':
+ course_data_path = path(data_dir) / module.data_dir
+ course_location = module.location
- # cdodge: now go through any link references to '/static/' and make sure we've imported
- # it as a StaticContent asset
- try:
- remap_dict = {}
+ module = remap_namespace(module, target_location_namespace)
- # use the rewrite_links as a utility means to enumerate through all links
- # in the module data. We use that to load that reference into our asset store
- # IMPORTANT: There appears to be a bug in lxml.rewrite_link which makes us not be able to
- # do the rewrites natively in that code.
- # For example, what I'm seeing is 
-> 
- # Note the dropped element closing tag. This causes the LMS to fail when rendering modules - that's
- # no good, so we have to do this kludge
- if isinstance(module_data, str) or isinstance(module_data, unicode): # some module 'data' fields are non strings which blows up the link traversal code
- lxml_rewrite_links(module_data, lambda link: verify_content_links(module, course_data_path,
- static_content_store, link, remap_dict))
+ # cdodge: more hacks (what else). Seems like we have a problem when importing a course (like 6.002) which
+ # does not have any tabs defined in the policy file. The import goes fine and then displays fine in LMS,
+ # but if someone tries to add a new tab in the CMS, then the LMS barfs because it expects that -
+ # if there is *any* tabs - then there at least needs to be some predefined ones
+ if module.tabs is None or len(module.tabs) == 0:
+ module.tabs = [{"type": "courseware"},
+ {"type": "course_info", "name": "Course Info"},
+ {"type": "discussion", "name": "Discussion"},
+ {"type": "wiki", "name": "Wiki"}] # note, add 'progress' when we can support it on Edge
- for key in remap_dict.keys():
- module_data = module_data.replace(key, remap_dict[key])
- except Exception, e:
- logging.exception("failed to rewrite links on {0}. Continuing...".format(module.location))
+ if hasattr(module, 'data'):
+ store.update_item(module.location, module.data)
+ store.update_children(module.location, module.children)
+ store.update_metadata(module.location, dict(own_metadata(module)))
- store.update_item(module.location, module_data)
+ # a bit of a hack, but typically the "course image" which is shown on marketing pages is hard coded to /images/course_image.jpg
+ # so let's make sure we import in case there are no other references to it in the modules
+ verify_content_links(module, course_data_path, static_content_store, '/static/images/course_image.jpg')
- if hasattr(module, 'children') and module.children != []:
- store.update_children(module.location, module.children)
+ course_items.append(module)
- # NOTE: It's important to use own_metadata here to avoid writing
- # inherited metadata everywhere.
- store.update_metadata(module.location, dict(own_metadata(module)))
+
+ # then import all the static content
+ if static_content_store is not None:
+ _namespace_rename = target_location_namespace if target_location_namespace is not None else course_location
+
+ # first pass to find everything in /static/
+ import_static_content(module_store.modules[course_id], course_location, course_data_path, static_content_store,
+ _namespace_rename, subpath='static', verbose=verbose)
+
+ # finally loop through all the modules
+ for module in module_store.modules[course_id].itervalues():
+
+ if module.category == 'course':
+ # we've already saved the course module up at the top of the loop
+ # so just skip over it in the inner loop
+ continue
+
+ # remap module to the new namespace
+ if target_location_namespace is not None:
+ module = remap_namespace(module, target_location_namespace)
+
+ if verbose:
+ log.debug('importing module location {0}'.format(module.location))
+
+ content = {}
+ for field in module.fields:
+ if field.scope != Scope.content:
+ continue
+ try:
+ content[field.name] = module._model_data[field.name]
+ except KeyError:
+ # Ignore any missing keys in _model_data
+ pass
+
+ if 'data' in content:
+ module_data = content['data']
+
+ # cdodge: now go through any link references to '/static/' and make sure we've imported
+ # it as a StaticContent asset
+ try:
+ remap_dict = {}
+
+ # use the rewrite_links as a utility means to enumerate through all links
+ # in the module data. We use that to load that reference into our asset store
+ # IMPORTANT: There appears to be a bug in lxml.rewrite_link which makes us not be able to
+ # do the rewrites natively in that code.
+ # For example, what I'm seeing is ->
+ # Note the dropped element closing tag. This causes the LMS to fail when rendering modules - that's
+ # no good, so we have to do this kludge
+ if isinstance(module_data, str) or isinstance(module_data, unicode): # some module 'data' fields are non strings which blows up the link traversal code
+ lxml_rewrite_links(module_data, lambda link: verify_content_links(module, course_data_path,
+ static_content_store, link, remap_dict))
+
+ for key in remap_dict.keys():
+ module_data = module_data.replace(key, remap_dict[key])
+
+ except Exception, e:
+ logging.exception("failed to rewrite links on {0}. Continuing...".format(module.location))
+
+ store.update_item(module.location, content)
+
+ if hasattr(module, 'children') and module.children != []:
+ store.update_children(module.location, module.children)
+
+ # NOTE: It's important to use own_metadata here to avoid writing
+ # inherited metadata everywhere.
+ store.update_metadata(module.location, dict(own_metadata(module)))
+ finally:
+ # turn back on all write signalling
+ if pseudo_course_id in store.ignore_write_events_on_courses:
+ store.ignore_write_events_on_courses.remove(pseudo_course_id)
+ store.refresh_cached_metadata_inheritance_tree(target_location_namespace if
+ target_location_namespace is not None else course_location)
return module_store, course_items
diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss
index 0c3eee602e..493555b879 100644
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -1,14 +1,16 @@
+// studio - utilities - mixins and extends
+// ====================
+
// font-sizing
@function em($pxval, $base: 16) {
@return #{$pxval / $base}em;
}
-@mixin font-size($sizeValue: 1.6){
+@mixin font-size($sizeValue: 16){
font-size: $sizeValue + px;
font-size: ($sizeValue/10) + rem;
}
-
// ====================
// line-height
@@ -77,25 +79,104 @@
}
}
-// utility
-@mixin clearfix {
- &:after {
- content: '';
+// ====================
+
+// extends - visual
+.faded-hr-divider {
+ @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
+ rgba(200,200,200, 1) 50%,
+ rgba(200,200,200, 0)));
+ height: 1px;
+ width: 100%;
+}
+
+.faded-hr-divider-medium {
+ @include background-image(linear-gradient(180deg, rgba(240,240,240, 0) 0%,
+ rgba(240,240,240, 1) 50%,
+ rgba(240,240,240, 0)));
+ height: 1px;
+ width: 100%;
+}
+
+.faded-hr-divider-light {
+ @include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%,
+ rgba(255,255,255, 0.8) 50%,
+ rgba(255,255,255, 0)));
+ height: 1px;
+ width: 100%;
+}
+
+.faded-vertical-divider {
+ @include background-image(linear-gradient(90deg, rgba(200,200,200, 0) 0%,
+ rgba(200,200,200, 1) 50%,
+ rgba(200,200,200, 0)));
+ height: 100%;
+ width: 1px;
+}
+
+.faded-vertical-divider-light {
+ @include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%,
+ rgba(255,255,255, 0.6) 50%,
+ rgba(255,255,255, 0)));
+ height: 100%;
+ width: 1px;
+}
+
+.vertical-divider {
+ @extend .faded-vertical-divider;
+ position: relative;
+
+ &::after {
+ @extend .faded-vertical-divider-light;
+ content: "";
display: block;
- height: 0;
- visibility: hidden;
- clear: both;
+ position: absolute;
+ left: 1px;
}
}
-// sunsetted mixins
-@mixin sr-text {
- border: 0;
- clip: rect(0 0 0 0);
- height: 1px;
- margin: -1px;
- overflow: hidden;
- padding: 0;
- position: absolute;
- width: 1px;
+.horizontal-divider {
+ border: none;
+ @extend .faded-hr-divider;
+ position: relative;
+
+ &::after {
+ @extend .faded-hr-divider-light;
+ content: "";
+ display: block;
+ position: absolute;
+ top: 1px;
+ }
+}
+
+.fade-right-hr-divider {
+ @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
+ rgba(200,200,200, 1)));
+ border: none;
+}
+
+.fade-left-hr-divider {
+ @include background-image(linear-gradient(180deg, rgba(200,200,200, 1) 0%,
+ rgba(200,200,200, 0)));
+ border: none;
+}
+
+// extends - ui
+.window {
+ @include clearfix();
+ @include border-radius(3px);
+ @include box-shadow(0 1px 1px $shadow-l1);
+ margin-bottom: $baseline;
+ border: 1px solid $gray-l2;
+ background: $white;
+}
+
+.elem-d1 {
+ @include clearfix();
+ @include box-sizing(border-box);
+}
+
+.elem-d2 {
+ @include clearfix();
+ @include box-sizing(border-box);
}
\ No newline at end of file
diff --git a/common/test/data/full/vertical/vertical_89.xml b/common/test/data/full/vertical/vertical_89.xml
index c2b68b6bc2..cf2dd23462 100644
--- a/common/test/data/full/vertical/vertical_89.xml
+++ b/common/test/data/full/vertical/vertical_89.xml
@@ -7,4 +7,9 @@
+ Yes
+ No
+
diff --git a/lms/djangoapps/courseware/features/common.py b/lms/djangoapps/courseware/features/common.py
index 8fb2843656..7d41637c8e 100644
--- a/lms/djangoapps/courseware/features/common.py
+++ b/lms/djangoapps/courseware/features/common.py
@@ -1,11 +1,8 @@
from lettuce import world, step
-from django.core.management import call_command
from nose.tools import assert_equals, assert_in
from lettuce.django import django_url
-from django.conf import settings
from django.contrib.auth.models import User
from student.models import CourseEnrollment
-from terrain.factories import CourseFactory, ItemFactory
from xmodule.modulestore import Location
from xmodule.modulestore.django import _MODULESTORES, modulestore
from xmodule.templates import update_templates
@@ -77,7 +74,8 @@ def should_see_in_the_page(step, text):
@step('I am logged in$')
def i_am_logged_in(step):
world.create_user('robot')
- world.log_in('robot@edx.org', 'test')
+ world.log_in('robot', 'test')
+ world.browser.visit(django_url('/'))
@step('I am not logged in$')
@@ -101,17 +99,17 @@ def create_course(step, course):
# Create the course
# We always use the same org and display name,
# but vary the course identifier (e.g. 600x or 191x)
- course = CourseFactory.create(org=TEST_COURSE_ORG,
- number=course,
- display_name=TEST_COURSE_NAME)
+ course = world.CourseFactory.create(org=TEST_COURSE_ORG,
+ number=course,
+ display_name=TEST_COURSE_NAME)
# Add a section to the course to contain problems
- section = ItemFactory.create(parent_location=course.location,
- display_name=TEST_SECTION_NAME)
+ section = world.ItemFactory.create(parent_location=course.location,
+ display_name=TEST_SECTION_NAME)
- problem_section = ItemFactory.create(parent_location=section.location,
- template='i4x://edx/templates/sequential/Empty',
- display_name=TEST_SECTION_NAME)
+ problem_section = world.ItemFactory.create(parent_location=section.location,
+ template='i4x://edx/templates/sequential/Empty',
+ display_name=TEST_SECTION_NAME)
@step(u'I am registered for the course "([^"]*)"$')
@@ -124,16 +122,17 @@ def i_am_registered_for_the_course(step, course):
u = User.objects.get(username='robot')
# If the user is not already enrolled, enroll the user.
+ # TODO: change to factory
CourseEnrollment.objects.get_or_create(user=u, course_id=course_id(course))
- world.log_in('robot@edx.org', 'test')
+ world.log_in('robot', 'test')
@step(u'The course "([^"]*)" has extra tab "([^"]*)"$')
def add_tab_to_course(step, course, extra_tab_name):
- section_item = ItemFactory.create(parent_location=course_location(course),
- template="i4x://edx/templates/static_tab/Empty",
- display_name=str(extra_tab_name))
+ section_item = world.ItemFactory.create(parent_location=course_location(course),
+ template="i4x://edx/templates/static_tab/Empty",
+ display_name=str(extra_tab_name))
@step(u'I am an edX user$')
@@ -161,7 +160,7 @@ def flush_xmodule_store():
def course_id(course_num):
return "%s/%s/%s" % (TEST_COURSE_ORG, course_num,
- TEST_COURSE_NAME.replace(" ", "_"))
+ TEST_COURSE_NAME.replace(" ", "_"))
def course_location(course_num):
diff --git a/lms/djangoapps/courseware/features/courses.py b/lms/djangoapps/courseware/features/courses.py
index 4fbbfd24f2..c99fb58b85 100644
--- a/lms/djangoapps/courseware/features/courses.py
+++ b/lms/djangoapps/courseware/features/courses.py
@@ -83,13 +83,13 @@ def get_courseware_with_tabs(course_id):
course = get_course_by_id(course_id)
chapters = [chapter for chapter in course.get_children() if not chapter.lms.hide_from_toc]
courseware = [{'chapter_name': c.display_name_with_default,
- 'sections': [{'section_name': s.display_name_with_default,
+ 'sections': [{'section_name': s.display_name_with_default,
'clickable_tab_count': len(s.get_children()) if (type(s) == seq_module.SequenceDescriptor) else 0,
'tabs': [{'children_count': len(t.get_children()) if (type(t) == vertical_module.VerticalDescriptor) else 0,
- 'class': t.__class__.__name__}
- for t in s.get_children()]}
+ 'class': t.__class__.__name__}
+ for t in s.get_children()]}
for s in c.get_children() if not s.lms.hide_from_toc]}
- for c in chapters]
+ for c in chapters]
return courseware
@@ -168,7 +168,6 @@ def process_section(element, num_tabs=0):
assert False, "Class for element not recognized!!"
-
def process_problem(element, problem_id):
'''
Process problem attempts to
diff --git a/lms/djangoapps/courseware/features/high-level-tabs.feature b/lms/djangoapps/courseware/features/high-level-tabs.feature
index 931281a455..473f3f1572 100644
--- a/lms/djangoapps/courseware/features/high-level-tabs.feature
+++ b/lms/djangoapps/courseware/features/high-level-tabs.feature
@@ -6,7 +6,7 @@ Feature: All the high level tabs should work
Scenario: I can navigate to all high -level tabs in a course
Given: I am registered for the course "6.002x"
And The course "6.002x" has extra tab "Custom Tab"
- And I log in
+ And I am logged in
And I click on View Courseware
When I click on the "" tab
Then the page title should contain ""
diff --git a/lms/djangoapps/courseware/features/problems.feature b/lms/djangoapps/courseware/features/problems.feature
index a7fbac49c7..efeb338c45 100644
--- a/lms/djangoapps/courseware/features/problems.feature
+++ b/lms/djangoapps/courseware/features/problems.feature
@@ -1,10 +1,11 @@
-Feature: Answer choice problems
+Feature: Answer problems
As a student in an edX course
In order to test my understanding of the material
- I want to answer choice based problems
+ I want to answer problems
Scenario: I can answer a problem correctly
- Given I am viewing a "" problem
+ Given External graders respond "correct"
+ And I am viewing a "" problem
When I answer a "" problem "correctly"
Then My "" answer is marked "correct"
@@ -17,9 +18,11 @@ Feature: Answer choice problems
| numerical |
| formula |
| script |
+ | code |
Scenario: I can answer a problem incorrectly
- Given I am viewing a "" problem
+ Given External graders respond "incorrect"
+ And I am viewing a "" problem
When I answer a "" problem "incorrectly"
Then My "" answer is marked "incorrect"
@@ -32,6 +35,7 @@ Feature: Answer choice problems
| numerical |
| formula |
| script |
+ | code |
Scenario: I can submit a blank answer
Given I am viewing a "" problem
diff --git a/lms/djangoapps/courseware/features/problems.py b/lms/djangoapps/courseware/features/problems.py
index a6575c3d22..6b2239c38b 100644
--- a/lms/djangoapps/courseware/features/problems.py
+++ b/lms/djangoapps/courseware/features/problems.py
@@ -1,14 +1,14 @@
from lettuce import world, step
from lettuce.django import django_url
-from selenium.webdriver.support.ui import Select
import random
import textwrap
+import time
from common import i_am_registered_for_the_course, TEST_SECTION_NAME, section_location
-from terrain.factories import ItemFactory
from capa.tests.response_xml_factory import OptionResponseXMLFactory, \
- ChoiceResponseXMLFactory, MultipleChoiceResponseXMLFactory, \
- StringResponseXMLFactory, NumericalResponseXMLFactory, \
- FormulaResponseXMLFactory, CustomResponseXMLFactory
+ ChoiceResponseXMLFactory, MultipleChoiceResponseXMLFactory, \
+ StringResponseXMLFactory, NumericalResponseXMLFactory, \
+ FormulaResponseXMLFactory, CustomResponseXMLFactory, \
+ CodeResponseXMLFactory
# Factories from capa.tests.response_xml_factory that we will use
# to generate the problem XML, with the keyword args used to configure
@@ -78,6 +78,12 @@ PROBLEM_FACTORY_DICT = {
a2=0
return (a1+a2)==int(expect)
""")}},
+ 'code': {
+ 'factory': CodeResponseXMLFactory(),
+ 'kwargs': {
+ 'question_text': 'Submit code to an external grader',
+ 'initial_display': 'print "Hello world!"',
+ 'grader_payload': '{"grader": "ps1/Spring2013/test_grader.py"}', }},
}
@@ -92,11 +98,11 @@ def add_problem_to_course(course, problem_type):
# Create a problem item using our generated XML
# We set rerandomize=always in the metadata so that the "Reset" button
# will appear.
- problem_item = ItemFactory.create(parent_location=section_location(course),
- template="i4x://edx/templates/problem/Blank_Common_Problem",
- display_name=str(problem_type),
- data=problem_xml,
- metadata={'rerandomize': 'always'})
+ problem_item = world.ItemFactory.create(parent_location=section_location(course),
+ template="i4x://edx/templates/problem/Blank_Common_Problem",
+ display_name=str(problem_type),
+ data=problem_xml,
+ metadata={'rerandomize': 'always'})
@step(u'I am viewing a "([^"]*)" problem')
@@ -116,6 +122,19 @@ def view_problem(step, problem_type):
world.browser.visit(url)
+@step(u'External graders respond "([^"]*)"')
+def set_external_grader_response(step, correctness):
+ assert(correctness in ['correct', 'incorrect'])
+
+ response_dict = {'correct': True if correctness == 'correct' else False,
+ 'score': 1 if correctness == 'correct' else 0,
+ 'msg': 'Your problem was graded %s' % correctness}
+
+ # Set the fake xqueue server to always respond
+ # correct/incorrect when asked to grade a problem
+ world.xqueue_server.set_grade_response(response_dict)
+
+
@step(u'I answer a "([^"]*)" problem "([^"]*)ly"')
def answer_problem(step, problem_type, correctness):
""" Mark a given problem type correct or incorrect, then submit it.
@@ -169,18 +188,66 @@ def answer_problem(step, problem_type, correctness):
inputfield('script', input_num=1).fill(str(first_addend))
inputfield('script', input_num=2).fill(str(second_addend))
+ elif problem_type == 'code':
+ # The fake xqueue server is configured to respond
+ # correct / incorrect no matter what we submit.
+ # Furthermore, since the inline code response uses
+ # JavaScript to make the code display nicely, it's difficult
+ # to programatically input text
+ # (there's not
->
- # Note the dropped element closing tag. This causes the LMS to fail when rendering modules - that's
- # no good, so we have to do this kludge
- if isinstance(module_data, str) or isinstance(module_data, unicode): # some module 'data' fields are non strings which blows up the link traversal code
- lxml_rewrite_links(module_data, lambda link: verify_content_links(module, course_data_path,
- static_content_store, link, remap_dict))
+ # cdodge: more hacks (what else). Seems like we have a problem when importing a course (like 6.002) which
+ # does not have any tabs defined in the policy file. The import goes fine and then displays fine in LMS,
+ # but if someone tries to add a new tab in the CMS, then the LMS barfs because it expects that -
+ # if there is *any* tabs - then there at least needs to be some predefined ones
+ if module.tabs is None or len(module.tabs) == 0:
+ module.tabs = [{"type": "courseware"},
+ {"type": "course_info", "name": "Course Info"},
+ {"type": "discussion", "name": "Discussion"},
+ {"type": "wiki", "name": "Wiki"}] # note, add 'progress' when we can support it on Edge
- for key in remap_dict.keys():
- module_data = module_data.replace(key, remap_dict[key])
- except Exception, e:
- logging.exception("failed to rewrite links on {0}. Continuing...".format(module.location))
+ if hasattr(module, 'data'):
+ store.update_item(module.location, module.data)
+ store.update_children(module.location, module.children)
+ store.update_metadata(module.location, dict(own_metadata(module)))
- store.update_item(module.location, module_data)
+ # a bit of a hack, but typically the "course image" which is shown on marketing pages is hard coded to /images/course_image.jpg
+ # so let's make sure we import in case there are no other references to it in the modules
+ verify_content_links(module, course_data_path, static_content_store, '/static/images/course_image.jpg')
- if hasattr(module, 'children') and module.children != []:
- store.update_children(module.location, module.children)
+ course_items.append(module)
- # NOTE: It's important to use own_metadata here to avoid writing
- # inherited metadata everywhere.
- store.update_metadata(module.location, dict(own_metadata(module)))
+
+ # then import all the static content
+ if static_content_store is not None:
+ _namespace_rename = target_location_namespace if target_location_namespace is not None else course_location
+
+ # first pass to find everything in /static/
+ import_static_content(module_store.modules[course_id], course_location, course_data_path, static_content_store,
+ _namespace_rename, subpath='static', verbose=verbose)
+
+ # finally loop through all the modules
+ for module in module_store.modules[course_id].itervalues():
+
+ if module.category == 'course':
+ # we've already saved the course module up at the top of the loop
+ # so just skip over it in the inner loop
+ continue
+
+ # remap module to the new namespace
+ if target_location_namespace is not None:
+ module = remap_namespace(module, target_location_namespace)
+
+ if verbose:
+ log.debug('importing module location {0}'.format(module.location))
+
+ content = {}
+ for field in module.fields:
+ if field.scope != Scope.content:
+ continue
+ try:
+ content[field.name] = module._model_data[field.name]
+ except KeyError:
+ # Ignore any missing keys in _model_data
+ pass
+
+ if 'data' in content:
+ module_data = content['data']
+
+ # cdodge: now go through any link references to '/static/' and make sure we've imported
+ # it as a StaticContent asset
+ try:
+ remap_dict = {}
+
+ # use the rewrite_links as a utility means to enumerate through all links
+ # in the module data. We use that to load that reference into our asset store
+ # IMPORTANT: There appears to be a bug in lxml.rewrite_link which makes us not be able to
+ # do the rewrites natively in that code.
+ # For example, what I'm seeing is ->
+ # Note the dropped element closing tag. This causes the LMS to fail when rendering modules - that's
+ # no good, so we have to do this kludge
+ if isinstance(module_data, str) or isinstance(module_data, unicode): # some module 'data' fields are non strings which blows up the link traversal code
+ lxml_rewrite_links(module_data, lambda link: verify_content_links(module, course_data_path,
+ static_content_store, link, remap_dict))
+
+ for key in remap_dict.keys():
+ module_data = module_data.replace(key, remap_dict[key])
+
+ except Exception, e:
+ logging.exception("failed to rewrite links on {0}. Continuing...".format(module.location))
+
+ store.update_item(module.location, content)
+
+ if hasattr(module, 'children') and module.children != []:
+ store.update_children(module.location, module.children)
+
+ # NOTE: It's important to use own_metadata here to avoid writing
+ # inherited metadata everywhere.
+ store.update_metadata(module.location, dict(own_metadata(module)))
+ finally:
+ # turn back on all write signalling
+ if pseudo_course_id in store.ignore_write_events_on_courses:
+ store.ignore_write_events_on_courses.remove(pseudo_course_id)
+ store.refresh_cached_metadata_inheritance_tree(target_location_namespace if
+ target_location_namespace is not None else course_location)
return module_store, course_items
diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss
index 0c3eee602e..493555b879 100644
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -1,14 +1,16 @@
+// studio - utilities - mixins and extends
+// ====================
+
// font-sizing
@function em($pxval, $base: 16) {
@return #{$pxval / $base}em;
}
-@mixin font-size($sizeValue: 1.6){
+@mixin font-size($sizeValue: 16){
font-size: $sizeValue + px;
font-size: ($sizeValue/10) + rem;
}
-
// ====================
// line-height
@@ -77,25 +79,104 @@
}
}
-// utility
-@mixin clearfix {
- &:after {
- content: '';
+// ====================
+
+// extends - visual
+.faded-hr-divider {
+ @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
+ rgba(200,200,200, 1) 50%,
+ rgba(200,200,200, 0)));
+ height: 1px;
+ width: 100%;
+}
+
+.faded-hr-divider-medium {
+ @include background-image(linear-gradient(180deg, rgba(240,240,240, 0) 0%,
+ rgba(240,240,240, 1) 50%,
+ rgba(240,240,240, 0)));
+ height: 1px;
+ width: 100%;
+}
+
+.faded-hr-divider-light {
+ @include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%,
+ rgba(255,255,255, 0.8) 50%,
+ rgba(255,255,255, 0)));
+ height: 1px;
+ width: 100%;
+}
+
+.faded-vertical-divider {
+ @include background-image(linear-gradient(90deg, rgba(200,200,200, 0) 0%,
+ rgba(200,200,200, 1) 50%,
+ rgba(200,200,200, 0)));
+ height: 100%;
+ width: 1px;
+}
+
+.faded-vertical-divider-light {
+ @include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%,
+ rgba(255,255,255, 0.6) 50%,
+ rgba(255,255,255, 0)));
+ height: 100%;
+ width: 1px;
+}
+
+.vertical-divider {
+ @extend .faded-vertical-divider;
+ position: relative;
+
+ &::after {
+ @extend .faded-vertical-divider-light;
+ content: "";
display: block;
- height: 0;
- visibility: hidden;
- clear: both;
+ position: absolute;
+ left: 1px;
}
}
-// sunsetted mixins
-@mixin sr-text {
- border: 0;
- clip: rect(0 0 0 0);
- height: 1px;
- margin: -1px;
- overflow: hidden;
- padding: 0;
- position: absolute;
- width: 1px;
+.horizontal-divider {
+ border: none;
+ @extend .faded-hr-divider;
+ position: relative;
+
+ &::after {
+ @extend .faded-hr-divider-light;
+ content: "";
+ display: block;
+ position: absolute;
+ top: 1px;
+ }
+}
+
+.fade-right-hr-divider {
+ @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
+ rgba(200,200,200, 1)));
+ border: none;
+}
+
+.fade-left-hr-divider {
+ @include background-image(linear-gradient(180deg, rgba(200,200,200, 1) 0%,
+ rgba(200,200,200, 0)));
+ border: none;
+}
+
+// extends - ui
+.window {
+ @include clearfix();
+ @include border-radius(3px);
+ @include box-shadow(0 1px 1px $shadow-l1);
+ margin-bottom: $baseline;
+ border: 1px solid $gray-l2;
+ background: $white;
+}
+
+.elem-d1 {
+ @include clearfix();
+ @include box-sizing(border-box);
+}
+
+.elem-d2 {
+ @include clearfix();
+ @include box-sizing(border-box);
}
\ No newline at end of file
diff --git a/common/test/data/full/vertical/vertical_89.xml b/common/test/data/full/vertical/vertical_89.xml
index c2b68b6bc2..cf2dd23462 100644
--- a/common/test/data/full/vertical/vertical_89.xml
+++ b/common/test/data/full/vertical/vertical_89.xml
@@ -7,4 +7,9 @@
Have you changed your mind?
+