@serenity-js/protractor 3.10.4 → 3.11.0
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
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
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.11.0](https://github.com/serenity-js/serenity-js/compare/v3.10.4...v3.11.0) (2023-10-03)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* **rest:** automatic proxy server configuration for CallAnApi ([27a1630](https://github.com/serenity-js/serenity-js/commit/27a163024120068bc4d5b7ec07704fb774b2e312)), closes [#1949](https://github.com/serenity-js/serenity-js/issues/1949)
|
|
12
|
+
* **web:** ability to CallAnApi is now available by default ([dfaf8e4](https://github.com/serenity-js/serenity-js/commit/dfaf8e4f4cb40f9be99624f0d616ebcf012c1fb0)), closes [#1876](https://github.com/serenity-js/serenity-js/issues/1876)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
6
18
|
## [3.10.4](https://github.com/serenity-js/serenity-js/compare/v3.10.3...v3.10.4) (2023-09-22)
|
|
7
19
|
|
|
8
20
|
**Note:** Version bump only for package @serenity-js/protractor
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProtractorFrameworkAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/ProtractorFrameworkAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"ProtractorFrameworkAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/ProtractorFrameworkAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAOzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C;;GAEG;AACH,qBAAa,0BAA0B;IAE/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAFR,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,kBAAkB;IAIjD;;;OAGG;IACH,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA0C/C,OAAO,CAAC,aAAa;CASxB"}
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ProtractorFrameworkAdapter = void 0;
|
|
4
4
|
const core_1 = require("@serenity-js/core");
|
|
5
|
+
const rest_1 = require("@serenity-js/rest");
|
|
5
6
|
const protractor_1 = require("protractor");
|
|
6
7
|
const objects_1 = require("tiny-types/lib/objects");
|
|
8
|
+
const screenplay_1 = require("../screenplay");
|
|
7
9
|
const browser_detector_1 = require("./browser-detector");
|
|
8
10
|
const reporter_1 = require("./reporter");
|
|
9
11
|
const runner_1 = require("./runner");
|
|
10
12
|
const deepmerge = require("deepmerge");
|
|
11
|
-
const core_2 = require("@serenity-js/core");
|
|
12
|
-
const screenplay_1 = require("../screenplay");
|
|
13
13
|
const querySelectorShadowDomPlugin = require('query-selector-shadow-dom/plugins/protractor'); // eslint-disable-line @typescript-eslint/no-var-requires
|
|
14
14
|
/**
|
|
15
15
|
* @private
|
|
@@ -37,7 +37,9 @@ class ProtractorFrameworkAdapter {
|
|
|
37
37
|
cueTimeout: config.serenity.cueTimeout,
|
|
38
38
|
interactionTimeout: config.serenity.interactionTimeout,
|
|
39
39
|
diffFormatter: config.serenity.diffFormatter ?? new core_1.AnsiDiffFormatter(),
|
|
40
|
-
actors: config.serenity.actors || core_1.Cast.where(actor => actor.whoCan(screenplay_1.BrowseTheWebWithProtractor.using(protractor_1.protractor.browser),
|
|
40
|
+
actors: config.serenity.actors || core_1.Cast.where(actor => actor.whoCan(screenplay_1.BrowseTheWebWithProtractor.using(protractor_1.protractor.browser), core_1.TakeNotes.usingAnEmptyNotepad(), rest_1.CallAnApi.using({
|
|
41
|
+
baseURL: config.baseUrl,
|
|
42
|
+
}))),
|
|
41
43
|
crew: [
|
|
42
44
|
browser_detector_1.BrowserDetector.with(browser_detector_1.StandardisedCapabilities.of(() => protractor_1.protractor.browser)),
|
|
43
45
|
...config.serenity.crew,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProtractorFrameworkAdapter.js","sourceRoot":"","sources":["../../src/adapter/ProtractorFrameworkAdapter.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"ProtractorFrameworkAdapter.js","sourceRoot":"","sources":["../../src/adapter/ProtractorFrameworkAdapter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serenity-js/protractor",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.11.0",
|
|
4
4
|
"description": "Test your web apps with Serenity/JS",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Jan Molak",
|
|
@@ -48,8 +48,9 @@
|
|
|
48
48
|
"node": "^16.13 || ^18.12 || ^20"
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"@serenity-js/core": "3.
|
|
52
|
-
"@serenity-js/
|
|
51
|
+
"@serenity-js/core": "3.11.0",
|
|
52
|
+
"@serenity-js/rest": "3.11.0",
|
|
53
|
+
"@serenity-js/web": "3.11.0",
|
|
53
54
|
"deepmerge": "^4.3.1",
|
|
54
55
|
"query-selector-shadow-dom": "^1.0.1",
|
|
55
56
|
"selenium-webdriver": "^3.6.0",
|
|
@@ -75,18 +76,17 @@
|
|
|
75
76
|
},
|
|
76
77
|
"devDependencies": {
|
|
77
78
|
"@integration/testing-tools": "3.0.0",
|
|
78
|
-
"@serenity-js/assertions": "3.
|
|
79
|
-
"@serenity-js/cucumber": "3.
|
|
80
|
-
"@serenity-js/jasmine": "3.
|
|
81
|
-
"@serenity-js/local-server": "3.
|
|
82
|
-
"@serenity-js/mocha": "3.
|
|
83
|
-
"@serenity-js/rest": "3.10.4",
|
|
79
|
+
"@serenity-js/assertions": "3.11.0",
|
|
80
|
+
"@serenity-js/cucumber": "3.11.0",
|
|
81
|
+
"@serenity-js/jasmine": "3.11.0",
|
|
82
|
+
"@serenity-js/local-server": "3.11.0",
|
|
83
|
+
"@serenity-js/mocha": "3.11.0",
|
|
84
84
|
"@serenity-js/web": "3.1.1",
|
|
85
85
|
"@types/chai": "^4.3.6",
|
|
86
|
-
"@types/express": "^4.17.
|
|
86
|
+
"@types/express": "^4.17.18",
|
|
87
87
|
"@types/html-minifier": "^4.0.3",
|
|
88
|
-
"@types/mocha": "^10.0.
|
|
89
|
-
"@types/selenium-webdriver": "^3.0.
|
|
88
|
+
"@types/mocha": "^10.0.2",
|
|
89
|
+
"@types/selenium-webdriver": "^3.0.24",
|
|
90
90
|
"axios": "^1.5.0",
|
|
91
91
|
"body-parser": "^1.20.2",
|
|
92
92
|
"c8": "8.0.1",
|
|
@@ -101,5 +101,5 @@
|
|
|
101
101
|
"ts-node": "^10.9.1",
|
|
102
102
|
"typescript": "5.1.6"
|
|
103
103
|
},
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "4cd38cd3f6c8ea72e7e2776d76af9fa8a0672265"
|
|
105
105
|
}
|
|
@@ -1,18 +1,17 @@
|
|
|
1
1
|
import type { Serenity } from '@serenity-js/core';
|
|
2
|
-
import { AnsiDiffFormatter, ArtifactArchiver, Cast } from '@serenity-js/core';
|
|
2
|
+
import { AnsiDiffFormatter, ArtifactArchiver, Cast, TakeNotes } from '@serenity-js/core';
|
|
3
|
+
import { CallAnApi } from '@serenity-js/rest';
|
|
3
4
|
import type { Runner } from 'protractor';
|
|
4
5
|
import { protractor } from 'protractor';
|
|
5
6
|
import { isRecord } from 'tiny-types/lib/objects';
|
|
6
7
|
|
|
8
|
+
import { BrowseTheWebWithProtractor } from '../screenplay';
|
|
7
9
|
import { BrowserDetector, StandardisedCapabilities } from './browser-detector';
|
|
8
10
|
import type { Config } from './Config';
|
|
9
|
-
import type { ProtractorReport} from './reporter';
|
|
11
|
+
import type { ProtractorReport } from './reporter';
|
|
10
12
|
import { ProtractorReporter } from './reporter';
|
|
11
13
|
import { TestRunnerDetector } from './runner';
|
|
12
14
|
import deepmerge = require('deepmerge');
|
|
13
|
-
import { TakeNotes } from '@serenity-js/core';
|
|
14
|
-
|
|
15
|
-
import { BrowseTheWebWithProtractor } from '../screenplay';
|
|
16
15
|
|
|
17
16
|
const querySelectorShadowDomPlugin = require('query-selector-shadow-dom/plugins/protractor'); // eslint-disable-line @typescript-eslint/no-var-requires
|
|
18
17
|
|
|
@@ -53,6 +52,9 @@ export class ProtractorFrameworkAdapter {
|
|
|
53
52
|
actors: config.serenity.actors || Cast.where(actor => actor.whoCan(
|
|
54
53
|
BrowseTheWebWithProtractor.using(protractor.browser),
|
|
55
54
|
TakeNotes.usingAnEmptyNotepad(),
|
|
55
|
+
CallAnApi.using({
|
|
56
|
+
baseURL: config.baseUrl,
|
|
57
|
+
})
|
|
56
58
|
)),
|
|
57
59
|
|
|
58
60
|
crew: [
|