Merge pull request #9402 from edx/clytwynec/TNL-2153

Change component types and template links to buttons

common/test/acceptance/pages/studio/container.py

@@ -305,7 +305,7 @@ class ContainerPage(PageObject):
         Returns:
             list
         """
-        css = '#tab{tab_index} a[data-category={category_type}] span'.format(
+        css = '#tab{tab_index} button[data-category={category_type}] span'.format(
             tab_index=tab_index,
             category_type=category_type
         )

common/test/acceptance/pages/studio/utils.py

@@ -72,7 +72,7 @@ def add_discussion(page, menu_index=0):
     placement within the page).
     """
     page.wait_for_component_menu()
-    click_css(page, 'a>span.large-discussion-icon', menu_index)
+    click_css(page, 'button>span.large-discussion-icon', menu_index)
 
 
 def add_advanced_component(page, menu_index, name):
@@ -84,7 +84,7 @@ def add_advanced_component(page, menu_index, name):
     """
     # Click on the Advanced icon.
     page.wait_for_component_menu()
-    click_css(page, 'a>span.large-advanced-icon', menu_index, require_notification=False)
+    click_css(page, 'button>span.large-advanced-icon', menu_index, require_notification=False)
 
     # This does an animation to hide the first level of buttons
     # and instead show the Advanced buttons that are available.
@@ -95,7 +95,7 @@ def add_advanced_component(page, menu_index, name):
     page.wait_for_element_visibility('.new-component-advanced', 'Advanced component menu is visible')
 
     # Now click on the component to add it.
-    component_css = 'a[data-category={}]'.format(name)
+    component_css = 'button[data-category={}]'.format(name)
     page.wait_for_element_visibility(component_css, 'Advanced component {} is visible'.format(name))
 
     # Adding some components, e.g. the Discussion component, will make an ajax call
@@ -123,7 +123,7 @@ def add_component(page, item_type, specific_type):
             'Wait for the add component menu to disappear'
         )
 
-        all_options = page.q(css='.new-component-{} ul.new-component-template li a span'.format(item_type))
+        all_options = page.q(css='.new-component-{} ul.new-component-template li button span'.format(item_type))
         chosen_option = all_options.filter(lambda el: el.text == specific_type).first
         chosen_option.click()
     wait_for_notification(page)
@@ -139,13 +139,13 @@ def add_html_component(page, menu_index, boilerplate=None):
     """
     # Click on the HTML icon.
     page.wait_for_component_menu()
-    click_css(page, 'a>span.large-html-icon', menu_index, require_notification=False)
+    click_css(page, 'button>span.large-html-icon', menu_index, require_notification=False)
 
     # Make sure that the menu of HTML components is visible before clicking
     page.wait_for_element_visibility('.new-component-html', 'HTML component menu is visible')
 
     # Now click on the component to add it.
-    component_css = 'a[data-category=html]'
+    component_css = 'button[data-category=html]'
     if boilerplate:
         component_css += '[data-boilerplate={}]'.format(boilerplate)
     else:

common/test/acceptance/pages/studio/video/video.py

@@ -30,7 +30,7 @@ CLASS_SELECTORS = {
 }
 
 BUTTON_SELECTORS = {
-    'create_video': 'a[data-category="video"]',
+    'create_video': 'button[data-category="video"]',
     'handout_download': '.video-handout.video-download-button a',
     'handout_download_editor': '.wrapper-comp-setting.file-uploader .download-action',
     'upload_asset': '.upload-action',