Commit f0260757 by cahrens

Cleanup.

parent d7a1dda9
...@@ -5,15 +5,16 @@ from lettuce import world, step ...@@ -5,15 +5,16 @@ from lettuce import world, step
@step('I have created a Discussion Tag$') @step('I have created a Discussion Tag$')
def i_created_blank_common_problem(step): def i_created_discussion_tag(step):
world.create_component_instance( world.create_component_instance(
step, '.large-discussion-icon', 'i4x://edx/templates/discussion/Discussion_Tag', step, '.large-discussion-icon',
'i4x://edx/templates/discussion/Discussion_Tag',
'.xmodule_DiscussionModule' '.xmodule_DiscussionModule'
) )
@step('I see three alphabetized settings and their expected values$') @step('I see three alphabetized settings and their expected values$')
def i_see_only_the_display_name(step): def i_see_only_the_settings_and_values(step):
world.verify_all_setting_entries( world.verify_all_setting_entries(
[ [
['Category', "Week 1", True], ['Category', "Week 1", True],
......
...@@ -5,7 +5,7 @@ from lettuce import world, step ...@@ -5,7 +5,7 @@ from lettuce import world, step
@step('I have created a Blank HTML Page$') @step('I have created a Blank HTML Page$')
def i_created_blank_common_problem(step): def i_created_blank_html_page(step):
world.create_component_instance( world.create_component_instance(
step, '.large-html-icon', 'i4x://edx/templates/html/Blank_HTML_Page', step, '.large-html-icon', 'i4x://edx/templates/html/Blank_HTML_Page',
'.xmodule_HtmlModule' '.xmodule_HtmlModule'
......
...@@ -7,7 +7,8 @@ from lettuce import world, step ...@@ -7,7 +7,8 @@ from lettuce import world, step
@step('I have created a Video component$') @step('I have created a Video component$')
def i_created_a_video_component(step): def i_created_a_video_component(step):
world.create_component_instance( world.create_component_instance(
step, '.large-video-icon', 'i4x://edx/templates/video/default', step, '.large-video-icon',
'i4x://edx/templates/video/default',
'.xmodule_VideoModule' '.xmodule_VideoModule'
) )
......
...@@ -142,7 +142,7 @@ describe "CMS.Views.Metadata.Editor creates editors for each field", -> ...@@ -142,7 +142,7 @@ describe "CMS.Views.Metadata.Editor creates editors for each field", ->
}) })
# Tests for individual views. # Tests for individual views.
assertInputType = (view, expectedType) -> assertInputType = (view, expectedType) ->
input = view.$el.find('.setting-input') input = view.$el.find('.setting-input')
expect(input.length).toBe(1) expect(input.length).toBe(1)
expect(input[0].type).toBe(expectedType) expect(input[0].type).toBe(expectedType)
......
...@@ -126,7 +126,6 @@ class CMS.Views.ModuleEdit extends Backbone.View ...@@ -126,7 +126,6 @@ class CMS.Views.ModuleEdit extends Backbone.View
hideDataEditor: => hideDataEditor: =>
editorModeButtonParent = @$el.find('#editor-mode') editorModeButtonParent = @$el.find('#editor-mode')
# Can it be enough to just remove active-mode?
editorModeButtonParent.addClass('inactive-mode') editorModeButtonParent.addClass('inactive-mode')
editorModeButtonParent.removeClass('active-mode') editorModeButtonParent.removeClass('active-mode')
@$el.find('.wrapper-comp-settings').addClass('is-active') @$el.find('.wrapper-comp-settings').addClass('is-active')
......
...@@ -311,14 +311,14 @@ class PeerGradingModule(PeerGradingFields, XModule): ...@@ -311,14 +311,14 @@ class PeerGradingModule(PeerGradingFields, XModule):
try: try:
response = self.peer_gs.save_grade(location, grader_id, submission_id, response = self.peer_gs.save_grade(location, grader_id, submission_id,
score, feedback, submission_key, rubric_scores, submission_flagged) score, feedback, submission_key, rubric_scores, submission_flagged)
return response return response
except GradingServiceError: except GradingServiceError:
#This is a dev_facing_error #This is a dev_facing_error
log.exception("""Error saving grade to open ended grading service. server url: {0}, location: {1}, submission_id:{2}, log.exception("""Error saving grade to open ended grading service. server url: {0}, location: {1}, submission_id:{2},
submission_key: {3}, score: {4}""" submission_key: {3}, score: {4}"""
.format(self.peer_gs.url, .format(self.peer_gs.url,
location, submission_id, submission_key, score) location, submission_id, submission_key, score)
) )
#This is a student_facing_error #This is a student_facing_error
return { return {
...@@ -449,7 +449,7 @@ class PeerGradingModule(PeerGradingFields, XModule): ...@@ -449,7 +449,7 @@ class PeerGradingModule(PeerGradingFields, XModule):
try: try:
response = self.peer_gs.save_calibration_essay(location, grader_id, calibration_essay_id, response = self.peer_gs.save_calibration_essay(location, grader_id, calibration_essay_id,
submission_key, score, feedback, rubric_scores) submission_key, score, feedback, rubric_scores)
if 'actual_rubric' in response: if 'actual_rubric' in response:
rubric_renderer = combined_open_ended_rubric.CombinedOpenEndedRubric(self.system, True) rubric_renderer = combined_open_ended_rubric.CombinedOpenEndedRubric(self.system, True)
response['actual_rubric'] = rubric_renderer.render_rubric(response['actual_rubric'])['html'] response['actual_rubric'] = rubric_renderer.render_rubric(response['actual_rubric'])['html']
......
...@@ -34,5 +34,4 @@ data: | ...@@ -34,5 +34,4 @@ data: |
</task> </task>
</combinedopenended> </combinedopenended>
children: [] children: []
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