@oracle/oraclejet-webdriver 11.0.1 → 11.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +44 -11
- package/elements/OjWebElement.js +23 -6
- package/elements/OjWebElement.js.map +1 -1
- package/elements/OjWebElement.ts +23 -6
- package/elements/oj-data-grid/OjDataGrid.js +1 -1
- package/elements/oj-data-grid/OjDataGrid.ts +1 -1
- package/elements/oj-list-view/OjListView.js +2 -0
- package/elements/oj-list-view/OjListView.js.map +1 -1
- package/elements/oj-list-view/OjListView.ts +4 -0
- package/elements/oj-table/OjTableBase.ts +16 -0
- package/elements/oj-timeline/OjTimelineBase.js +3 -0
- package/elements/oj-timeline/OjTimelineBase.js.map +1 -1
- package/elements/oj-timeline/OjTimelineBase.ts +30 -0
- package/index.js +3 -6
- package/index.js.map +1 -1
- package/index.ts +3 -6
- package/lib/Expectation.js.map +1 -1
- package/lib/Expectation.ts +1 -2
- package/lib/driver-override.js +13 -3
- package/lib/driver-override.js.map +1 -1
- package/lib/driver-override.ts +13 -3
- package/lib/input-utils.js +11 -1
- package/lib/input-utils.js.map +1 -1
- package/lib/input-utils.ts +15 -5
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -1,20 +1,53 @@
|
|
|
1
1
|
# Oracle JET Component WebElements
|
|
2
|
-
|
|
2
|
+
oraclejet-webdriver is a UI automation library built on top of
|
|
3
|
+
[selenium-webdriver](https://www.selenium.dev/selenium/docs/api/javascript/), and
|
|
4
|
+
designed to work with [Oracle JET](https://www.npmjs.com/package/@oracle/oraclejet)-based applications.
|
|
3
5
|
|
|
6
|
+
## Installation
|
|
7
|
+
```bash
|
|
8
|
+
npm install @oracle/oraclejet-webdriver
|
|
9
|
+
```
|
|
10
|
+
## Usage
|
|
11
|
+
The library is available with type definitions so that tests can be authored in
|
|
12
|
+
[TypeScript](https://www.npmjs.com/package/typescript).
|
|
13
|
+
|
|
14
|
+
The root package has a default export, conventionally named
|
|
15
|
+
[ojwd](https://www.oracle.com/webfolder/technetwork/jet/wdtsdoc/globals.html#ojwd).
|
|
16
|
+
There are other named exports, such as
|
|
17
|
+
[DriverManager](https://www.oracle.com/webfolder/technetwork/jet/wdtsdoc/classes/drivermanager.html).
|
|
4
18
|
```javascript
|
|
5
|
-
import ojwd from '@oracle/oraclejet-webdriver';
|
|
19
|
+
import ojwd, { DriverManager } from '@oracle/oraclejet-webdriver';
|
|
6
20
|
import { ojInputText } from '@oracle/oraclejet-webdriver/elements';
|
|
21
|
+
import { By, WebDriver } from 'selenium-webdriver';
|
|
7
22
|
|
|
8
23
|
describe('My suite of tests', function() {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
24
|
+
let driver: WebDriver;
|
|
25
|
+
|
|
26
|
+
before(async function() {
|
|
27
|
+
driver = await DriverManager.getDriver();
|
|
28
|
+
await ojwd.get(driver, 'http://myapp.com/');
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
it('changes an <oj-input-text> value', async function() {
|
|
32
|
+
const input = await ojInputText(driver, By.id('text-input-1'));
|
|
33
|
+
await input.changeValue('...');
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
after(function() {
|
|
37
|
+
DriverManager.releaseDriver(driver);
|
|
38
|
+
});
|
|
39
|
+
});
|
|
14
40
|
```
|
|
15
|
-
##
|
|
41
|
+
## Compatibility
|
|
42
|
+
It's important to use the same version of oraclejet-webdriver which matches your
|
|
43
|
+
oraclejet. If the versions differ, the library will throw an exception upon opening
|
|
44
|
+
the page and a console error will be logged.
|
|
45
|
+
|
|
46
|
+
### Dependencies
|
|
47
|
+
These dependencies aren't automatically installed, so you should make sure the
|
|
48
|
+
correct versions are installed.
|
|
16
49
|
- [selenium-webdriver 3.6.0](https://www.npmjs.com/package/selenium-webdriver/v/3.6.0)
|
|
17
|
-
- NodeJS
|
|
18
|
-
- TypeScript 4+
|
|
50
|
+
- NodeJS v12+ LTS
|
|
19
51
|
|
|
20
|
-
|
|
52
|
+
## Documentation
|
|
53
|
+
https://www.oracle.com/webfolder/technetwork/jet/wdtsdoc/index.html
|
package/elements/OjWebElement.js
CHANGED
|
@@ -135,10 +135,28 @@ class OjWebElement extends selenium_webdriver_1.WebElement {
|
|
|
135
135
|
}
|
|
136
136
|
const remoteScript = `
|
|
137
137
|
const done = arguments[0];
|
|
138
|
+
function waitOn(Context) {
|
|
139
|
+
if (Context) {
|
|
140
|
+
Context.getPageContext().getBusyContext()
|
|
141
|
+
.whenReady().then(() => done())
|
|
142
|
+
.catch(ex => done(ex.message))
|
|
143
|
+
} else {
|
|
144
|
+
notFound();
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
function notFound() {
|
|
148
|
+
done('ojs/ojcontext module not found')
|
|
149
|
+
}
|
|
138
150
|
if (typeof require === 'function') {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
151
|
+
let Context;
|
|
152
|
+
// Try sync require first
|
|
153
|
+
try {
|
|
154
|
+
Context = require('ojs/ojcontext');
|
|
155
|
+
} catch (ex) {
|
|
156
|
+
require(['ojs/ojcontext'], waitOn, notFound);
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
waitOn(Context);
|
|
142
160
|
} else {
|
|
143
161
|
done('RequireJS not found')
|
|
144
162
|
}
|
|
@@ -147,9 +165,8 @@ class OjWebElement extends selenium_webdriver_1.WebElement {
|
|
|
147
165
|
.executeAsyncScript(remoteScript)
|
|
148
166
|
.catch(async (ex) => {
|
|
149
167
|
const openStates = await this.getDriver().executeScript(`
|
|
150
|
-
return require('ojs/ojcontext')
|
|
151
|
-
|
|
152
|
-
.map((state) => state.description);
|
|
168
|
+
return require('ojs/ojcontext').getPageContext().getBusyContext().getBusyStates()
|
|
169
|
+
.map((state) => state.description)
|
|
153
170
|
`).catch(ex => ex.message);
|
|
154
171
|
console.warn(`${ex.message}\nopen busy states: ${openStates}`);
|
|
155
172
|
throw Error(`BusyContext.whenReady() timed out: ${ex.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjWebElement.js","sourceRoot":"","sources":["OjWebElement.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OjWebElement.js","sourceRoot":"","sources":["OjWebElement.ts"],"names":[],"mappings":"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"}
|
package/elements/OjWebElement.ts
CHANGED
|
@@ -417,10 +417,28 @@ export class OjWebElement extends WebElement {
|
|
|
417
417
|
}
|
|
418
418
|
const remoteScript = `
|
|
419
419
|
const done = arguments[0];
|
|
420
|
+
function waitOn(Context) {
|
|
421
|
+
if (Context) {
|
|
422
|
+
Context.getPageContext().getBusyContext()
|
|
423
|
+
.whenReady().then(() => done())
|
|
424
|
+
.catch(ex => done(ex.message))
|
|
425
|
+
} else {
|
|
426
|
+
notFound();
|
|
427
|
+
}
|
|
428
|
+
}
|
|
429
|
+
function notFound() {
|
|
430
|
+
done('ojs/ojcontext module not found')
|
|
431
|
+
}
|
|
420
432
|
if (typeof require === 'function') {
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
433
|
+
let Context;
|
|
434
|
+
// Try sync require first
|
|
435
|
+
try {
|
|
436
|
+
Context = require('ojs/ojcontext');
|
|
437
|
+
} catch (ex) {
|
|
438
|
+
require(['ojs/ojcontext'], waitOn, notFound);
|
|
439
|
+
return;
|
|
440
|
+
}
|
|
441
|
+
waitOn(Context);
|
|
424
442
|
} else {
|
|
425
443
|
done('RequireJS not found')
|
|
426
444
|
}
|
|
@@ -429,9 +447,8 @@ export class OjWebElement extends WebElement {
|
|
|
429
447
|
.executeAsyncScript(remoteScript)
|
|
430
448
|
.catch(async (ex) => {
|
|
431
449
|
const openStates = await this.getDriver().executeScript(`
|
|
432
|
-
return require('ojs/ojcontext')
|
|
433
|
-
|
|
434
|
-
.map((state) => state.description);
|
|
450
|
+
return require('ojs/ojcontext').getPageContext().getBusyContext().getBusyStates()
|
|
451
|
+
.map((state) => state.description)
|
|
435
452
|
`).catch(ex => ex.message);
|
|
436
453
|
console.warn(`${ex.message}\nopen busy states: ${openStates}`);
|
|
437
454
|
throw Error(`BusyContext.whenReady() timed out: ${ex.message}`);
|
|
@@ -175,7 +175,7 @@ class OjDataGrid extends OjDataGridBase_1.OjDataGridBase {
|
|
|
175
175
|
var level = arguments[2];
|
|
176
176
|
var done = arguments[3];
|
|
177
177
|
require([\'ojs/ojcore\'], function(oj) {
|
|
178
|
-
let labels = element.querySelectorAll('.oj-datagrid-' + axis.replace('End', '-end') + '-label')
|
|
178
|
+
let labels = element.querySelectorAll('.oj-datagrid-' + axis.replace('End', '-end') + '-label');
|
|
179
179
|
let label;
|
|
180
180
|
for (let i = 0; i < labels.length; i++) {
|
|
181
181
|
var labelContext = labels[i]["data-oj-cellContext"];
|
|
@@ -240,7 +240,7 @@ export class OjDataGrid extends OjDataGridBase {
|
|
|
240
240
|
var level = arguments[2];
|
|
241
241
|
var done = arguments[3];
|
|
242
242
|
require([\'ojs/ojcore\'], function(oj) {
|
|
243
|
-
let labels = element.querySelectorAll('.oj-datagrid-' + axis.replace('End', '-end') + '-label')
|
|
243
|
+
let labels = element.querySelectorAll('.oj-datagrid-' + axis.replace('End', '-end') + '-label');
|
|
244
244
|
let label;
|
|
245
245
|
for (let i = 0; i < labels.length; i++) {
|
|
246
246
|
var labelContext = labels[i]["data-oj-cellContext"];
|
|
@@ -5,6 +5,7 @@ const OjListViewBase_1 = require("./OjListViewBase");
|
|
|
5
5
|
const __1 = require("../../");
|
|
6
6
|
class OjListView extends OjListViewBase_1.OjListViewBase {
|
|
7
7
|
async findItem(itemLocator) {
|
|
8
|
+
await this.setProperty('scrollToKey', 'always');
|
|
8
9
|
await this.changeScrollPosition({
|
|
9
10
|
key: itemLocator.key,
|
|
10
11
|
index: undefined,
|
|
@@ -14,6 +15,7 @@ class OjListView extends OjListViewBase_1.OjListViewBase {
|
|
|
14
15
|
x: undefined,
|
|
15
16
|
y: undefined
|
|
16
17
|
});
|
|
18
|
+
await this.whenBusyContextReady();
|
|
17
19
|
const el = await this.getDriver().executeScript(`
|
|
18
20
|
return arguments[0].getNodeBySubId({ subId: 'oj-listview-item', key: ${JSON.stringify(itemLocator.key)} })
|
|
19
21
|
.querySelector('[role=gridcell]')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjListView.js","sourceRoot":"","sources":["OjListView.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,8BAA8C;AAU9C,MAAa,UAAW,SAAQ,+BAAc;IAK5C,KAAK,CAAC,QAAQ,CAAI,WAAuB;QAGvC,MAAM,IAAI,CAAC,oBAAoB,CAAC;YAC9B,GAAG,EAAE,WAAW,CAAC,GAAG;YAEpB,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,SAAS;YACjB,CAAC,EAAE,SAAS;YACZ,CAAC,EAAE,SAAS;SACb,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAa;2EACW,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC;;KAErG,EAAE,IAAI,CAAC,CAAC;QACT,OAAO,aAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"OjListView.js","sourceRoot":"","sources":["OjListView.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,8BAA8C;AAU9C,MAAa,UAAW,SAAQ,+BAAc;IAK5C,KAAK,CAAC,QAAQ,CAAI,WAAuB;QAGvC,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAGhD,MAAM,IAAI,CAAC,oBAAoB,CAAC;YAC9B,GAAG,EAAE,WAAW,CAAC,GAAG;YAEpB,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,SAAS;YACjB,CAAC,EAAE,SAAS;YACZ,CAAC,EAAE,SAAS;SACb,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAa;2EACW,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC;;KAErG,EAAE,IAAI,CAAC,CAAC;QACT,OAAO,aAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;AA5BD,gCA4BC"}
|
|
@@ -15,6 +15,9 @@ export class OjListView extends OjListViewBase {
|
|
|
15
15
|
* @param key The key within the Collection's dataset associated with the item.
|
|
16
16
|
*/
|
|
17
17
|
async findItem<T>(itemLocator: { key: T }): Promise<SlotProxy> {
|
|
18
|
+
// explicitly override scrollToKey to ensure changeScrollPosition regardless
|
|
19
|
+
// of DataProvider or existing scrollToKey value
|
|
20
|
+
await this.setProperty('scrollToKey', 'always');
|
|
18
21
|
// Call changeScrollPosition to scroll the row into view and ensure it's
|
|
19
22
|
// rendere in DOM
|
|
20
23
|
await this.changeScrollPosition({
|
|
@@ -27,6 +30,7 @@ export class OjListView extends OjListViewBase {
|
|
|
27
30
|
x: undefined,
|
|
28
31
|
y: undefined
|
|
29
32
|
});
|
|
33
|
+
await this.whenBusyContextReady();
|
|
30
34
|
const el = await this.getDriver().executeScript<WebElement>(`
|
|
31
35
|
return arguments[0].getNodeBySubId({ subId: 'oj-listview-item', key: ${JSON.stringify(itemLocator.key)} })
|
|
32
36
|
.querySelector('[role=gridcell]')
|
|
@@ -668,6 +668,10 @@ namespace OjTableBase {
|
|
|
668
668
|
* Label for the top selection affordance on touch devices.
|
|
669
669
|
*/
|
|
670
670
|
"labelAccSelectionAffordanceTop": string;
|
|
671
|
+
/**
|
|
672
|
+
* Provides properties to customize the resize column input label.
|
|
673
|
+
*/
|
|
674
|
+
"labelColumnWidth": string;
|
|
671
675
|
/**
|
|
672
676
|
* Provides properties to customize the context menu label for exiting non-contiguous selection.
|
|
673
677
|
*/
|
|
@@ -684,6 +688,18 @@ namespace OjTableBase {
|
|
|
684
688
|
* Provides properties to customize the context menu label for column resize.
|
|
685
689
|
*/
|
|
686
690
|
"labelResize": string;
|
|
691
|
+
/**
|
|
692
|
+
* Provides properties to customize the context menu label for column resize.
|
|
693
|
+
*/
|
|
694
|
+
"labelResizeColumn": string;
|
|
695
|
+
/**
|
|
696
|
+
* Provides properties to customize the resize dialog title.
|
|
697
|
+
*/
|
|
698
|
+
"labelResizeColumnDialog": string;
|
|
699
|
+
/**
|
|
700
|
+
* Provides properties to customize the resize dialog apply button label.
|
|
701
|
+
*/
|
|
702
|
+
"labelResizeDialogApply": string;
|
|
687
703
|
/**
|
|
688
704
|
* Provides properties to customize the resize popup cancel button.
|
|
689
705
|
*/
|
|
@@ -63,6 +63,9 @@ class OjTimelineBase extends __1.OjWebElement {
|
|
|
63
63
|
getViewportEnd() {
|
|
64
64
|
return this.getProperty("viewportEnd");
|
|
65
65
|
}
|
|
66
|
+
getViewportNavigationMode() {
|
|
67
|
+
return this.getProperty("viewportNavigationMode");
|
|
68
|
+
}
|
|
66
69
|
getViewportStart() {
|
|
67
70
|
return this.getProperty("viewportStart");
|
|
68
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjTimelineBase.js","sourceRoot":"","sources":["OjTimelineBase.ts"],"names":[],"mappings":";;;AAAA,2BAAiC;AASjC,MAAa,cAAe,SAAQ,gBAAY;IAOvC,wBAAwB;QAC7B,OAAO,IAAI,CAAC,WAAW,CAAS,uBAAuB,CAAC,CAAC;IAC3D,CAAC;IAQM,qBAAqB;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAS,oBAAoB,CAAC,CAAC;IACxD,CAAC;IAQM,OAAO;QACZ,OAAO,IAAI,CAAC,WAAW,CAAS,MAAM,CAAC,CAAC;IAC1C,CAAC;IAQM,MAAM;QACX,OAAO,IAAI,CAAC,WAAW,CAAS,KAAK,CAAC,CAAC;IACzC,CAAC;IAQM,YAAY;QACjB,OAAO,IAAI,CAAC,WAAW,CAA2B,WAAW,CAAC,CAAC;IACjE,CAAC;IAQM,YAAY;QACjB,OAAO,IAAI,CAAC,WAAW,CAA2B,WAAW,CAAC,CAAC;IACjE,CAAC;IAQM,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAS,aAAa,CAAC,CAAC;IACjD,CAAC;IAQM,WAAW;QAChB,OAAO,IAAI,CAAC,WAAW,CAA0B,UAAU,CAAC,CAAC;IAC/D,CAAC;IAQM,mBAAmB;QACxB,OAAO,IAAI,CAAC,WAAW,CAAyC,kBAAkB,CAAC,CAAC;IACtF,CAAC;IAQM,eAAe,CAAC,SAAqB;QAC1C,OAAO,IAAI,CAAC,WAAW,CAAa,WAAW,EAAE,SAAS,CAAC,CAAC;IAC9D,CAAC;IAQM,YAAY;QACjB,OAAO,IAAI,CAAC,WAAW,CAAa,WAAW,CAAC,CAAC;IACnD,CAAC;IAQM,gBAAgB;QACrB,OAAO,IAAI,CAAC,WAAW,CAAS,eAAe,CAAC,CAAC;IACnD,CAAC;IAQM,SAAS;QACd,OAAO,IAAI,CAAC,WAAW,CAAoC,QAAQ,CAAC,CAAC;IACvE,CAAC;IAQM,QAAQ;QACb,OAAO,IAAI,CAAC,WAAW,CAAS,OAAO,CAAC,CAAC;IAC3C,CAAC;IAQM,gBAAgB;QACrB,OAAO,IAAI,CAAC,WAAW,CAA+B,eAAe,CAAC,CAAC;IACzE,CAAC;IAQM,UAAU;QACf,OAAO,IAAI,CAAC,WAAW,CAAyB,SAAS,CAAC,CAAC;IAC7D,CAAC;IAQM,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAS,aAAa,CAAC,CAAC;IACjD,CAAC;IAQM,eAAe;QACpB,OAAO,IAAI,CAAC,WAAW,CAAmC,cAAc,CAAC,CAAC;IAC5E,CAAC;IAQM,eAAe;QACpB,OAAO,IAAI,CAAC,WAAW,CAA8B,cAAc,CAAC,CAAC;IACvE,CAAC;IAQM,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAS,aAAa,CAAC,CAAC;IACjD,CAAC;IAQM,gBAAgB;QACrB,OAAO,IAAI,CAAC,WAAW,CAAS,eAAe,CAAC,CAAC;IACnD,CAAC;CAEF;
|
|
1
|
+
{"version":3,"file":"OjTimelineBase.js","sourceRoot":"","sources":["OjTimelineBase.ts"],"names":[],"mappings":";;;AAAA,2BAAiC;AASjC,MAAa,cAAe,SAAQ,gBAAY;IAOvC,wBAAwB;QAC7B,OAAO,IAAI,CAAC,WAAW,CAAS,uBAAuB,CAAC,CAAC;IAC3D,CAAC;IAQM,qBAAqB;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAS,oBAAoB,CAAC,CAAC;IACxD,CAAC;IAQM,OAAO;QACZ,OAAO,IAAI,CAAC,WAAW,CAAS,MAAM,CAAC,CAAC;IAC1C,CAAC;IAQM,MAAM;QACX,OAAO,IAAI,CAAC,WAAW,CAAS,KAAK,CAAC,CAAC;IACzC,CAAC;IAQM,YAAY;QACjB,OAAO,IAAI,CAAC,WAAW,CAA2B,WAAW,CAAC,CAAC;IACjE,CAAC;IAQM,YAAY;QACjB,OAAO,IAAI,CAAC,WAAW,CAA2B,WAAW,CAAC,CAAC;IACjE,CAAC;IAQM,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAS,aAAa,CAAC,CAAC;IACjD,CAAC;IAQM,WAAW;QAChB,OAAO,IAAI,CAAC,WAAW,CAA0B,UAAU,CAAC,CAAC;IAC/D,CAAC;IAQM,mBAAmB;QACxB,OAAO,IAAI,CAAC,WAAW,CAAyC,kBAAkB,CAAC,CAAC;IACtF,CAAC;IAQM,eAAe,CAAC,SAAqB;QAC1C,OAAO,IAAI,CAAC,WAAW,CAAa,WAAW,EAAE,SAAS,CAAC,CAAC;IAC9D,CAAC;IAQM,YAAY;QACjB,OAAO,IAAI,CAAC,WAAW,CAAa,WAAW,CAAC,CAAC;IACnD,CAAC;IAQM,gBAAgB;QACrB,OAAO,IAAI,CAAC,WAAW,CAAS,eAAe,CAAC,CAAC;IACnD,CAAC;IAQM,SAAS;QACd,OAAO,IAAI,CAAC,WAAW,CAAoC,QAAQ,CAAC,CAAC;IACvE,CAAC;IAQM,QAAQ;QACb,OAAO,IAAI,CAAC,WAAW,CAAS,OAAO,CAAC,CAAC;IAC3C,CAAC;IAQM,gBAAgB;QACrB,OAAO,IAAI,CAAC,WAAW,CAA+B,eAAe,CAAC,CAAC;IACzE,CAAC;IAQM,UAAU;QACf,OAAO,IAAI,CAAC,WAAW,CAAyB,SAAS,CAAC,CAAC;IAC7D,CAAC;IAQM,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAS,aAAa,CAAC,CAAC;IACjD,CAAC;IAQM,eAAe;QACpB,OAAO,IAAI,CAAC,WAAW,CAAmC,cAAc,CAAC,CAAC;IAC5E,CAAC;IAQM,eAAe;QACpB,OAAO,IAAI,CAAC,WAAW,CAA8B,cAAc,CAAC,CAAC;IACvE,CAAC;IAQM,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAS,aAAa,CAAC,CAAC;IACjD,CAAC;IAQM,yBAAyB;QAC9B,OAAO,IAAI,CAAC,WAAW,CAAS,wBAAwB,CAAC,CAAC;IAC5D,CAAC;IAQM,gBAAgB;QACrB,OAAO,IAAI,CAAC,WAAW,CAAS,eAAe,CAAC,CAAC;IACnD,CAAC;CAEF;AA7ND,wCA6NC"}
|
|
@@ -208,6 +208,16 @@ export class OjTimelineBase extends OjWebElement {
|
|
|
208
208
|
return this.getProperty<string>("viewportEnd");
|
|
209
209
|
}
|
|
210
210
|
|
|
211
|
+
/**
|
|
212
|
+
* Gets the value of viewportNavigationMode property.
|
|
213
|
+
* The viewport navigation mode of the timeline.
|
|
214
|
+
* @return The value of viewportNavigationMode property.
|
|
215
|
+
*
|
|
216
|
+
*/
|
|
217
|
+
public getViewportNavigationMode(): Promise<string> {
|
|
218
|
+
return this.getProperty<string>("viewportNavigationMode");
|
|
219
|
+
}
|
|
220
|
+
|
|
211
221
|
/**
|
|
212
222
|
* Gets the value of viewportStart property.
|
|
213
223
|
* The start time of the timeline's viewport. See the Help documentation for more information.
|
|
@@ -534,6 +544,14 @@ namespace OjTimelineBase {
|
|
|
534
544
|
* Used to describe the data visualization type for accessibility.
|
|
535
545
|
*/
|
|
536
546
|
"componentName": string;
|
|
547
|
+
/**
|
|
548
|
+
* Used for the discrete navigation mode next arrow aria-label.
|
|
549
|
+
*/
|
|
550
|
+
"labelAccNavNextPage": string;
|
|
551
|
+
/**
|
|
552
|
+
* Used for the discrete navigation mode previous arrow aria-label.
|
|
553
|
+
*/
|
|
554
|
+
"labelAccNavPreviousPage": string;
|
|
537
555
|
/**
|
|
538
556
|
* Used to display a label and its value.
|
|
539
557
|
*/
|
|
@@ -582,6 +600,10 @@ namespace OjTimelineBase {
|
|
|
582
600
|
* Used for the default tooltip label for item title information.
|
|
583
601
|
*/
|
|
584
602
|
"labelTitle": string;
|
|
603
|
+
/**
|
|
604
|
+
* Used for the discrete navigation mode arrow ariaLabel text when disabled.
|
|
605
|
+
*/
|
|
606
|
+
"navArrowDisabledState": string;
|
|
585
607
|
/**
|
|
586
608
|
* Used to describe the collapsed state for accessibility.
|
|
587
609
|
*/
|
|
@@ -622,6 +644,14 @@ namespace OjTimelineBase {
|
|
|
622
644
|
* Used to describe the visible state for accessibility.
|
|
623
645
|
*/
|
|
624
646
|
"stateVisible": string;
|
|
647
|
+
/**
|
|
648
|
+
* Used for the discrete navigation mode next arrow alt text.
|
|
649
|
+
*/
|
|
650
|
+
"tipArrowNextPage": string;
|
|
651
|
+
/**
|
|
652
|
+
* Used for the discrete navigation mode previous arrow alt text.
|
|
653
|
+
*/
|
|
654
|
+
"tipArrowPreviousPage": string;
|
|
625
655
|
/**
|
|
626
656
|
* Used for the zoom in tooltip.
|
|
627
657
|
*/
|
package/index.js
CHANGED
|
@@ -120,12 +120,9 @@ const ojwd = {
|
|
|
120
120
|
}
|
|
121
121
|
catch (ex) {
|
|
122
122
|
if (ex instanceof selenium_webdriver_1.error.TimeoutError || ex instanceof selenium_webdriver_1.error.ScriptTimeoutError) {
|
|
123
|
-
const openStates = await driver.
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
done(Context.getPageContext().getBusyContext().getBusyStates()
|
|
127
|
-
.map((state) => state.description));
|
|
128
|
-
}, done);
|
|
123
|
+
const openStates = await driver.executeScript(`
|
|
124
|
+
return require('ojs/ojcontext').getPageContext().getBusyContext().getBusyStates()
|
|
125
|
+
.map((state) => state.description)
|
|
129
126
|
`).catch(ex => ex.message);
|
|
130
127
|
ex.message += ` - open busy states: ${openStates}`;
|
|
131
128
|
}
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAGA,2DAQ4B;AAI5B,yDAAiD;AAAxC,2GAAA,QAAQ,OAAA;AACjB,uDAAqD;AAA5C,+GAAA,aAAa,OAAA;AACtB,2CAMuB;AAGvB,8CAA8C;AAC/B,+BAAiB;AAGhC,mDAAgD;AACvC,4FADA,yBAAW,OACA;AAEpB,+CAAwD;AAApC,uGAAA,SAAS,OAAA;AAkC7B,SAAS,SAAS;IAChB,OAAO,IAAI,8BAAS,CAAmB,gCAAgC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAGxF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,aAAa,CAAgC;;;KAGtE,CAAC,CAAC;QACH,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE;YAChC,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SAC/B;QAID,MAAM,YAAY,GAAG;;;;;;;;;KASpB,CAAC;QACF,OAAO,MAAM,CAAC,kBAAkB,CAAU,YAAY,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC;AAMD,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDrB,CAAC;AAWF,KAAK,UAAU,aAAa,CAAC,MAAiB;IAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;IAClC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,aAAa,CAAsC;;GAE3E,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,UAAU,CAAC;IAC9B,IAEE,CAAC,CAAC,OAAO,KAAK,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE9C,CAAC,OAAO,KAAK,GAAG,CAAC,OAAO,IAAI,GAAG,KAAK,GAAG,CAAC,QAAQ,CAAC,EAAE;QACnD,MAAM,QAAQ,GAAG,+BAA+B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,sCAAsC,OAAO,mBAAmB,GAAG,IAAI,CAAC;QAC3I,OAAO,CAAC,IAAI,CAAC;;EAEf,QAAQ;KACL,CAAC,CAAC;QACH,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;KACvB;AACH,CAAC;AAWD,MAAM,IAAI,GAAG;IAYX,KAAK,CAAC,GAAG,CAAC,MAAiB,EAAE,GAAW;QACtC,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;QACrD,IAAI;YACF,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAClD,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;SAC7B;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,YAAY,0BAAK,CAAC,YAAY,IAAI,EAAE,YAAY,0BAAK,CAAC,kBAAkB,EAAE;gBAC9E,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/index.ts
CHANGED
|
@@ -215,12 +215,9 @@ const ojwd = {
|
|
|
215
215
|
await checkVersions(driver);
|
|
216
216
|
} catch (ex) {
|
|
217
217
|
if (ex instanceof error.TimeoutError || ex instanceof error.ScriptTimeoutError) {
|
|
218
|
-
const openStates = await driver.
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
done(Context.getPageContext().getBusyContext().getBusyStates()
|
|
222
|
-
.map((state) => state.description));
|
|
223
|
-
}, done);
|
|
218
|
+
const openStates = await driver.executeScript<string[]>(`
|
|
219
|
+
return require('ojs/ojcontext').getPageContext().getBusyContext().getBusyStates()
|
|
220
|
+
.map((state) => state.description)
|
|
224
221
|
`).catch(ex => ex.message);
|
|
225
222
|
ex.message += ` - open busy states: ${openStates}`;
|
|
226
223
|
}
|
package/lib/Expectation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Expectation.js","sourceRoot":"","sources":["Expectation.ts"],"names":[],"mappings":";;;AAUA,MAAM,WAAW;
|
|
1
|
+
{"version":3,"file":"Expectation.js","sourceRoot":"","sources":["Expectation.ts"],"names":[],"mappings":"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"}
|
package/lib/Expectation.ts
CHANGED
|
@@ -16,8 +16,7 @@ class Expectation<T = any> {
|
|
|
16
16
|
|
|
17
17
|
/**
|
|
18
18
|
* Create an Expectation to be evaluated on the client against the underlying
|
|
19
|
-
* data model.
|
|
20
|
-
* for details and examples.
|
|
19
|
+
* data model.
|
|
21
20
|
* @param expression An expression statement to be evaluated for this Expectation
|
|
22
21
|
* against the underlying viewmodel/page var
|
|
23
22
|
*/
|
package/lib/driver-override.js
CHANGED
|
@@ -101,9 +101,19 @@ async function isJetPage(driver) {
|
|
|
101
101
|
try {
|
|
102
102
|
lastIsJetPage = await driver.executeAsyncScript(`
|
|
103
103
|
const done = arguments[0];
|
|
104
|
-
require
|
|
105
|
-
|
|
106
|
-
|
|
104
|
+
if (typeof require === 'function') {
|
|
105
|
+
require(["ojs/ojcontext"], function(Context) {
|
|
106
|
+
if (Context) {
|
|
107
|
+
Context.getPageContext().getBusyContext()
|
|
108
|
+
.whenReady().then(done)
|
|
109
|
+
.catch(ex => done(true))
|
|
110
|
+
} else {
|
|
111
|
+
done(false);
|
|
112
|
+
}
|
|
113
|
+
}, function(err) { done(false) })
|
|
114
|
+
} else {
|
|
115
|
+
done(false);
|
|
116
|
+
}
|
|
107
117
|
`);
|
|
108
118
|
}
|
|
109
119
|
catch (ex) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver-override.js","sourceRoot":"","sources":["driver-override.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"driver-override.js","sourceRoot":"","sources":["driver-override.ts"],"names":[],"mappings":"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"}
|
package/lib/driver-override.ts
CHANGED
|
@@ -215,9 +215,19 @@ async function isJetPage(driver: WebDriver): Promise<boolean> {
|
|
|
215
215
|
// completed. Catch BC timeout and also return true.
|
|
216
216
|
lastIsJetPage = await driver.executeAsyncScript<boolean>(`
|
|
217
217
|
const done = arguments[0];
|
|
218
|
-
require
|
|
219
|
-
|
|
220
|
-
|
|
218
|
+
if (typeof require === 'function') {
|
|
219
|
+
require(["ojs/ojcontext"], function(Context) {
|
|
220
|
+
if (Context) {
|
|
221
|
+
Context.getPageContext().getBusyContext()
|
|
222
|
+
.whenReady().then(done)
|
|
223
|
+
.catch(ex => done(true))
|
|
224
|
+
} else {
|
|
225
|
+
done(false);
|
|
226
|
+
}
|
|
227
|
+
}, function(err) { done(false) })
|
|
228
|
+
} else {
|
|
229
|
+
done(false);
|
|
230
|
+
}
|
|
221
231
|
`);
|
|
222
232
|
} catch (ex) {
|
|
223
233
|
// If timeout exception, then script timed out waiting on BusyContext
|
package/lib/input-utils.js
CHANGED
|
@@ -7,7 +7,17 @@ function mixinChangeValue(clazz) {
|
|
|
7
7
|
value: async function (value) {
|
|
8
8
|
const driver = this.getDriver();
|
|
9
9
|
const input = await this.findElement(selenium_webdriver_1.By.css('.oj-text-field-input'));
|
|
10
|
-
await input.
|
|
10
|
+
const disabled = await input.getProperty('disabled');
|
|
11
|
+
const readOnly = await input.getProperty('readOnly');
|
|
12
|
+
if (disabled || readOnly) {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
let currValue = await input.getProperty('value');
|
|
16
|
+
while (currValue) {
|
|
17
|
+
const backspaces = new Array(currValue.length + 1).join(selenium_webdriver_1.Key.BACK_SPACE);
|
|
18
|
+
await input.sendKeys(backspaces);
|
|
19
|
+
currValue = await input.getProperty('value');
|
|
20
|
+
}
|
|
11
21
|
await input.sendKeys(value);
|
|
12
22
|
return driver.executeAsyncScript(`
|
|
13
23
|
let el = arguments[0];
|
package/lib/input-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input-utils.js","sourceRoot":"","sources":["input-utils.ts"],"names":[],"mappings":";;;AAIA,2DAA6C;AA2B7C,SAAgB,gBAAgB,CAAC,KAA0B;IACzD,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE;QACpD,KAAK,EAAE,KAAK,WAAW,KAAa;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAEhC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"input-utils.js","sourceRoot":"","sources":["input-utils.ts"],"names":[],"mappings":";;;AAIA,2DAA6C;AA2B7C,SAAgB,gBAAgB,CAAC,KAA0B;IACzD,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE;QACpD,KAAK,EAAE,KAAK,WAAW,KAAa;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAEhC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAiB,CAAC;YACrF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,CAAU,UAAU,CAAC,CAAC;YAC9D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,CAAU,UAAU,CAAC,CAAC;YAC9D,IAAI,QAAQ,IAAI,QAAQ,EAAE;gBACxB,OAAO;aACR;YAKD,IAAI,SAAS,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACjD,OAAO,SAAS,EAAE;gBAChB,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAG,CAAC,UAAU,CAAC,CAAC;gBACxE,MAAM,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACjC,SAAS,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;aAC9C;YACD,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAE5B,OAAO,MAAM,CAAC,kBAAkB,CAAC;;;;;;;;OAQhC,EAAE,IAAI,CAAC,CAAC;QACX,CAAC;QACD,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC;AAnCD,4CAmCC"}
|
package/lib/input-utils.ts
CHANGED
|
@@ -35,11 +35,21 @@ export function mixinChangeValue(clazz: typeof OjWebElement) {
|
|
|
35
35
|
const driver = this.getDriver();
|
|
36
36
|
// Find <input> to receive keystrokes
|
|
37
37
|
const input = await this.findElement(By.css('.oj-text-field-input')) as OjWebElement;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
38
|
+
const disabled = await input.getProperty<boolean>('disabled');
|
|
39
|
+
const readOnly = await input.getProperty<boolean>('readOnly');
|
|
40
|
+
if (disabled || readOnly) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
// Note that using clear() sends an update event because WebDriver will
|
|
45
|
+
// blur the field, so send BACKSPACE keys to clear field instead.
|
|
46
|
+
// Clearing the value is done in a loop in case the field's focus is stolen
|
|
47
|
+
let currValue = await input.getProperty('value');
|
|
48
|
+
while (currValue) {
|
|
49
|
+
const backspaces = new Array(currValue.length + 1).join(Key.BACK_SPACE);
|
|
50
|
+
await input.sendKeys(backspaces);
|
|
51
|
+
currValue = await input.getProperty('value');
|
|
52
|
+
}
|
|
43
53
|
await input.sendKeys(value);
|
|
44
54
|
|
|
45
55
|
return driver.executeAsyncScript(`
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oracle/oraclejet-webdriver",
|
|
3
|
-
"version": "11.
|
|
3
|
+
"version": "11.1.4",
|
|
4
4
|
"description": "Oracle JET WebDriverJS WebElements",
|
|
5
5
|
"config": {
|
|
6
|
-
"revision": "2021-
|
|
6
|
+
"revision": "2021-12-22_15-58-53"
|
|
7
7
|
},
|
|
8
8
|
"dependencies": {},
|
|
9
9
|
"devDependencies": {},
|