Add lettuce tests for single-click video creation and fix previously failing tests.

cms/djangoapps/contentstore/features/common.py

@@ -161,3 +161,11 @@ def i_created_a_video_component(step):
         'i4x://edx/templates/video/default',
         '.xmodule_VideoModule'
     )
+
+
+@step('I have clicked the new unit button')
+def open_new_unit(step):
+    step.given('I have opened a new course section in Studio')
+    step.given('I have added a new subsection')
+    step.given('I expand the first section')
+    world.css_click('a.new-unit-item')

cms/djangoapps/contentstore/features/component_settings_editor_helpers.py

@@ -14,19 +14,23 @@ def create_component_instance(step, component_button_css, instance_id, expected_
 
 @world.absorb
 def click_new_component_button(step, component_button_css):
-    step.given('I have opened a new course section in Studio')
-    step.given('I have added a new subsection')
-    step.given('I expand the first section')
-    world.css_click('a.new-unit-item')
+    # step.given('I have opened a new course section in Studio')
+    # step.given('I have added a new subsection')
+    # step.given('I expand the first section')
+    # world.css_click('a.new-unit-item')
+    step.given('I have clicked the new unit button')
     world.css_click(component_button_css)
 
 
 @world.absorb
 def click_component_from_menu(instance_id, expected_css):
     elem_css = "a[data-location='%s']" % instance_id
-    assert_equal(1, len(world.css_find(elem_css)))
-    world.css_click(elem_css)
-    assert_equal(1, len(world.css_find(expected_css)))
+    elements = world.css_find(elem_css)
+    if len(elements) == 1: # Multiple templates
+        world.css_click(elem_css)
+        assert_equal(1, len(world.css_find(expected_css)))
+    else: # Single template
+        assert(len(filter(lambda ele: ele.has_class('single_template'), elements)) == 1)
 
 @world.absorb
 def edit_component_and_select_settings():

cms/djangoapps/contentstore/features/video.feature

@@ -4,3 +4,7 @@ Feature: Video Component
   Scenario: Autoplay is disabled in Studio
     Given I have created a Video component
     Then when I view the video it does not have autoplay enabled
+
+  Scenario: Creating a video takes a single click
+    Given I have clicked the new unit button
+    Then creating a video takes a single click

cms/djangoapps/contentstore/features/video.py

@@ -9,3 +9,10 @@ from lettuce import world, step
 def does_not_autoplay(step):
     assert world.css_find('.video')[0]['data-autoplay'] == 'False'
     assert world.css_find('.video_control')[0].has_class('play')
+
+
+@step('creating a video takes a single click')
+def click_new_component_button(step):
+    assert(not world.is_css_present('.xmodule_VideoModule'))
+    world.css_click("a[data-location='i4x://edx/templates/video/default']")
+    assert(world.is_css_present('.xmodule_VideoModule'))