@sap_oss/wdio-qmate-service 2.8.3 → 2.9.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.
@@ -11,7 +11,7 @@ interface IParams {
11
11
  export declare class OData {
12
12
  readonly utilModule: any;
13
13
  readonly urlLib: any;
14
- readonly curl: any;
14
+ readonly axios: any;
15
15
  Service: any;
16
16
  constructor();
17
17
  /**
@@ -13,7 +13,7 @@ class OData {
13
13
  constructor() {
14
14
  this.utilModule = require("util");
15
15
  this.urlLib = require("url").URL;
16
- this.curl = require("curl");
16
+ this.axios = require("axios");
17
17
  try {
18
18
  this.Service = require("@sap_oss/odata-library").Service;
19
19
  }
@@ -384,19 +384,9 @@ class OData {
384
384
  }
385
385
  }
386
386
  return new Promise((resolve, reject) => {
387
- this.curl.get(url, options, function (error, res, body) {
388
- if (!error) {
389
- if (res.statusCode >= 400) {
390
- reject(`${res.statusCode} - ${res.statusMessage}`);
391
- }
392
- else {
393
- resolve(body);
394
- }
395
- }
396
- else {
397
- reject(error);
398
- }
399
- });
387
+ this.axios.get(url, options)
388
+ .then((response) => resolve(response.data))
389
+ .catch((error) => reject(error));
400
390
  });
401
391
  }
402
392
  _applyHeaders(entity, headers) {
@@ -1 +1 @@
1
- {"version":3,"file":"odata.js","sourceRoot":"","sources":["../../../../src/reuse/modules/service/odata.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"odata.js","sourceRoot":"","sources":["../../../../src/reuse/modules/service/odata.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@
5
5
  export declare class FunctionModule {
6
6
  private vlf;
7
7
  private ErrorHandler;
8
- overallRetries: number;
8
+ private maxCurrentRetries;
9
9
  /**
10
10
  * @function retry
11
11
  * @memberOf util.function
@@ -14,7 +14,7 @@ class FunctionModule {
14
14
  constructor() {
15
15
  this.vlf = new verboseLogger_1.VerboseLoggerFactory("util", "function");
16
16
  this.ErrorHandler = new errorHandler_1.default();
17
- this.overallRetries = 3;
17
+ this.maxCurrentRetries = 3;
18
18
  }
19
19
  // =================================== MAIN ===================================
20
20
  /**
@@ -34,9 +34,9 @@ class FunctionModule {
34
34
  // NOTE: Don't set default values since they will be calculated with "_getRetryProperties".
35
35
  async retry(fct, args, retries, interval, scope = null) {
36
36
  const vl = this.vlf.initLog(this.retry);
37
- this.overallRetries = retries;
38
37
  vl.log(`${retries} retries were configured`);
39
38
  const res = await this._getRetryProperties(retries, interval);
39
+ this.maxCurrentRetries = res.retries;
40
40
  await this._retry(fct, args, res.retries, res.interval, scope);
41
41
  }
42
42
  /**
@@ -116,13 +116,13 @@ class FunctionModule {
116
116
  interval: interval
117
117
  };
118
118
  if (res.retries === undefined) {
119
- res.retries = browser.config.stepsRetries;
119
+ res.retries = browser.config.params.stepsRetries;
120
120
  if (res.retries === undefined) {
121
121
  res.retries = 3;
122
122
  }
123
123
  }
124
124
  if (res.interval === undefined) {
125
- res.interval = browser.config.stepRetriesIntervals;
125
+ res.interval = browser.config.params.stepRetriesIntervals;
126
126
  if (res.interval === undefined) {
127
127
  res.interval = 5000;
128
128
  }
@@ -148,7 +148,7 @@ class FunctionModule {
148
148
  this.ErrorHandler.logException(e, `Retries done. Failed to execute the function:${errorMessage}`);
149
149
  }
150
150
  await browser.pause(interval);
151
- util.console.log(`Retrying function again (${this.overallRetries - retries}/${this.overallRetries})`);
151
+ util.console.log(`Retrying function again (${this.maxCurrentRetries - retries}/${this.maxCurrentRetries})`);
152
152
  await this._retry(fct, args, retries, interval, scope);
153
153
  }
154
154
  }
@@ -1 +1 @@
1
- {"version":3,"file":"function.js","sourceRoot":"","sources":["../../../../src/reuse/modules/util/function.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"function.js","sourceRoot":"","sources":["../../../../src/reuse/modules/util/function.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sap_oss/wdio-qmate-service",
3
- "version": "2.8.3",
3
+ "version": "2.9.0",
4
4
  "author": "SAP SE",
5
5
  "types": "./@types/index.d.ts",
6
6
  "main": "./lib/index.js",
@@ -23,7 +23,6 @@
23
23
  }
24
24
  ],
25
25
  "scripts": {
26
- "update-chromedriver": "npm install chromedriver --chromedriver-force-download --detect_chromedriver_version --no-save",
27
26
  "prepare": "npm run build",
28
27
  "clean": "npx rimraf lib",
29
28
  "lint": "eslint .",
@@ -128,9 +127,8 @@
128
127
  ],
129
128
  "license": "Apache-2.0",
130
129
  "dependencies": {
131
- "@sap_oss/odata-library": "2.2.4",
130
+ "@sap_oss/odata-library": "2.3.3",
132
131
  "axios": "^1.6.0",
133
- "curl": "^0.1.4",
134
132
  "deepmerge": "^4.2.2",
135
133
  "fs-extra": "^10.0.0",
136
134
  "path": "^0.12.7",
@@ -145,14 +143,13 @@
145
143
  "@types/fs-extra": "^11.0.1",
146
144
  "@types/pdf-parse": "^1.1.1",
147
145
  "@types/xml2js": "^0.4.11",
148
- "@wdio/cli": "^8.27.0",
149
- "@wdio/local-runner": "^8.27.0",
150
- "@wdio/mocha-framework": "^8.27.0",
146
+ "@wdio/cli": "^8.29.7",
147
+ "@wdio/local-runner": "^8.29.7",
148
+ "@wdio/mocha-framework": "^8.29.3",
151
149
  "@wdio/sauce-service": "^8.27.0",
152
- "@wdio/selenium-standalone-service": "^8.15.0",
153
- "@wdio/shared-store-service": "^8.27.0",
154
- "@wdio/spec-reporter": "^8.27.0",
155
- "@wdio/static-server-service": "^8.27.0",
150
+ "@wdio/shared-store-service": "^8.29.7",
151
+ "@wdio/spec-reporter": "^8.29.7",
152
+ "@wdio/static-server-service": "^8.29.1",
156
153
  "app-root-path": "^3.1.0",
157
154
  "chai": "^4.3.4",
158
155
  "chromedriver": "^120.0.1",
@@ -167,8 +164,7 @@
167
164
  "prettier": "^2.8.1",
168
165
  "rimraf": "^3.0.2",
169
166
  "ts-node": "^10.9.2",
170
- "typescript": "^5.3.3",
171
- "wdio-chromedriver-service": "^8.1.1"
167
+ "typescript": "^5.3.3"
172
168
  },
173
169
  "overrides": {
174
170
  "got": "^11.8.5"
@@ -6,7 +6,6 @@ exports.config = merge(customConfig.config, {
6
6
  bail: 1,
7
7
 
8
8
  services: [
9
- ["chromedriver", { port: 4444 }],
10
9
  ["static-server", {
11
10
  port: 34005,
12
11
  folders: [
@@ -3,11 +3,10 @@ const baseConfig = require("./base.conf.js");
3
3
  const path = require("path");
4
4
 
5
5
  exports.config = merge(baseConfig.config, {
6
- path: "/",
7
-
8
6
  capabilities: [
9
7
  {
10
8
  browserName: "chrome",
9
+ browserVersion: "120.0.6099.35",
11
10
  acceptInsecureCerts: true,
12
11
  "goog:chromeOptions": {
13
12
  args: [
@@ -35,15 +34,5 @@ exports.config = merge(baseConfig.config, {
35
34
  }
36
35
  }
37
36
  }
38
- ],
39
-
40
- services: [
41
- [
42
- "chromedriver",
43
- {
44
- port: 4444,
45
- chromedriverCustomPath: process.env.CHROME_DRIVER
46
- }
47
- ]
48
37
  ]
49
38
  });
@@ -2,11 +2,10 @@ const merge = require("deepmerge");
2
2
  const baseConfig = require("./base.conf.js");
3
3
 
4
4
  exports.config = merge(baseConfig.config, {
5
- path: "/",
6
-
7
5
  capabilities: [
8
6
  {
9
7
  browserName: "chrome",
8
+ browserVersion: "120.0.6099.35",
10
9
  acceptInsecureCerts: true,
11
10
  "goog:chromeOptions": {
12
11
  args: [
@@ -31,15 +30,5 @@ exports.config = merge(baseConfig.config, {
31
30
  }
32
31
  }
33
32
  }
34
- ],
35
-
36
- services: [
37
- [
38
- "chromedriver",
39
- {
40
- port: 4444,
41
- chromedriverCustomPath: process.env.CHROME_DRIVER
42
- }
43
- ]
44
33
  ]
45
34
  });
@@ -17,9 +17,6 @@ exports.config = merge(profile.config, {
17
17
  ],
18
18
 
19
19
  services: [
20
- ["chromedriver", {
21
- port: 4444
22
- }],
23
20
  ["static-server", {
24
21
  port: 34005,
25
22
  folders: [{
@@ -21,9 +21,6 @@ exports.config = merge(profile.config, {
21
21
  exclude: [],
22
22
 
23
23
  services: [
24
- ["chromedriver", {
25
- port: 4444
26
- }],
27
24
  ["static-server", {
28
25
  port: 34005,
29
26
  folders: [{
@@ -33,9 +33,6 @@ exports.config = merge(profile.config, {
33
33
  ],
34
34
 
35
35
  services: [
36
- ["chromedriver", {
37
- port: 4444
38
- }],
39
36
  ["static-server", {
40
37
  port: 34005,
41
38
  folders: [
@@ -36,21 +36,21 @@ exports.config = merge(profile.config, {
36
36
  exclude: [],
37
37
 
38
38
  services: [
39
- ["chromedriver", {
40
- port: 4444
41
- }],
42
- ["static-server", {
43
- port: 34005,
44
- folders: [
45
- { mount: "/waitForElements.html", path: path.resolve(__dirname, "../../../helper/website/waitForElements.html") },
46
- { mount: "/buttons.html", path: path.resolve(__dirname, "../../../helper/website/buttons.html") },
47
- { mount: "/checkBox.html", path: path.resolve(__dirname, "../../../helper/website/checkBox.html") },
48
- { mount: "/dropdown.html", path: path.resolve(__dirname, "../../../helper/website/dropdown.html") },
49
- { mount: "/forms.html", path: path.resolve(__dirname, "../../../helper/website/forms.html") },
50
- { mount: "/scrollPage.html", path: path.resolve(__dirname, "../../../helper/website/scrollPage.html") },
51
- { mount: "/hiddenAndVisible.html", path: path.resolve(__dirname, "../../../helper/website/hiddenAndVisible.html") },
52
- { mount: "/tables.html", path: path.resolve(__dirname, "../../../helper/website/tables.html") }
53
- ]
54
- }]
55
- ],
56
- });
39
+ [
40
+ "static-server",
41
+ {
42
+ port: 34005,
43
+ folders: [
44
+ { mount: "/waitForElements.html", path: path.resolve(__dirname, "../../../helper/website/waitForElements.html") },
45
+ { mount: "/buttons.html", path: path.resolve(__dirname, "../../../helper/website/buttons.html") },
46
+ { mount: "/checkBox.html", path: path.resolve(__dirname, "../../../helper/website/checkBox.html") },
47
+ { mount: "/dropdown.html", path: path.resolve(__dirname, "../../../helper/website/dropdown.html") },
48
+ { mount: "/forms.html", path: path.resolve(__dirname, "../../../helper/website/forms.html") },
49
+ { mount: "/scrollPage.html", path: path.resolve(__dirname, "../../../helper/website/scrollPage.html") },
50
+ { mount: "/hiddenAndVisible.html", path: path.resolve(__dirname, "../../../helper/website/hiddenAndVisible.html") },
51
+ { mount: "/tables.html", path: path.resolve(__dirname, "../../../helper/website/tables.html") }
52
+ ]
53
+ }
54
+ ]
55
+ ]
56
+ });
@@ -31,9 +31,6 @@ exports.config = merge(profile.config, {
31
31
  exclude: [],
32
32
 
33
33
  services: [
34
- ["chromedriver", {
35
- port: 4444
36
- }],
37
34
  ["static-server", {
38
35
  port: 34005,
39
36
  folders: [{
@@ -10,23 +10,14 @@ exports.config = merge(profile.config, {
10
10
  logLevel: "silent", // too many error logs wyen tunnel is opened
11
11
  maxInstances: 2, // note: for the SAP account, only 2 parallel instances is a max value
12
12
 
13
-
14
13
  bail: 1,
15
14
 
16
- services: [
17
- ["chromedriver", {
18
- port: 4444
19
- }]
20
- ],
21
-
22
15
  specs: [
23
16
  // path.resolve(__dirname, "navigateToSystemAndApplication.spec.js"),
24
17
  path.resolve(__dirname, "navigateToSystemAndApplicationAndRetry.spec.js"),
25
18
  path.resolve(__dirname, "expectUnsupportedNavigationPopup.spec.js"),
26
19
  ],
27
20
 
28
- exclude: [],
29
-
30
21
  mochaOpts: {
31
22
  timeout: 2000000,
32
23
  },
@@ -7,9 +7,6 @@ exports.config = merge(profile.config, {
7
7
  baseUrl: "http://localhost:34099/ui",
8
8
 
9
9
  services: [
10
- ["chromedriver", {
11
- port: 4444
12
- }],
13
10
  ["static-server", {
14
11
  port: 34099,
15
12
  folders: [{
@@ -9,23 +9,9 @@ exports.config = merge(profile.config, {
9
9
 
10
10
  maxInstances: 2, // note: for the SAP account, only 2 parallel instances is a max value
11
11
 
12
-
13
12
  bail: 1,
14
13
  baseUrl: "http://localhost:34099/ui",
15
14
 
16
- services: [
17
- ["chromedriver", {
18
- port: 4444
19
- }]
20
- // ["static-server", {
21
- // port: 34099,
22
- // folders: [{
23
- // mount: "/ui",
24
- // path: path.resolve(__dirname, "./website/main.html")
25
- // }, ]
26
- // }]
27
- ],
28
-
29
15
  specs: [
30
16
  path.resolve(__dirname, "navigateToApplication.spec.js"),
31
17
  // path.resolve(__dirname, "navigateToApplicationAndRetry.spec.js"),
@@ -33,8 +19,6 @@ exports.config = merge(profile.config, {
33
19
  // path.resolve(__dirname, "navigateToApplicationWithQueryParamsAndRetry.spec.js")
34
20
  ],
35
21
 
36
- exclude: [],
37
-
38
22
  mochaOpts: {
39
23
  timeout: 2000000,
40
24
  },
@@ -1,17 +0,0 @@
1
- #### wdio-qmate-service core functionality
2
-
3
- This package includes tests for `wdio-qmate-service` core functionality
4
-
5
- To run tests:
6
-
7
- Step 1. Install dependencies in **root package.json**, if you have not done it yet:
8
- ```bash
9
- npm i
10
- npm run chromedriver-upgrade
11
- ```
12
-
13
-
14
- Step 2. Run tests using script command
15
- ```bash
16
- npm run test
17
- ```