reverting expand row on click

dsheiko · Dec 19, 2018 · cb73bdc · cb73bdc
1 parent c687813
commit cb73bdc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/app/constant/index.js b/app/constant/index.js
@@ -22,6 +22,7 @@ exports.E_RUNTIME_TEST_MILESTONE = "runtimeTestMilestone";
 exports.E_RUNTIME_TEST_ERROR = "runtimeTestError";
 exports.E_SHOW_CONFIRM_DIALOG = "showConfirmDialog";
 exports.E_CONFIRM_DIALOG_VALUE = "confirmDialogValue";
+exports.E_ENTITY_CREATED = "entityCreated";
 
 exports.E_FILE_NAVIGATOR_UPDATED = "fileNavigatorUpdated";
 exports.E_WATCH_FILE_NAVIGATOR = "watchFileNavigator";

diff --git a/src/__e2e__/lib/constants.js b/src/__e2e__/lib/constants.js
@@ -5,5 +5,5 @@ exports.MODAL_NEW_PROJECT = `.c-new-project-modal`;
 exports.MODAL_NEW_SUITE = `.c-new-suite-modal`;
 exports.ACTIVE_EDITABLE_ROW = `.ant-form.ant-form-horizontal.cell-form`;
 exports.EDITABLE_ROW_SUBMIT_BTN = `.ant-btn.ant-btn-primary`;
-exports.EDITABLE_ROW_EXPAND_ICON = `.ant-table-row-expand-icon.ant-table-row-collapsed`;
+exports.EDITABLE_ROW_EXPAND_ICON = `.ant-table-row-expand-icon.ant-table-row-collapsed`; // ant-table-row-expand-icon ant-table-row-expanded
 exports.MENU_ITEM_DISABLED_CLS = "ant-menu-item-disabled";
diff --git a/src/__e2e__/specs/mainNav.spec.js b/src/__e2e__/specs/mainNav.spec.js
@@ -23,7 +23,9 @@ describe( "Main Navigation", () => {
   describe( "When no project is open", () => {
 
     test( "check items availability", async () => {
-
+      // update component
+      await ctx.client.moveToObject( "#cMainMenuFile" );
+
       await ctx.expectMenuItemsAvailable({
         "#cMainMenuNewProject": true,
         "#cMainMenuNewSuite": false,

diff --git a/src/__e2e__/specs/newProject.spec.js b/src/__e2e__/specs/newProject.spec.js
@@ -120,8 +120,10 @@ describe( "New Project", () => {
   });
 
   test( "expand group", async() => {
-    await ctx.client.click( `#cGroupTable ${ S.EDITABLE_ROW_EXPAND_ICON }` );
-    await ctx.screenshot( "group-expanded" );
+    if ( !await ctx.client.isExisting( `#cTestTableAddBtn` ) ) {
+      await ctx.client.click( `#cGroupTable ${ S.EDITABLE_ROW_EXPAND_ICON }` );
+      await ctx.screenshot( "group-expanded" );
+    }
   });
 
   test( "add a test", async() => {
@@ -136,9 +138,11 @@ describe( "New Project", () => {
   });
 
   test( "expand test", async() => {
-    await ctx.client.click( `#cTestTable ${ S.EDITABLE_ROW_EXPAND_ICON }` );
-    await ctx.screenshot( "test-expanded" );
-    await ctx.client.pause( 200 );
+    if ( !await ctx.client.isExisting( `#cCommandTableAddBtn` ) ) {
+      await ctx.client.click( `#cTestTable ${ S.EDITABLE_ROW_EXPAND_ICON }` );
+      await ctx.screenshot( "test-expanded" );
+      await ctx.client.pause( 200 );
+    }
   });
 
   test( "add a command", async() => {

diff --git a/src/component/AppLayout/Main/GroupTable.jsx b/src/component/AppLayout/Main/GroupTable.jsx
@@ -86,7 +86,6 @@ export class GroupTable extends AbstractEditableTable {
             dataSource={ groups }
             columns={this.columns}
             pagination={false}
-            expandRowByClick={ true }
             onExpand={this.onExpand}
             expandedRowRender={ this.renderExpandedTable }
             footer={() => ( <Button

diff --git a/src/component/AppLayout/Main/GroupTable/TestTable.jsx b/src/component/AppLayout/Main/GroupTable/TestTable.jsx
@@ -87,7 +87,6 @@ export class TestTable extends AbstractEditableTable {
           rowClassName={ this.onRowClassName }
           expandedRowRender={ this.renderExpandedTable }
           defaultExpandedRowKeys={ expanded }
-          expandRowByClick={ true }
           showHeader={ false }
           dataSource={ tests }
           columns={ this.columns }