You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2018/10/15 03:22:39 UTC
ignite git commit: IGNITE-9809 Web console: more minor fixes - Fixes
#4972.
Repository: ignite
Updated Branches:
refs/heads/master e2fb33320 -> 11716dedc
IGNITE-9809 Web console: more minor fixes - Fixes #4972.
Update TestCafe to 0.22.0.
Update confirmation E2E selectors so these work when multiple modals are opened.
Update reduxDevtoolsIntegration.js so it doesn't crash when there's a Promise in action payload.
Fix form-field postfix position in browsers that don't support place-self.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11716ded
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11716ded
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11716ded
Branch: refs/heads/master
Commit: 11716dedca0c884bfe9b6afdc9492ed0a3c6a58a
Parents: e2fb333
Author: Ilya Borisov <kl...@gmail.com>
Authored: Mon Oct 15 10:22:21 2018 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Mon Oct 15 10:22:21 2018 +0700
----------------------------------------------------------------------
modules/web-console/e2e/testcafe/components/confirmation.js | 4 ++--
modules/web-console/e2e/testcafe/package.json | 2 +-
.../app/components/page-configure/reduxDevtoolsIntegration.js | 5 +++++
.../web-console/frontend/app/primitives/form-field/index.scss | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/11716ded/modules/web-console/e2e/testcafe/components/confirmation.js
----------------------------------------------------------------------
diff --git a/modules/web-console/e2e/testcafe/components/confirmation.js b/modules/web-console/e2e/testcafe/components/confirmation.js
index b4fa2b5..cdfdd54 100644
--- a/modules/web-console/e2e/testcafe/components/confirmation.js
+++ b/modules/web-console/e2e/testcafe/components/confirmation.js
@@ -17,10 +17,10 @@
import {Selector, t} from 'testcafe';
-const body = Selector('.modal-body');
+const body = Selector('.modal').withText('Confirmation').find('.modal-body');
const confirmButton = Selector('#confirm-btn-ok');
const cancelButton = Selector('#confirm-btn-cancel');
-const closeButton = Selector('.modal .close');
+const closeButton = Selector('.modal').withText('Confirmation').find('.modal .close');
export const confirmation = {
body,
http://git-wip-us.apache.org/repos/asf/ignite/blob/11716ded/modules/web-console/e2e/testcafe/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/e2e/testcafe/package.json b/modules/web-console/e2e/testcafe/package.json
index 23d1b27..6cba09e 100644
--- a/modules/web-console/e2e/testcafe/package.json
+++ b/modules/web-console/e2e/testcafe/package.json
@@ -33,7 +33,7 @@
"objectid": "3.2.1",
"path": "0.12.7",
"sinon": "2.3.8",
- "testcafe": "0.20.5",
+ "testcafe": "0.22.0",
"testcafe-angular-selectors": "0.3.0",
"testcafe-reporter-teamcity": "1.0.9",
"type-detect": "4.0.3",
http://git-wip-us.apache.org/repos/asf/ignite/blob/11716ded/modules/web-console/frontend/app/components/page-configure/reduxDevtoolsIntegration.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure/reduxDevtoolsIntegration.js b/modules/web-console/frontend/app/components/page-configure/reduxDevtoolsIntegration.js
index 43fa323..f602539 100644
--- a/modules/web-console/frontend/app/components/page-configure/reduxDevtoolsIntegration.js
+++ b/modules/web-console/frontend/app/components/page-configure/reduxDevtoolsIntegration.js
@@ -36,6 +36,11 @@ const replacer = (key, value) => {
__serializedType__: 'Symbol'
};
}
+ if (value instanceof Promise) {
+ return {
+ data: {}
+ };
+ }
return value;
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/11716ded/modules/web-console/frontend/app/primitives/form-field/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/index.scss b/modules/web-console/frontend/app/primitives/form-field/index.scss
index 0330e58..3e757f9 100644
--- a/modules/web-console/frontend/app/primitives/form-field/index.scss
+++ b/modules/web-console/frontend/app/primitives/form-field/index.scss
@@ -259,7 +259,7 @@
&--postfix::after {
content: attr(data-postfix);
display: inline-flex;
- place-self: center;
+ align-self: center;
margin-left: 10px;
}