Skip to content

E
edx-platform
Commit 25ceea17 by Jay Zoldak
Options

Merge pull request #1710 from MITx/feature/will/speed_up_lettuce_tests 

Feature/will/speed up lettuce tests
parents dec9aea0 6728f16a
Showing with 300 additions and 361 deletions
cms/djangoapps/contentstore/features/common.py
...@@ -7,8 +7,6 @@ from selenium.common.exceptions import WebDriverException, StaleElementReference ...@@ -7,8 +7,6 @@ from selenium.common.exceptions import WebDriverException, StaleElementReference
from selenium.webdriver.support import expected_conditions as EC from selenium.webdriver.support import expected_conditions as EC
from selenium.webdriver.common.by import By from selenium.webdriver.common.by import By
from terrain.factories import UserFactory, RegistrationFactory, UserProfileFactory
from terrain.factories import CourseFactory, GroupFactory
from xmodule.modulestore.django import _MODULESTORES, modulestore from xmodule.modulestore.django import _MODULESTORES, modulestore
from xmodule.templates import update_templates from xmodule.templates import update_templates
from auth.authz import get_user_by_email from auth.authz import get_user_by_email
...@@ -61,7 +59,7 @@ def create_studio_user( ...@@ -61,7 +59,7 @@ def create_studio_user(
email='robot+studio@edx.org', email='robot+studio@edx.org',
password='test', password='test',
is_staff=False): is_staff=False):
studio_user = UserFactory.build( studio_user = world.UserFactory.build(
username=uname, username=uname,
email=email, email=email,
password=password, password=password,
...@@ -69,11 +67,11 @@ def create_studio_user( ...@@ -69,11 +67,11 @@ def create_studio_user(
studio_user.set_password(password) studio_user.set_password(password)
studio_user.save() studio_user.save()
registration = RegistrationFactory(user=studio_user) registration = world.RegistrationFactory(user=studio_user)
registration.register(studio_user) registration.register(studio_user)
registration.activate() registration.activate()
user_profile = UserProfileFactory(user=studio_user) user_profile = world.UserProfileFactory(user=studio_user)
def flush_xmodule_store(): def flush_xmodule_store():
...@@ -175,11 +173,11 @@ def log_into_studio( ...@@ -175,11 +173,11 @@ def log_into_studio(
def create_a_course(): def create_a_course():
c = CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') c = world.CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
# Add the user to the instructor group of the course # Add the user to the instructor group of the course
# so they will have the permissions to see it in studio # so they will have the permissions to see it in studio
g = GroupFactory.create(name='instructor_MITx/999/Robot_Super_Course') g = world.GroupFactory.create(name='instructor_MITx/999/Robot_Super_Course')
u = get_user_by_email('robot+studio@edx.org') u = get_user_by_email('robot+studio@edx.org')
u.groups.add(g) u.groups.add(g)
u.save() u.save()
......
cms/djangoapps/contentstore/features/factories.py deleted 100644 → 0
import factory
from student.models import User, UserProfile, Registration
from datetime import datetime
import uuid
class UserProfileFactory(factory.Factory):
FACTORY_FOR = UserProfile
user = None
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
username = 'robot-studio'
email = 'robot+studio@edx.org'
password = 'test'
first_name = 'Robot'
last_name = 'Studio'
is_staff = False
is_active = True
is_superuser = False
last_login = datetime.now()
date_joined = datetime.now()
cms/djangoapps/contentstore/features/studio-overview-togglesection.py
from lettuce import world, step from lettuce import world, step
from terrain.factories import *
from common import * from common import *
from nose.tools import assert_true, assert_false, assert_equal from nose.tools import assert_true, assert_false, assert_equal
...@@ -10,15 +9,15 @@ logger = getLogger(__name__) ...@@ -10,15 +9,15 @@ logger = getLogger(__name__)
@step(u'I have a course with no sections$') @step(u'I have a course with no sections$')
def have_a_course(step): def have_a_course(step):
clear_courses() clear_courses()
course = CourseFactory.create() course = world.CourseFactory.create()
@step(u'I have a course with 1 section$') @step(u'I have a course with 1 section$')
def have_a_course_with_1_section(step): def have_a_course_with_1_section(step):
clear_courses() clear_courses()
course = CourseFactory.create() course = world.CourseFactory.create()
section = ItemFactory.create(parent_location=course.location) section = world.ItemFactory.create(parent_location=course.location)
subsection1 = ItemFactory.create( subsection1 = world.ItemFactory.create(
parent_location=section.location, parent_location=section.location,
template='i4x://edx/templates/sequential/Empty', template='i4x://edx/templates/sequential/Empty',
display_name='Subsection One',) display_name='Subsection One',)
...@@ -27,20 +26,20 @@ def have_a_course_with_1_section(step): ...@@ -27,20 +26,20 @@ def have_a_course_with_1_section(step):
@step(u'I have a course with multiple sections$') @step(u'I have a course with multiple sections$')
def have_a_course_with_two_sections(step): def have_a_course_with_two_sections(step):
clear_courses() clear_courses()
course = CourseFactory.create() course = world.CourseFactory.create()
section = ItemFactory.create(parent_location=course.location) section = world.ItemFactory.create(parent_location=course.location)
subsection1 = ItemFactory.create( subsection1 = world.ItemFactory.create(
parent_location=section.location, parent_location=section.location,
template='i4x://edx/templates/sequential/Empty', template='i4x://edx/templates/sequential/Empty',
display_name='Subsection One',) display_name='Subsection One',)
section2 = ItemFactory.create( section2 = world.ItemFactory.create(
parent_location=course.location, parent_location=course.location,
display_name='Section Two',) display_name='Section Two',)
subsection2 = ItemFactory.create( subsection2 = world.ItemFactory.create(
parent_location=section2.location, parent_location=section2.location,
template='i4x://edx/templates/sequential/Empty', template='i4x://edx/templates/sequential/Empty',
display_name='Subsection Alpha',) display_name='Subsection Alpha',)
subsection3 = ItemFactory.create( subsection3 = world.ItemFactory.create(
parent_location=section2.location, parent_location=section2.location,
template='i4x://edx/templates/sequential/Empty', template='i4x://edx/templates/sequential/Empty',
display_name='Subsection Beta',) display_name='Subsection Beta',)
......
common/djangoapps/student/tests/factories.py 0 → 100644
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'
common/djangoapps/student/tests.py → common/djangoapps/student/tests/tests.py
...@@ -9,8 +9,8 @@ import logging ...@@ -9,8 +9,8 @@ import logging
from django.test import TestCase from django.test import TestCase
from mock import Mock from mock import Mock
from .models import unique_id_for_user from student.models import unique_id_for_user
from .views import process_survey_link, _cert_info from student.views import process_survey_link, _cert_info
COURSE_1 = 'edX/toy/2012_Fall' COURSE_1 = 'edX/toy/2012_Fall'
COURSE_2 = 'edx/full/6.002_Spring_2012' COURSE_2 = 'edx/full/6.002_Spring_2012'
......
common/djangoapps/terrain/browser.py
from lettuce import before, after, world from lettuce import before, after, world
from splinter.browser import Browser from splinter.browser import Browser
from logging import getLogger from logging import getLogger
import time
# Let the LMS and CMS do their one-time setup # Let the LMS and CMS do their one-time setup
# For example, setting up mongo caches # For example, setting up mongo caches
...@@ -16,6 +15,9 @@ from django.core.management import call_command ...@@ -16,6 +15,9 @@ from django.core.management import call_command
@before.harvest @before.harvest
def initial_setup(server): def initial_setup(server):
'''
Launch the browser once before executing the tests
'''
# Launch the browser app (choose one of these below) # Launch the browser app (choose one of these below)
world.browser = Browser('chrome') world.browser = Browser('chrome')
# world.browser = Browser('phantomjs') # world.browser = Browser('phantomjs')
...@@ -24,14 +26,18 @@ def initial_setup(server): ...@@ -24,14 +26,18 @@ def initial_setup(server):
@before.each_scenario @before.each_scenario
def reset_data(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...") logger.debug("Flushing the test database...")
call_command('flush', interactive=False) call_command('flush', interactive=False)
@after.all @after.all
def teardown_browser(total): def teardown_browser(total):
# Quit firefox '''
Quit the browser after executing the tests
'''
world.browser.quit() world.browser.quit()
pass pass
common/djangoapps/terrain/factories.py
from student.models import User, UserProfile, Registration '''
from django.contrib.auth.models import Group Factories are defined in other modules and absorbed here into the
from datetime import datetime lettuce world so that they can be used by both unit tests
from factory import Factory and integration / BDD tests.
from xmodule.modulestore import Location '''
from xmodule.modulestore.django import modulestore import student.tests.factories as sf
from time import gmtime import xmodule.modulestore.tests.factories as xf
from uuid import uuid4 from lettuce import world
from xmodule.timeparse import stringify_time
from xmodule.modulestore.inheritance import own_metadata
@world.absorb
class UserFactory(sf.UserFactory):
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):
""" """
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 pass
class CourseFactory(XModuleCourseFactory): @world.absorb
FACTORY_FOR = Course class UserProfileFactory(sf.UserProfileFactory):
template = 'i4x://edx/templates/course/Empty'
org = 'MITx'
number = '999'
display_name = 'Robot Super Course'
class XModuleItemFactory(Factory):
""" """
Factory for XModule items. Demographics etc for the User
""" """
pass
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 @world.absorb
if display_name is not None: class RegistrationFactory(sf.RegistrationFactory):
new_item.display_name = display_name """
Activation key for registering the user account
"""
pass
# 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 @world.absorb
if data is not None: class GroupFactory(sf.GroupFactory):
store.update_item(new_item.location, data) """
Groups for user permissions for courses
"""
pass
if new_item.location.category not in DETACHED_CATEGORIES:
store.update_children(parent_location, parent.children + [new_item.location.url()])
return new_item @world.absorb
class CourseEnrollmentAllowedFactory(sf.CourseEnrollmentAllowed):
"""
Users allowed to enroll in the course outside of the usual window
"""
pass
class Item: @world.absorb
class CourseFactory(xf.CourseFactory):
"""
Courseware courses
"""
pass pass
class ItemFactory(XModuleItemFactory): @world.absorb
FACTORY_FOR = Item class ItemFactory(xf.ItemFactory):
"""
parent_location = 'i4x://MITx/999/course/Robot_Super_Course' Everything included inside a course
template = 'i4x://edx/templates/chapter/Empty' """
display_name = 'Section One' pass
common/djangoapps/terrain/steps.py
from lettuce import world, step from lettuce import world, step
from .factories import * from .factories import *
from lettuce.django import django_url 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.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 student.models import CourseEnrollment
from urllib import quote_plus from urllib import quote_plus
from nose.tools import assert_equals from nose.tools import assert_equals
...@@ -78,7 +83,7 @@ def the_page_title_should_contain(step, title): ...@@ -78,7 +83,7 @@ def the_page_title_should_contain(step, title):
@step('I am a logged in user$') @step('I am a logged in user$')
def i_am_logged_in_user(step): def i_am_logged_in_user(step):
create_user('robot') create_user('robot')
log_in('robot@edx.org', 'test') log_in('robot', 'test')
@step('I am not logged in$') @step('I am not logged in$')
...@@ -93,7 +98,7 @@ def i_am_staff_for_course_by_id(step, course_id): ...@@ -93,7 +98,7 @@ def i_am_staff_for_course_by_id(step, course_id):
@step('I log in$') @step('I log in$')
def i_log_in(step): def i_log_in(step):
log_in('robot@edx.org', 'test') log_in('robot', 'test')
@step(u'I am an edX user$') @step(u'I am an edX user$')
...@@ -120,38 +125,46 @@ def create_user(uname): ...@@ -120,38 +125,46 @@ def create_user(uname):
portal_user.set_password('test') portal_user.set_password('test')
portal_user.save() portal_user.save()
registration = RegistrationFactory(user=portal_user) registration = world.RegistrationFactory(user=portal_user)
registration.register(portal_user) registration.register(portal_user)
registration.activate() registration.activate()
user_profile = UserProfileFactory(user=portal_user) user_profile = world.UserProfileFactory(user=portal_user)
@world.absorb @world.absorb
def log_in(email, password): def log_in(username, password):
world.browser.cookies.delete() '''
world.browser.visit(django_url('/')) Log the user in programatically
world.browser.is_element_present_by_css('header.global', 10) '''
world.browser.click_link_by_href('#login-modal')
# Authenticate the user
# Wait for the login dialog to load user = authenticate(username=username, password=password)
# This is complicated by the fact that sometimes a second #login_form assert(user is not None and user.is_active)
# dialog loads, while the first one remains hidden.
# We give them both time to load, starting with the second one. # Send a fake HttpRequest to log the user in
world.browser.is_element_present_by_css('section.content-wrapper form#login_form', wait_time=4) # We need to process the request using
world.browser.is_element_present_by_css('form#login_form', wait_time=2) # Session middleware and Authentication middleware
# to ensure that session state can be stored
# For some reason, the page sometimes includes two #login_form request = HttpRequest()
# elements, the first of which is not visible. SessionMiddleware().process_request(request)
# To avoid this, we always select the last of the two #login_form dialogs AuthenticationMiddleware().process_request(request)
login_form = world.browser.find_by_css('form#login_form').last login(request, user)
login_form.find_by_name('email').fill(email) # Save the session
login_form.find_by_name('password').fill(password) request.session.save()
login_form.find_by_name('submit').click()
# 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)
# wait for the page to redraw # WebDriver has an issue where we cannot set cookies
assert world.browser.is_element_present_by_css('.content-wrapper', wait_time=10) # 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 @world.absorb
...@@ -208,6 +221,7 @@ def save_the_course_content(path='/tmp'): ...@@ -208,6 +221,7 @@ def save_the_course_content(path='/tmp'):
u = world.browser.url u = world.browser.url
section_url = u[u.find('courseware/') + 11:] section_url = u[u.find('courseware/') + 11:]
if not os.path.exists(path): if not os.path.exists(path):
os.makedirs(path) os.makedirs(path)
......
common/lib/xmodule/xmodule/modulestore/tests/factories.py
...@@ -25,8 +25,7 @@ class XModuleCourseFactory(Factory): ...@@ -25,8 +25,7 @@ class XModuleCourseFactory(Factory):
@classmethod @classmethod
def _create(cls, target_class, *args, **kwargs): 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') template = Location('i4x', 'edx', 'templates', 'course', 'Empty')
org = kwargs.get('org') org = kwargs.get('org')
number = kwargs.get('number') number = kwargs.get('number')
...@@ -43,8 +42,7 @@ class XModuleCourseFactory(Factory): ...@@ -43,8 +42,7 @@ class XModuleCourseFactory(Factory):
if display_name is not None: if display_name is not None:
new_course.display_name = display_name new_course.display_name = display_name
new_course.start = gmtime() new_course.lms.start = gmtime()
new_course.tabs = [{"type": "courseware"}, new_course.tabs = [{"type": "courseware"},
{"type": "course_info", "name": "Course Info"}, {"type": "course_info", "name": "Course Info"},
{"type": "discussion", "name": "Discussion"}, {"type": "discussion", "name": "Discussion"},
...@@ -81,21 +79,41 @@ class XModuleItemFactory(Factory): ...@@ -81,21 +79,41 @@ class XModuleItemFactory(Factory):
@classmethod @classmethod
def _create(cls, target_class, *args, **kwargs): def _create(cls, target_class, *args, **kwargs):
""" """
kwargs must include parent_location, template. Can contain display_name Uses *kwargs*:
target_class is ignored
*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'] DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info']
parent_location = Location(kwargs.get('parent_location')) parent_location = Location(kwargs.get('parent_location'))
template = Location(kwargs.get('template')) template = Location(kwargs.get('template'))
data = kwargs.get('data')
display_name = kwargs.get('display_name') display_name = kwargs.get('display_name')
metadata = kwargs.get('metadata', {})
store = modulestore('direct') store = modulestore('direct')
# This code was based off that in cms/djangoapps/contentstore/views.py # This code was based off that in cms/djangoapps/contentstore/views.py
parent = store.get_item(parent_location) 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) new_item = store.clone_item(template, dest_location)
...@@ -103,7 +121,14 @@ class XModuleItemFactory(Factory): ...@@ -103,7 +121,14 @@ class XModuleItemFactory(Factory):
if display_name is not None: if display_name is not None:
new_item.display_name = display_name 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: if new_item.location.category not in DETACHED_CATEGORIES:
store.update_children(parent_location, parent.children + [new_item.location.url()]) store.update_children(parent_location, parent.children + [new_item.location.url()])
......
lms/djangoapps/courseware/features/common.py
from lettuce import world, step from lettuce import world, step
from django.core.management import call_command
from nose.tools import assert_equals, assert_in from nose.tools import assert_equals, assert_in
from lettuce.django import django_url from lettuce.django import django_url
from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from student.models import CourseEnrollment from student.models import CourseEnrollment
from terrain.factories import CourseFactory, ItemFactory
from xmodule.modulestore import Location from xmodule.modulestore import Location
from xmodule.modulestore.django import _MODULESTORES, modulestore from xmodule.modulestore.django import _MODULESTORES, modulestore
from xmodule.templates import update_templates from xmodule.templates import update_templates
...@@ -77,7 +74,8 @@ def should_see_in_the_page(step, text): ...@@ -77,7 +74,8 @@ def should_see_in_the_page(step, text):
@step('I am logged in$') @step('I am logged in$')
def i_am_logged_in(step): def i_am_logged_in(step):
world.create_user('robot') 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$') @step('I am not logged in$')
...@@ -101,17 +99,17 @@ def create_course(step, course): ...@@ -101,17 +99,17 @@ def create_course(step, course):
# Create the course # Create the course
# We always use the same org and display name, # We always use the same org and display name,
# but vary the course identifier (e.g. 600x or 191x) # but vary the course identifier (e.g. 600x or 191x)
course = CourseFactory.create(org=TEST_COURSE_ORG, course = world.CourseFactory.create(org=TEST_COURSE_ORG,
number=course, number=course,
display_name=TEST_COURSE_NAME) display_name=TEST_COURSE_NAME)
# Add a section to the course to contain problems # Add a section to the course to contain problems
section = ItemFactory.create(parent_location=course.location, section = world.ItemFactory.create(parent_location=course.location,
display_name=TEST_SECTION_NAME) display_name=TEST_SECTION_NAME)
problem_section = ItemFactory.create(parent_location=section.location, problem_section = world.ItemFactory.create(parent_location=section.location,
template='i4x://edx/templates/sequential/Empty', template='i4x://edx/templates/sequential/Empty',
display_name=TEST_SECTION_NAME) display_name=TEST_SECTION_NAME)
@step(u'I am registered for the course "([^"]*)"$') @step(u'I am registered for the course "([^"]*)"$')
...@@ -124,16 +122,17 @@ def i_am_registered_for_the_course(step, course): ...@@ -124,16 +122,17 @@ def i_am_registered_for_the_course(step, course):
u = User.objects.get(username='robot') u = User.objects.get(username='robot')
# If the user is not already enrolled, enroll the user. # 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)) 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 "([^"]*)"$') @step(u'The course "([^"]*)" has extra tab "([^"]*)"$')
def add_tab_to_course(step, course, extra_tab_name): def add_tab_to_course(step, course, extra_tab_name):
section_item = ItemFactory.create(parent_location=course_location(course), section_item = world.ItemFactory.create(parent_location=course_location(course),
template="i4x://edx/templates/static_tab/Empty", template="i4x://edx/templates/static_tab/Empty",
display_name=str(extra_tab_name)) display_name=str(extra_tab_name))
@step(u'I am an edX user$') @step(u'I am an edX user$')
...@@ -161,7 +160,7 @@ def flush_xmodule_store(): ...@@ -161,7 +160,7 @@ def flush_xmodule_store():
def course_id(course_num): def course_id(course_num):
return "%s/%s/%s" % (TEST_COURSE_ORG, course_num, return "%s/%s/%s" % (TEST_COURSE_ORG, course_num,
TEST_COURSE_NAME.replace(" ", "_")) TEST_COURSE_NAME.replace(" ", "_"))
def course_location(course_num): def course_location(course_num):
......
lms/djangoapps/courseware/features/courses.py
...@@ -83,13 +83,13 @@ def get_courseware_with_tabs(course_id): ...@@ -83,13 +83,13 @@ def get_courseware_with_tabs(course_id):
course = get_course_by_id(course_id) course = get_course_by_id(course_id)
chapters = [chapter for chapter in course.get_children() if not chapter.lms.hide_from_toc] chapters = [chapter for chapter in course.get_children() if not chapter.lms.hide_from_toc]
courseware = [{'chapter_name': c.display_name_with_default, 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, '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, 'tabs': [{'children_count': len(t.get_children()) if (type(t) == vertical_module.VerticalDescriptor) else 0,
'class': t.__class__.__name__} 'class': t.__class__.__name__}
for t in s.get_children()]} for t in s.get_children()]}
for s in c.get_children() if not s.lms.hide_from_toc]} for s in c.get_children() if not s.lms.hide_from_toc]}
for c in chapters] for c in chapters]
return courseware return courseware
...@@ -168,7 +168,6 @@ def process_section(element, num_tabs=0): ...@@ -168,7 +168,6 @@ def process_section(element, num_tabs=0):
assert False, "Class for element not recognized!!" assert False, "Class for element not recognized!!"
def process_problem(element, problem_id): def process_problem(element, problem_id):
''' '''
Process problem attempts to Process problem attempts to
......
lms/djangoapps/courseware/features/high-level-tabs.feature
...@@ -6,7 +6,7 @@ Feature: All the high level tabs should work ...@@ -6,7 +6,7 @@ Feature: All the high level tabs should work
Scenario: I can navigate to all high -level tabs in a course Scenario: I can navigate to all high -level tabs in a course
Given: I am registered for the course "6.002x" Given: I am registered for the course "6.002x"
And The course "6.002x" has extra tab "Custom Tab" 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 And I click on View Courseware
When I click on the "<TabName>" tab When I click on the "<TabName>" tab
Then the page title should contain "<PageTitle>" Then the page title should contain "<PageTitle>"
......
lms/djangoapps/courseware/features/problems.py
...@@ -4,12 +4,11 @@ import random ...@@ -4,12 +4,11 @@ import random
import textwrap import textwrap
import time import time
from common import i_am_registered_for_the_course, TEST_SECTION_NAME, section_location 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, \ from capa.tests.response_xml_factory import OptionResponseXMLFactory, \
ChoiceResponseXMLFactory, MultipleChoiceResponseXMLFactory, \ ChoiceResponseXMLFactory, MultipleChoiceResponseXMLFactory, \
StringResponseXMLFactory, NumericalResponseXMLFactory, \ StringResponseXMLFactory, NumericalResponseXMLFactory, \
FormulaResponseXMLFactory, CustomResponseXMLFactory, \ FormulaResponseXMLFactory, CustomResponseXMLFactory, \
CodeResponseXMLFactory CodeResponseXMLFactory
# Factories from capa.tests.response_xml_factory that we will use # Factories from capa.tests.response_xml_factory that we will use
# to generate the problem XML, with the keyword args used to configure # to generate the problem XML, with the keyword args used to configure
...@@ -99,11 +98,11 @@ def add_problem_to_course(course, problem_type): ...@@ -99,11 +98,11 @@ def add_problem_to_course(course, problem_type):
# Create a problem item using our generated XML # Create a problem item using our generated XML
# We set rerandomize=always in the metadata so that the "Reset" button # We set rerandomize=always in the metadata so that the "Reset" button
# will appear. # will appear.
problem_item = ItemFactory.create(parent_location=section_location(course), problem_item = world.ItemFactory.create(parent_location=section_location(course),
template="i4x://edx/templates/problem/Blank_Common_Problem", template="i4x://edx/templates/problem/Blank_Common_Problem",
display_name=str(problem_type), display_name=str(problem_type),
data=problem_xml, data=problem_xml,
metadata={'rerandomize': 'always'}) metadata={'rerandomize': 'always'})
@step(u'I am viewing a "([^"]*)" problem') @step(u'I am viewing a "([^"]*)" problem')
...@@ -214,73 +213,66 @@ def reset_problem(step): ...@@ -214,73 +213,66 @@ def reset_problem(step):
world.css_click('input.reset') world.css_click('input.reset')
# Dictionaries that map problem types to the css selectors
# for correct/incorrect/unanswered marks.
# The elements are lists of selectors because a particular problem type
# might be marked in multiple ways.
# For example, multiple choice is marked incorrect differently
# depending on whether the user selects an incorrect
# item or submits without selecting any item)
CORRECTNESS_SELECTORS = {
'correct': {'drop down': ['span.correct'],
'multiple choice': ['label.choicegroup_correct'],
'checkbox': ['span.correct'],
'string': ['div.correct'],
'numerical': ['div.correct'],
'formula': ['div.correct'],
'script': ['div.correct'],
'code': ['span.correct']},
'incorrect': {'drop down': ['span.incorrect'],
'multiple choice': ['label.choicegroup_incorrect',
'span.incorrect'],
'checkbox': ['span.incorrect'],
'string': ['div.incorrect'],
'numerical': ['div.incorrect'],
'formula': ['div.incorrect'],
'script': ['div.incorrect'],
'code': ['span.incorrect']},
'unanswered': {'drop down': ['span.unanswered'],
'multiple choice': ['span.unanswered'],
'checkbox': ['span.unanswered'],
'string': ['div.unanswered'],
'numerical': ['div.unanswered'],
'formula': ['div.unanswered'],
'script': ['div.unanswered'],
'code': ['span.unanswered'] }}
@step(u'My "([^"]*)" answer is marked "([^"]*)"') @step(u'My "([^"]*)" answer is marked "([^"]*)"')
def assert_answer_mark(step, problem_type, correctness): def assert_answer_mark(step, problem_type, correctness):
""" Assert that the expected answer mark is visible for a given problem type. """ Assert that the expected answer mark is visible for a given problem type.
*problem_type* is a string identifying the type of problem (e.g. 'drop down') *problem_type* is a string identifying the type of problem (e.g. 'drop down')
*correctness* is in ['correct', 'incorrect', 'unanswered'] *correctness* is in ['correct', 'incorrect', 'unanswered']
"""
# Determine which selector(s) to look for based on correctness
assert(correctness in CORRECTNESS_SELECTORS)
selector_dict = CORRECTNESS_SELECTORS[correctness]
assert(problem_type in selector_dict)
# At least one of the correct selectors should be present
for sel in selector_dict[problem_type]:
has_expected = world.browser.is_element_present_by_css(sel, wait_time=4)
Asserting that a problem is marked 'unanswered' means that # As soon as we find the selector, break out of the loop
the problem is NOT marked correct and NOT marked incorrect. if has_expected:
This can occur, for example, if the user has reset the problem. """ break
# Dictionaries that map problem types to the css selectors
# for correct/incorrect marks.
# The elements are lists of selectors because a particular problem type
# might be marked in multiple ways.
# For example, multiple choice is marked incorrect differently
# depending on whether the user selects an incorrect
# item or submits without selecting any item)
correct_selectors = {'drop down': ['span.correct'],
'multiple choice': ['label.choicegroup_correct'],
'checkbox': ['span.correct'],
'string': ['div.correct'],
'numerical': ['div.correct'],
'formula': ['div.correct'],
'script': ['div.correct'],
'code': ['span.correct'], }
incorrect_selectors = {'drop down': ['span.incorrect'],
'multiple choice': ['label.choicegroup_incorrect',
'span.incorrect'],
'checkbox': ['span.incorrect'],
'string': ['div.incorrect'],
'numerical': ['div.incorrect'],
'formula': ['div.incorrect'],
'script': ['div.incorrect'],
'code': ['span.incorrect'], }
assert(correctness in ['correct', 'incorrect', 'unanswered'])
assert(problem_type in correct_selectors and problem_type in incorrect_selectors)
# Assert that the question has the expected mark
# (either correct or incorrect)
if correctness in ["correct", "incorrect"]:
selector_dict = correct_selectors if correctness == "correct" else incorrect_selectors
# At least one of the correct selectors should be present
for sel in selector_dict[problem_type]:
has_expected_mark = world.browser.is_element_present_by_css(sel, wait_time=4)
# As soon as we find the selector, break out of the loop
if has_expected_mark:
break
# Expect that we found the right mark (correct or incorrect)
assert(has_expected_mark)
# Assert that the question has neither correct nor incorrect
# because it is unanswered (possibly reset)
else:
# Get all the correct/incorrect selectors for this problem type
selector_list = correct_selectors[problem_type] + incorrect_selectors[problem_type]
# Assert that none of the correct/incorrect selectors are present
for sel in selector_list:
assert(world.browser.is_element_not_present_by_css(sel, wait_time=4))
# Expect that we found the expected selector
assert(has_expected)
def inputfield(problem_type, choice=None, input_num=1): def inputfield(problem_type, choice=None, input_num=1):
""" Return the <input> element for *problem_type*. """ Return the <input> element for *problem_type*.
...@@ -291,7 +283,7 @@ def inputfield(problem_type, choice=None, input_num=1): ...@@ -291,7 +283,7 @@ def inputfield(problem_type, choice=None, input_num=1):
of checkboxes. """ of checkboxes. """
sel = ("input#input_i4x-edx-model_course-problem-%s_2_%s" % sel = ("input#input_i4x-edx-model_course-problem-%s_2_%s" %
(problem_type.replace(" ", "_"), str(input_num))) (problem_type.replace(" ", "_"), str(input_num)))
if choice is not None: if choice is not None:
base = "_choice_" if problem_type == "multiple choice" else "_" base = "_choice_" if problem_type == "multiple choice" else "_"
......
lms/djangoapps/courseware/features/smart-accordion.py
...@@ -81,7 +81,7 @@ def browse_course(course_id): ...@@ -81,7 +81,7 @@ def browse_course(course_id):
num_rendered_sections = len(rendered_sections) num_rendered_sections = len(rendered_sections)
msg = ('%d sections expected, %d sections found on page, %s - %d - %s' % msg = ('%d sections expected, %d sections found on page, %s - %d - %s' %
(num_sections, num_rendered_sections, course_id, chapter_it, chapters[chapter_it]['chapter_name'])) (num_sections, num_rendered_sections, course_id, chapter_it, chapters[chapter_it]['chapter_name']))
#logger.debug(msg) #logger.debug(msg)
assert num_sections == num_rendered_sections, msg assert num_sections == num_rendered_sections, msg
...@@ -112,7 +112,7 @@ def browse_course(course_id): ...@@ -112,7 +112,7 @@ def browse_course(course_id):
num_rendered_tabs = 0 num_rendered_tabs = 0
msg = ('%d tabs expected, %d tabs found, %s - %d - %s' % msg = ('%d tabs expected, %d tabs found, %s - %d - %s' %
(num_tabs, num_rendered_tabs, course_id, section_it, sections[section_it]['section_name'])) (num_tabs, num_rendered_tabs, course_id, section_it, sections[section_it]['section_name']))
#logger.debug(msg) #logger.debug(msg)
# Save the HTML to a file for later comparison # Save the HTML to a file for later comparison
...@@ -137,7 +137,7 @@ def browse_course(course_id): ...@@ -137,7 +137,7 @@ def browse_course(course_id):
rendered_items = world.browser.find_by_css('div#seq_content > section > ol > li > section') rendered_items = world.browser.find_by_css('div#seq_content > section > ol > li > section')
num_rendered_items = len(rendered_items) num_rendered_items = len(rendered_items)
msg = ('%d items expected, %d items found, %s - %d - %s - tab %d' % msg = ('%d items expected, %d items found, %s - %d - %s - tab %d' %
(tab_children, num_rendered_items, course_id, section_it, sections[section_it]['section_name'], tab_it)) (tab_children, num_rendered_items, course_id, section_it, sections[section_it]['section_name'], tab_it))
#logger.debug(msg) #logger.debug(msg)
assert tab_children == num_rendered_items, msg assert tab_children == num_rendered_items, msg
......
lms/envs/acceptance.py
...@@ -29,6 +29,14 @@ MODULESTORE = { ...@@ -29,6 +29,14 @@ MODULESTORE = {
} }
} }
CONTENTSTORE = {
'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore',
'OPTIONS': {
'host': 'localhost',
'db': 'test_xcontent',
}
}
# Set this up so that rake lms[acceptance] and running the # Set this up so that rake lms[acceptance] and running the
# harvest command both use the same (test) database # harvest command both use the same (test) database
# which they can flush without messing up your dev db # which they can flush without messing up your dev db
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment