Merge branch 'MDL-68548' of https://github.com/Neosi/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 00:55:51 +0000 (08:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 00:55:51 +0000 (08:55 +0800)
1  2 
lib/editor/atto/tests/behat/customtoolbar.feature
lib/editor/atto/tests/behat/disablecontrol.feature

@@@ -20,7 -20,7 +20,7 @@@ Feature: Atto editor with customised to
    Scenario: Confirm that both editors have different toolbars but still function
      Then ".atto_link_button" "css_element" should exist in the ".normaldiv" "css_element"
      And ".atto_link_button" "css_element" should not exist in the ".specialdiv" "css_element"
 -    And ".atto_bold_button_bold" "css_element" should exist in the ".normaldiv" "css_element"
 +    And ".atto_bold_button" "css_element" should exist in the ".normaldiv" "css_element"
-     And ".atto_italic_button_italic" "css_element" should exist in the ".normaldiv" "css_element"
+     And ".atto_italic_button" "css_element" should exist in the ".normaldiv" "css_element"
 -    And ".atto_bold_button_bold" "css_element" should exist in the ".specialdiv" "css_element"
 +    And ".atto_bold_button" "css_element" should exist in the ".specialdiv" "css_element"
-     And ".atto_italic_button_italic" "css_element" should exist in the ".specialdiv" "css_element"
+     And ".atto_italic_button" "css_element" should exist in the ".specialdiv" "css_element"
@@@ -21,8 -21,8 +21,8 @@@ Feature: Atto with enable/disable funct
      When I set the field "mycontrol" to "Disable"
      Then the "disabled" attribute of "button.atto_collapse_button" "css_element" should contain "disabled"
      And the "disabled" attribute of "button.atto_title_button" "css_element" should contain "disabled"
 -    And the "disabled" attribute of "button.atto_bold_button_bold" "css_element" should contain "disabled"
 +    And the "disabled" attribute of "button.atto_bold_button" "css_element" should contain "disabled"
-     And the "disabled" attribute of "button.atto_italic_button_italic" "css_element" should contain "disabled"
+     And the "disabled" attribute of "button.atto_italic_button" "css_element" should contain "disabled"
      And the "disabled" attribute of "button.atto_unorderedlist_button_insertUnorderedList" "css_element" should contain "disabled"
      And the "disabled" attribute of "button.atto_orderedlist_button_insertOrderedList" "css_element" should contain "disabled"
      And the "disabled" attribute of "button.atto_link_button" "css_element" should contain "disabled"
@@@ -35,8 -35,8 +35,8 @@@
      When I set the field "mycontrol" to "Enable"
      Then "button.atto_collapse_button[disabled]" "css_element" should not exist
      And "button.atto_title_button[disabled]" "css_element" should not exist
 -    And "button.atto_bold_button_bold[disabled]" "css_element" should not exist
 +    And "button.atto_bold_button[disabled]" "css_element" should not exist
-     And "button.atto_italic_button_italic[disabled]" "css_element" should not exist
+     And "button.atto_italic_button[disabled]" "css_element" should not exist
      And "button.atto_unorderedlist_button_insertUnorderedList[disabled]" "css_element" should not exist
      And "button.atto_orderedlist_button_insertOrderedList[disabled]" "css_element" should not exist
      And "button.atto_link_button[disabled]" "css_element" should not exist