Merge pull request #12578 from edx/christina/tnl-4561

Christina/tnl 4561

cms/static/js/views/utils/xblock_utils.js

@@ -86,12 +86,14 @@ define(["jquery", "underscore", "gettext", "common/js/components/utils/view_util
                         }
                     );
                 },
-                messageBody = interpolate(
+                messageBody;
+            xblockType = xblockType || 'component';
+            messageBody = interpolate(
                     gettext('Deleting this %(xblock_type)s is permanent and cannot be undone.'),
                     { xblock_type: xblockType },
                     true
                 );
-            xblockType = xblockType || 'component';
+
             if (xblockInfo.get('is_prereq')) {
                 messageBody += ' ' + gettext('Any content that has listed this content as a prerequisite will also have access limitations removed.'); // jshint ignore:line
                 ViewUtils.confirmThenRunOperation(

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

@@ -56,10 +56,6 @@ def confirm_prompt(page, cancel=False, require_notification=None):
     cancel is True.
     """
     page.wait_for_element_visibility('.prompt', 'Prompt is visible')
-    page.wait_for_element_visibility(
-        '.wrapper-prompt:focus',
-        'Prompt is in focus'
-    )
     confirmation_button_css = '.prompt .action-' + ('secondary' if cancel else 'primary')
     page.wait_for_element_visibility(confirmation_button_css, 'Confirmation button is visible')
     require_notification = (not cancel) if require_notification is None else require_notification

common/test/acceptance/tests/studio/test_studio_split_test.py

@@ -5,7 +5,6 @@ Acceptance tests for Studio related to the split_test module.
 import math
 from unittest import skip
 from nose.plugins.attrib import attr
-from flaky import flaky
 from selenium.webdriver.support.ui import Select
 
 from xmodule.partitions.partitions import Group
@@ -1045,7 +1044,6 @@ class GroupConfigurationsTest(ContainerBase, SplitTestMixin):
         rendered_group_names = self.get_select_options(page=courseware_page, selector=".split-test-select")
         self.assertListEqual(group_names, rendered_group_names)
 
-    @flaky  # TODO TNL-4561
     def test_split_test_LMS_staff_view(self):
         """
         Scenario: Ensure that split test is correctly rendered in LMS staff mode as it is