Address the next round of review comments.

cms/djangoapps/contentstore/features/component_settings_editor_helpers.py

@@ -6,6 +6,7 @@ from nose.tools import assert_equal, assert_in  # pylint: disable=E0611
 from terrain.steps import reload_the_page
 from common import type_in_codemirror
 from selenium.webdriver.common.keys import Keys
+from cms.envs.common import FEATURES
 
 
 @world.absorb
@@ -54,6 +55,11 @@ def click_new_component_button(step, component_button_css):
 
     world.css_click(component_button_css)
 
+    if FEATURES['USE_CONTAINER_PAGE_FOR_TESTING']:
+        unit_url = world.browser.url
+        container_url = unit_url.replace('/unit/', '/container/')
+        world.visit(container_url)
+
 
 def _click_advanced():
     css = 'ul.problem-type-tabs a[href="#tab2"]'

cms/djangoapps/contentstore/views/helpers.py

@@ -7,6 +7,9 @@ from xmodule.modulestore.django import loc_mapper, modulestore
 
 __all__ = ['edge', 'event', 'landing']
 
+EDITING_TEMPLATES = [
+    "basic-modal", "modal-button", "edit-xblock-modal", "editor-mode-button", "upload-dialog", "image-modal"
+]
 
 # points to the temporary course landing page with log in and sign up
 def landing(request, org, course, coursename):