Skip to content

E
edx-platform
Commit 6048bc28 by Jay Zoldak
Options

Pep8 fixes for factory refactor

parent e45ccbf3
Showing with 53 additions and 54 deletions
common/djangoapps/student/tests/factories.py
from student.models import (User, UserProfile, Registration,
from student.models import (User, UserProfile, Registration,
CourseEnrollmentAllowed, CourseEnrollment)
from django.contrib.auth.models import Group
from datetime import datetime
......@@ -101,10 +101,10 @@ class XModuleCourseFactory(Factory):
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"}]
{"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))
......@@ -170,7 +170,7 @@ class XModuleItemFactory(Factory):
# 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)
name=dest_name)
new_item = store.clone_item(template, dest_location)
......
common/djangoapps/terrain/factories.py
from student.tests.factories import (UserFactory, UserProfileFactory,
RegistrationFactory, GroupFactory,
CourseEnrollmentAllowed,
CourseFactory, ItemFactory)
RegistrationFactory, GroupFactory,
CourseEnrollmentAllowed,
CourseFactory, ItemFactory)
from lettuce import world
......@@ -9,7 +9,7 @@ from lettuce import world
class UserFactory(UserFactory):
"""
User account for lms / cms
"""
"""
pass
......@@ -17,7 +17,7 @@ class UserFactory(UserFactory):
class UserProfileFactory(UserProfileFactory):
"""
Demographics etc for the User
"""
"""
pass
......@@ -25,7 +25,7 @@ class UserProfileFactory(UserProfileFactory):
class RegistrationFactory(RegistrationFactory):
"""
Activation key for registering the user account
"""
"""
pass
......@@ -33,7 +33,7 @@ class RegistrationFactory(RegistrationFactory):
class GroupFactory(GroupFactory):
"""
Groups for user permissions for courses
"""
"""
pass
......@@ -41,7 +41,7 @@ class GroupFactory(GroupFactory):
class CourseEnrollmentAllowedFactory(CourseEnrollmentAllowed):
"""
Users allowed to enroll in the course outside of the usual window
"""
"""
pass
......@@ -49,13 +49,13 @@ class CourseEnrollmentAllowedFactory(CourseEnrollmentAllowed):
class CourseFactory(CourseFactory):
"""
Courseware courses
"""
"""
pass
@world.absorb
class ItemFactory(ItemFactory):
"""
Everything included inside a course
"""
"""
pass
lms/djangoapps/courseware/features/common.py
......@@ -99,16 +99,16 @@ def create_course(step, course):
# We always use the same org and display name,
# but vary the course identifier (e.g. 600x or 191x)
course = world.CourseFactory.create(org=TEST_COURSE_ORG,
number=course,
display_name=TEST_COURSE_NAME)
number=course,
display_name=TEST_COURSE_NAME)
# Add a section to the course to contain problems
section = world.ItemFactory.create(parent_location=course.location,
display_name=TEST_SECTION_NAME)
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)
template='i4x://edx/templates/sequential/Empty',
display_name=TEST_SECTION_NAME)
@step(u'I am registered for the course "([^"]*)"$')
......@@ -130,8 +130,8 @@ def i_am_registered_for_the_course(step, course):
@step(u'The course "([^"]*)" has extra tab "([^"]*)"$')
def add_tab_to_course(step, course, 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))
template="i4x://edx/templates/static_tab/Empty",
display_name=str(extra_tab_name))
@step(u'I am an edX user$')
......@@ -159,7 +159,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):
......
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
......
lms/djangoapps/courseware/features/problems.py
......@@ -5,9 +5,9 @@ import random
import textwrap
from common import i_am_registered_for_the_course, TEST_SECTION_NAME, section_location
from capa.tests.response_xml_factory import OptionResponseXMLFactory, \
ChoiceResponseXMLFactory, MultipleChoiceResponseXMLFactory, \
StringResponseXMLFactory, NumericalResponseXMLFactory, \
FormulaResponseXMLFactory, CustomResponseXMLFactory
ChoiceResponseXMLFactory, MultipleChoiceResponseXMLFactory, \
StringResponseXMLFactory, NumericalResponseXMLFactory, \
FormulaResponseXMLFactory, CustomResponseXMLFactory
# Factories from capa.tests.response_xml_factory that we will use
# to generate the problem XML, with the keyword args used to configure
......@@ -77,7 +77,7 @@ PROBLEM_FACTORY_DICT = {
a2=0
return (a1+a2)==int(expect)
""")}},
}
}
def add_problem_to_course(course, problem_type):
......@@ -92,10 +92,10 @@ def add_problem_to_course(course, problem_type):
# We set rerandomize=always in the metadata so that the "Reset" button
# will appear.
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'})
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')
......@@ -201,21 +201,21 @@ def assert_answer_mark(step, problem_type, correctness):
# 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'], }
'multiple choice': ['label.choicegroup_correct'],
'checkbox': ['span.correct'],
'string': ['div.correct'],
'numerical': ['div.correct'],
'formula': ['div.correct'],
'script': ['div.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']}
'span.incorrect'],
'checkbox': ['span.incorrect'],
'string': ['div.incorrect'],
'numerical': ['div.incorrect'],
'formula': ['div.incorrect'],
'script': ['div.incorrect']}
assert(correctness in ['correct', 'incorrect', 'unanswered'])
assert(problem_type in correct_selectors and problem_type in incorrect_selectors)
......@@ -257,7 +257,7 @@ def inputfield(problem_type, choice=None, input_num=1):
of checkboxes. """
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:
base = "_choice_" if problem_type == "multiple choice" else "_"
......
lms/djangoapps/courseware/features/smart-accordion.py
......@@ -81,7 +81,7 @@ def browse_course(course_id):
num_rendered_sections = len(rendered_sections)
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)
assert num_sections == num_rendered_sections, msg
......@@ -112,7 +112,7 @@ def browse_course(course_id):
num_rendered_tabs = 0
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)
# Save the HTML to a file for later comparison
......@@ -137,7 +137,7 @@ def browse_course(course_id):
rendered_items = world.browser.find_by_css('div#seq_content > section > ol > li > section')
num_rendered_items = len(rendered_items)
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)
assert tab_children == num_rendered_items, msg
......
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