@serenity-js/protractor 3.0.0-rc.21 → 3.0.0-rc.22
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/CHANGELOG.md +11 -0
- package/lib/screenplay/models/locators/ProtractorLocator.d.ts +1 -0
- package/lib/screenplay/models/locators/ProtractorLocator.js +9 -8
- package/lib/screenplay/models/locators/ProtractorLocator.js.map +1 -1
- package/package.json +10 -10
- package/src/screenplay/models/locators/ProtractorLocator.ts +12 -11
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [3.0.0-rc.22](https://github.com/serenity-js/serenity-js/compare/v3.0.0-rc.21...v3.0.0-rc.22) (2022-07-15)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **web:** improved reliability of PageElementLocator for WebdriverIO and Protractor ([b19d19a](https://github.com/serenity-js/serenity-js/commit/b19d19aedc0d60d4068191e7eb83943b9268e39a)), closes [#805](https://github.com/serenity-js/serenity-js/issues/805)
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
# [3.0.0-rc.21](https://github.com/serenity-js/serenity-js/compare/v3.0.0-rc.20...v3.0.0-rc.21) (2022-07-11)
|
|
7
18
|
|
|
8
19
|
|
|
@@ -6,6 +6,7 @@ export declare class ProtractorLocator extends Locator<protractor.ElementFinder,
|
|
|
6
6
|
constructor(parent: RootLocator<protractor.ElementFinder>, selector: Selector, errorHandler: ProtractorErrorHandler);
|
|
7
7
|
protected nativeSelector(): protractor.Locator;
|
|
8
8
|
nativeElement(): Promise<protractor.ElementFinder>;
|
|
9
|
+
private resolveNativeElement;
|
|
9
10
|
allNativeElements(): Promise<Array<protractor.ElementFinder>>;
|
|
10
11
|
of(parent: ProtractorLocator): Locator<protractor.ElementFinder, protractor.Locator>;
|
|
11
12
|
locate(child: ProtractorLocator): Locator<protractor.ElementFinder, any>;
|
|
@@ -36,20 +36,21 @@ class ProtractorLocator extends web_1.Locator {
|
|
|
36
36
|
}
|
|
37
37
|
throw new core_1.LogicError((0, core_1.f) `${this.selector} is not supported by ${this.constructor.name}`);
|
|
38
38
|
}
|
|
39
|
-
// todo: refactor; lift method to Locator
|
|
40
39
|
async nativeElement() {
|
|
41
|
-
let parent;
|
|
42
40
|
try {
|
|
43
|
-
|
|
44
|
-
const result = await (0, unpromisedWebElement_1.unpromisedWebElement)(parent.element(this.nativeSelector()));
|
|
45
|
-
// checks if the element can be interacted with; in particular, throws unexpected alert present if there is one
|
|
46
|
-
await result.isPresent();
|
|
47
|
-
return result;
|
|
41
|
+
return await this.resolveNativeElement();
|
|
48
42
|
}
|
|
49
43
|
catch (error) {
|
|
50
|
-
return await this.errorHandler.executeIfHandled(error, () =>
|
|
44
|
+
return await this.errorHandler.executeIfHandled(error, () => this.resolveNativeElement());
|
|
51
45
|
}
|
|
52
46
|
}
|
|
47
|
+
async resolveNativeElement() {
|
|
48
|
+
const parent = await this.parent.nativeElement();
|
|
49
|
+
const result = await (0, unpromisedWebElement_1.unpromisedWebElement)(parent.element(this.nativeSelector()));
|
|
50
|
+
// checks if the element can be interacted with; in particular, throws unexpected alert present if there is one
|
|
51
|
+
await result.isPresent();
|
|
52
|
+
return result;
|
|
53
|
+
}
|
|
53
54
|
async allNativeElements() {
|
|
54
55
|
const parent = await this.parent.nativeElement();
|
|
55
56
|
return parent.all(this.nativeSelector());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProtractorLocator.js","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/ProtractorLocator.ts"],"names":[],"mappings":";;;AAAA,4CAAkD;AAClD,0CAAgJ;AAChJ,yCAAyC;AAEzC,qEAAkE;AAElE,oEAAiE;AAGjE,MAAa,iBAAkB,SAAQ,aAAqD;IAExF,YACI,MAA6C,EAC7C,QAAkB,EACD,YAAoC;QAErD,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAFP,iBAAY,GAAZ,YAAY,CAAwB;IAGzD,CAAC;IAED,4EAA4E;IAClE,cAAc;QACpB,IAAI,IAAI,CAAC,QAAQ,YAAY,WAAK,EAAE;YAChC,OAAO,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACjD;QAED,IAAI,IAAI,CAAC,QAAQ,YAAY,eAAS,EAAE;YACpC,IAAI,CAAE,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE;gBAC9B,MAAM,IAAI,iBAAU,CAAC,iOAAiO,CAAC,CAAA;aAC1P;YAED,OAAO,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACpF;QAED,IAAI,IAAI,CAAC,QAAQ,YAAY,yBAAmB,EAAE;YAC9C,OAAO,UAAU,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACnF;QAED,IAAI,IAAI,CAAC,QAAQ,YAAY,UAAI,EAAE;YAC/B,OAAO,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAChD;QAED,IAAI,IAAI,CAAC,QAAQ,YAAY,eAAS,EAAE;YACpC,OAAO,UAAU,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACrD;QAED,IAAI,IAAI,CAAC,QAAQ,YAAY,aAAO,EAAE;YAClC,OAAO,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACnD;QAED,MAAM,IAAI,iBAAU,CAAC,IAAA,QAAC,EAAC,GAAI,IAAI,CAAC,QAAS,wBAAyB,IAAI,CAAC,WAAW,CAAC,IAAK,EAAE,CAAC,CAAC;IAChG,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"ProtractorLocator.js","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/ProtractorLocator.ts"],"names":[],"mappings":";;;AAAA,4CAAkD;AAClD,0CAAgJ;AAChJ,yCAAyC;AAEzC,qEAAkE;AAElE,oEAAiE;AAGjE,MAAa,iBAAkB,SAAQ,aAAqD;IAExF,YACI,MAA6C,EAC7C,QAAkB,EACD,YAAoC;QAErD,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAFP,iBAAY,GAAZ,YAAY,CAAwB;IAGzD,CAAC;IAED,4EAA4E;IAClE,cAAc;QACpB,IAAI,IAAI,CAAC,QAAQ,YAAY,WAAK,EAAE;YAChC,OAAO,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACjD;QAED,IAAI,IAAI,CAAC,QAAQ,YAAY,eAAS,EAAE;YACpC,IAAI,CAAE,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE;gBAC9B,MAAM,IAAI,iBAAU,CAAC,iOAAiO,CAAC,CAAA;aAC1P;YAED,OAAO,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACpF;QAED,IAAI,IAAI,CAAC,QAAQ,YAAY,yBAAmB,EAAE;YAC9C,OAAO,UAAU,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACnF;QAED,IAAI,IAAI,CAAC,QAAQ,YAAY,UAAI,EAAE;YAC/B,OAAO,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAChD;QAED,IAAI,IAAI,CAAC,QAAQ,YAAY,eAAS,EAAE;YACpC,OAAO,UAAU,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACrD;QAED,IAAI,IAAI,CAAC,QAAQ,YAAY,aAAO,EAAE;YAClC,OAAO,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACnD;QAED,MAAM,IAAI,iBAAU,CAAC,IAAA,QAAC,EAAC,GAAI,IAAI,CAAC,QAAS,wBAAyB,IAAI,CAAC,WAAW,CAAC,IAAK,EAAE,CAAC,CAAC;IAChG,CAAC;IAED,KAAK,CAAC,aAAa;QACf,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;SAC5C;QACD,OAAO,KAAK,EAAE;YACV,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;SAC7F;IACL,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,IAAA,2CAAoB,EAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAEjF,+GAA+G;QAC/G,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;QAEzB,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QACjD,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,CAA+C,CAAC;IAC3F,CAAC;IAED,EAAE,CAAC,MAAyB;QACxB,OAAO,IAAI,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,CAAC,KAAwB;QAC3B,OAAO,IAAI,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO;QACH,OAAO,IAAI,6CAAqB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,WAAW;QACb,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAErD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAC3C,IAAI,6CAAqB,CACrB,IAAI,sBAAsB,CACtB,IAAI,CAAC,MAA+B,EACpC,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,YAAY,EACjB,IAAA,2CAAoB,EAAC,YAAY,CAAC,CACrC,CACJ,CACJ,CAAC,CAAC;IACP,CAAC;CACJ;AA7FD,8CA6FC;AAED;;GAEG;AACH,MAAM,sBAAuB,SAAQ,iBAAiB;IAClD,YACI,MAA6B,EAC7B,QAAkB,EAClB,YAAoC,EACnB,qBAA+C;QAEhE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QAFrB,0BAAqB,GAArB,qBAAqB,CAA0B;IAGpE,CAAC;IAED,KAAK,CAAC,aAAa;QACf,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,OAAO,CAAE,IAAI,CAAC,qBAAqB,CAAE,CAAC;IAC1C,CAAC;CACJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serenity-js/protractor",
|
|
3
|
-
"version": "3.0.0-rc.
|
|
3
|
+
"version": "3.0.0-rc.22",
|
|
4
4
|
"description": "Test your web apps with Serenity/JS",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Jan Molak",
|
|
@@ -51,8 +51,8 @@
|
|
|
51
51
|
"npm": "^6 || ^7 || ^8"
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@serenity-js/assertions": "3.0.0-rc.
|
|
55
|
-
"@serenity-js/core": "3.0.0-rc.
|
|
54
|
+
"@serenity-js/assertions": "3.0.0-rc.22",
|
|
55
|
+
"@serenity-js/core": "3.0.0-rc.22",
|
|
56
56
|
"deepmerge": "^4.2.2",
|
|
57
57
|
"query-selector-shadow-dom": "^1.0.0",
|
|
58
58
|
"selenium-webdriver": "^3.6.0",
|
|
@@ -78,12 +78,12 @@
|
|
|
78
78
|
"devDependencies": {
|
|
79
79
|
"@documentation/esdoc-template": "3.0.0",
|
|
80
80
|
"@integration/testing-tools": "3.0.0",
|
|
81
|
-
"@serenity-js/cucumber": "3.0.0-rc.
|
|
82
|
-
"@serenity-js/jasmine": "3.0.0-rc.
|
|
83
|
-
"@serenity-js/local-server": "3.0.0-rc.
|
|
84
|
-
"@serenity-js/mocha": "3.0.0-rc.
|
|
85
|
-
"@serenity-js/rest": "3.0.0-rc.
|
|
86
|
-
"@serenity-js/web": "3.0.0-rc.
|
|
81
|
+
"@serenity-js/cucumber": "3.0.0-rc.22",
|
|
82
|
+
"@serenity-js/jasmine": "3.0.0-rc.22",
|
|
83
|
+
"@serenity-js/local-server": "3.0.0-rc.22",
|
|
84
|
+
"@serenity-js/mocha": "3.0.0-rc.22",
|
|
85
|
+
"@serenity-js/rest": "3.0.0-rc.22",
|
|
86
|
+
"@serenity-js/web": "3.0.0-rc.22",
|
|
87
87
|
"@types/chai": "^4.3.1",
|
|
88
88
|
"@types/express": "^4.17.13",
|
|
89
89
|
"@types/html-minifier": "^4.0.2",
|
|
@@ -101,5 +101,5 @@
|
|
|
101
101
|
"ts-node": "10.8.2",
|
|
102
102
|
"typescript": "^4.7.4"
|
|
103
103
|
},
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "3eb059a552b02c3ef7ee3cf2d8dcaaba9fcb2059"
|
|
105
105
|
}
|
|
@@ -50,24 +50,25 @@ export class ProtractorLocator extends Locator<protractor.ElementFinder, protrac
|
|
|
50
50
|
throw new LogicError(f `${ this.selector } is not supported by ${ this.constructor.name }`);
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
-
// todo: refactor; lift method to Locator
|
|
54
53
|
async nativeElement(): Promise<protractor.ElementFinder> {
|
|
55
|
-
let parent: Partial<protractor.ElementFinder>;
|
|
56
|
-
|
|
57
54
|
try {
|
|
58
|
-
|
|
59
|
-
const result = await unpromisedWebElement(parent.element(this.nativeSelector()));
|
|
60
|
-
|
|
61
|
-
// checks if the element can be interacted with; in particular, throws unexpected alert present if there is one
|
|
62
|
-
await result.isPresent();
|
|
63
|
-
|
|
64
|
-
return result;
|
|
55
|
+
return await this.resolveNativeElement();
|
|
65
56
|
}
|
|
66
57
|
catch (error) {
|
|
67
|
-
return await this.errorHandler.executeIfHandled(error, () =>
|
|
58
|
+
return await this.errorHandler.executeIfHandled(error, () => this.resolveNativeElement());
|
|
68
59
|
}
|
|
69
60
|
}
|
|
70
61
|
|
|
62
|
+
private async resolveNativeElement(): Promise<protractor.ElementFinder> {
|
|
63
|
+
const parent = await this.parent.nativeElement();
|
|
64
|
+
const result = await unpromisedWebElement(parent.element(this.nativeSelector()));
|
|
65
|
+
|
|
66
|
+
// checks if the element can be interacted with; in particular, throws unexpected alert present if there is one
|
|
67
|
+
await result.isPresent();
|
|
68
|
+
|
|
69
|
+
return result;
|
|
70
|
+
}
|
|
71
|
+
|
|
71
72
|
async allNativeElements(): Promise<Array<protractor.ElementFinder>> {
|
|
72
73
|
const parent = await this.parent.nativeElement();
|
|
73
74
|
return parent.all(this.nativeSelector()) as unknown as Array<protractor.ElementFinder>;
|