Cleanup.

cms/djangoapps/contentstore/features/discussion-editor.py

@@ -5,15 +5,16 @@ from lettuce import world, step
 
 
 @step('I have created a Discussion Tag$')
-def i_created_blank_common_problem(step):
+def i_created_discussion_tag(step):
     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'
     )
 
 
 @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(
         [
             ['Category', "Week 1", True],

cms/djangoapps/contentstore/features/html-editor.py

@@ -5,7 +5,7 @@ from lettuce import world, step
 
 
 @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(
         step, '.large-html-icon', 'i4x://edx/templates/html/Blank_HTML_Page',
         '.xmodule_HtmlModule'

cms/djangoapps/contentstore/features/video-editor.py

@@ -7,7 +7,8 @@ from lettuce import world, step
 @step('I have created a Video component$')
 def i_created_a_video_component(step):
     world.create_component_instance(
-        step, '.large-video-icon', 'i4x://edx/templates/video/default',
+        step, '.large-video-icon',
+        'i4x://edx/templates/video/default',
         '.xmodule_VideoModule'
     )
 

cms/static/coffee/src/views/module_edit.coffee

@@ -126,7 +126,6 @@ class CMS.Views.ModuleEdit extends Backbone.View
 
   hideDataEditor: =>
     editorModeButtonParent =  @$el.find('#editor-mode')
-    # Can it be enough to just remove active-mode?
     editorModeButtonParent.addClass('inactive-mode')
     editorModeButtonParent.removeClass('active-mode')
     @$el.find('.wrapper-comp-settings').addClass('is-active')

common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml

@@ -34,5 +34,4 @@ data: |
   	</task>
   </combinedopenended>
 
-
 children: []