MAGETWO-34984: Invert new admin styles scope

Evgeniy Kolesov · Evgeniy Kolesov · commit 36ec5b31faf1 · 2015-03-25T19:17:26.000+02:00
- Fixing tests
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml
@@ -13,7 +13,7 @@
     </head>
     <update handle="editor"/>
     <body>
-        <referenceContainer name="admin.scope.col.wrap" htmlClass="" /> <!-- @todo ui: Removes .admin__scope-old class for edit product -->
+        <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" /> <!-- ToDo UI: remove this wrapper with old styles removal. The class name "admin__old" is for tests only, we shouldn't use it in any way -->
         <referenceContainer name="content">
             <block class="Magento\Catalog\Block\Adminhtml\Product\Edit" name="product_edit">
                 <container name="product-type-tabs" label="Tabs">
diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml
@@ -7,7 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceContainer name="admin.scope.col.wrap" htmlClass="" /> <!-- Removes .admin__scope-old class for customer columns -->
+        <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" /> <!-- ToDo UI: remove this wrapper with old styles removal. The class name "admin__old" is for tests only, we shouldn't use it in any way -->
         <referenceContainer name="content">
             <ui_component name="customer_form" component="form" />
         </referenceContainer>
diff --git a/dev/tests/js/testsuite/mage/tabs/tabs-test.js b/dev/tests/js/testsuite/mage/tabs/tabs-test.js
@@ -128,13 +128,13 @@ TabsTest.prototype.testOnContentChange = function() {
         tabs = jQuery('#tabs').tabs();
 
     tabs.data("tabs")._onContentChange(eventMock);
-    assertTrue(jQuery('#tab1').hasClass('changed'));
+    assertTrue(jQuery('#tab1').hasClass('_changed'));
 };
 
 TabsTest.prototype.testOnInvalid = function() {
     /*:DOC += <div id="tabs"><ul>
          <li>
-             <a href="www.site.com" id="tab1">Tab 1<span class="error">&nbsp;</span></a>
+             <a href="www.site.com" id="tab1">Tab 1<span class="_error">&nbsp;</span></a>
              <div id="tab1_content"></div>
          </li>
      </ul></div>
@@ -145,13 +145,13 @@ TabsTest.prototype.testOnInvalid = function() {
             }
         },
         tabs = jQuery('#tabs').tabs(),
-        errorIcon = jQuery('#tab1').find('.error');
+        errorIcon = jQuery('#tab1').find('._error');
 
     errorIcon.hide();
     assertTrue(errorIcon.is(':hidden'));
 
     tabs.data("tabs")._onInvalid(eventMock);
-    assertTrue(jQuery('#tab1').hasClass('error'));
+    assertTrue(jQuery('#tab1').hasClass('_error'));
     assertTrue(errorIcon.is(':visible'));
 };
 
@@ -174,10 +174,10 @@ TabsTest.prototype.testOnFocus = function() {
         },
         tabs = jQuery('#tabs').tabs();
 
-    assertNotEquals(tabs.tabs('option', 'active'), eventMock.data.index);
+    assertNotEquals(tabs.tabs('option', '_active'), eventMock.data.index);
 
     tabs.data("tabs")._onFocus(eventMock);
-    assertEquals(tabs.tabs('option', 'active'), eventMock.data.index);
+    assertEquals(tabs.tabs('option', '_active'), eventMock.data.index);
 };
 
 TabsTest.prototype.testOnBeforeSubmit = function() {
