ff-automationv2 2.2.10 → 2.2.12
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/dist/automation/cloudSession/initiateCloudSession.js +0 -2
- package/dist/core/interfaces/executionDetails.d.ts +1 -0
- package/dist/core/main/runAutomationScript.js +4 -1
- package/dist/tests/test1.d.ts +7 -0
- package/dist/tests/test1.js +13 -0
- package/dist/tests/test12.js +61 -2
- package/package.json +1 -1
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { remote } from "webdriverio";
|
|
2
|
-
import { logger } from "../../utils/logger/logData.js";
|
|
3
2
|
import { CloudPort } from "../../core/types/cloudServerPortType.js";
|
|
4
3
|
import { getPath } from "../../utils/cloudConfig/cloudPath.js";
|
|
5
4
|
export class CloudSession {
|
|
@@ -14,7 +13,6 @@ export class CloudSession {
|
|
|
14
13
|
this.cloudConfig = cloudConfig ?? {};
|
|
15
14
|
}
|
|
16
15
|
async createDriver() {
|
|
17
|
-
logger.info(this.capabilities);
|
|
18
16
|
try {
|
|
19
17
|
return await remote({
|
|
20
18
|
protocol: this.cloudConfig.protocol,
|
|
@@ -74,7 +74,9 @@ export class AutomationRunner {
|
|
|
74
74
|
}
|
|
75
75
|
async run(request) {
|
|
76
76
|
this.usedElementNames = [];
|
|
77
|
-
|
|
77
|
+
if (request.isTerminate)
|
|
78
|
+
return AutomationRunner.updateSessionTerminationInfo(request.testCaseId);
|
|
79
|
+
AutomationRunner.sessionTerminationDetails[request.testCaseId] = request.isTerminate;
|
|
78
80
|
const apiService = new FireFlinkApiService();
|
|
79
81
|
const fireflinkServiceInstance = new fireflinkService(apiService, request.kafkaProducerInstance);
|
|
80
82
|
const instanceDetails = await fireflinkServiceInstance.runGetInstancesDetails(request.projectId, request.token, request.serverHost);
|
|
@@ -102,6 +104,7 @@ export class AutomationRunner {
|
|
|
102
104
|
for (const step of listOfSteps) {
|
|
103
105
|
try {
|
|
104
106
|
if (AutomationRunner.getSessionTerminationInfo(request.testCaseId)) {
|
|
107
|
+
logger.info(`Execution terminated successfully. Script: ${request.scriptName}, Test Case ID: ${request.testCaseId}`);
|
|
105
108
|
break;
|
|
106
109
|
}
|
|
107
110
|
logger.info(`Processing step ${stepCount}: ${step}`);
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
let sessionList = [
|
|
3
|
+
{ testCase: "A", env: "local", isTerminate: false },
|
|
4
|
+
{ testCase: "B", env: "cloud", isTerminate: false },
|
|
5
|
+
{ testCase: "B", env: "cloud", isTerminate: true },
|
|
6
|
+
{ testCase: "C", env: "local", isTerminate: false }
|
|
7
|
+
];
|
|
8
|
+
sessionList = sessionList.filter(item => !(item.testCase === "B" && item.env === "cloud" && item.isTerminate === true));
|
|
9
|
+
const founds1 = sessionList.some(item => item.testCase === "A" &&
|
|
10
|
+
item.env === "local" &&
|
|
11
|
+
item.isTerminate === false);
|
|
12
|
+
// console.log(founds); // undefined
|
|
13
|
+
console.log(sessionList);
|
package/dist/tests/test12.js
CHANGED
|
@@ -46,7 +46,7 @@ runner.run({
|
|
|
46
46
|
platformVersion: "",
|
|
47
47
|
realDeviceId: "",
|
|
48
48
|
kafkaProducerInstance: producer,
|
|
49
|
-
isCloud:
|
|
49
|
+
isCloud: false,
|
|
50
50
|
cloudConfig: {
|
|
51
51
|
accessKey: "yfAa_w199cJge2Gezsgb2Jnu7hKdqER1tExY5kKvgSvXfi1lRUelFsbTFI5pMq7zQuwwNXXnsLTkjKhvWcKDWsUoGLi9KjUV6gbUNDhqj0jWYFyW9h_0LIDEg5qXigwZdqzQqAvWwHin3gBhzGndeROtixv_VFhnseGSWRAHTajZzE-Zl0d8BP6gl0TEBUfoNgqBtAQVDLP6wAQzPfcyjjGFsdHkXWeHFkKmA78D7rKlnNuN2WgjIUlhYheDRDeqZ98Ig_PyS1GbUvjwJ73L38sr_cD4Y9lrKyWJV-m5RmtKhmkqRM8uk5gEfjzgwy30",
|
|
52
52
|
hostname: "devicefarm.fireflink.com",
|
|
@@ -60,5 +60,64 @@ runner.run({
|
|
|
60
60
|
platformName: "Windows 11",
|
|
61
61
|
browserVersion: "146"
|
|
62
62
|
},
|
|
63
|
-
|
|
63
|
+
isTerminate: false,
|
|
64
|
+
token: "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJRUFRfTnFuMkxxdDVmN09tOElWaW53dUJlR3ZVUUVBUkdxZkFuRHJxZU9NIn0.eyJleHAiOjE3NzQwNjgwMTMsImlhdCI6MTc3Mzk4MTYxMywianRpIjoib25ydHJ0OjkxZGZiY2EzLTc1OTItNGZlNi05MGI4LTkzN2Q0MWU5ZDZkYiIsImlzcyI6Imh0dHA6Ly8xMDMuMTgyLjIxMC4yMjY6MzAxMDcvcmVhbG1zL0ZpcmVGbGluay10ZXN0MyIsImF1ZCI6InRhcmdldC1jbGllbnQiLCJzdWIiOiJmOmNhMzBmNDk3LTY1Y2YtNGU4Zi1iZGE3LTE0ZjM1NTNiYzZmNTpqYWlha2FzaEB5b3BtYWlsLmNvbSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImZsaW5rLXNlcnZpY2UiLCJzaWQiOiJiZDljYzc5YS0wOGJmLTQzYmMtOTMwOS05MzQwMGM0NzYyMDQiLCJhY3IiOiIxIiwiYWxsb3dlZC1vcmlnaW5zIjpbIioiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsImN1cnJlbnRMaWNlbnNlSWQiOiJMSUMzOTg1IiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJjdXJyZW50UHJpdmlsZWdlIjoiU3VwZXIgQWRtaW4iLCJmdWxsTmFtZSI6ImphaSIsImFjdGl2YXRpb25TdGF0dXMiOiJBQ1RJVkUiLCJwcml2aWxlZ2UiOiJTdXBlciBBZG1pbiIsImxpY2Vuc2VOYW1lIjoiRmlyZUZsaW5rIC0gTElDMzk4NSIsInByZWZlcnJlZF91c2VybmFtZSI6ImphaSIsInVzZXJOYW1lIjoiamFpYWthc2hAeW9wbWFpbC5jb20iLCJiaWxsaW5nQ3ljbGUiOiJRdWFydGVybHkiLCJpZCI6IlVTUjI2OTM1IiwibGljZW5zZUlkIjoiTElDMzk4NSIsImVtYWlsIjoiamFpYWthc2hAeW9wbWFpbC5jb20ifQ.a34s4QW97kTqfNwhUigQaHD2fNtNrHuw2XjAw_Iu08iQ-xpGCE8ekt2iz4G_W3BAIe6eph6UwAT-MhgP91yEwsoDqusa-1ePiy2Y2nX_i1cNY6LU5S0UFCQR6NvXis0B3JeAfa3s909AsHnVHWH-ic8kCIi4kRedYFh7KBfN8uTeRCssjXS-I3tff9PSipUo2mjJdXhaUjOcv7dCXPpzgpVmeGyzzFHzxhngj3Fbqot3eLOCoWf4g6ofuup8Dov5o1A6L1nV5CpmGHOv1LrpF3feW4C8VTsru6yWW5G72mG1JJ8K2zMYmxxz8wpz1HXM44eHkvLzGl-P0k9H5ZSjYg"
|
|
65
|
+
});
|
|
66
|
+
await new Promise(res => setTimeout(res, 4000));
|
|
67
|
+
runner.run({
|
|
68
|
+
userStory: [
|
|
69
|
+
["Open browser"],
|
|
70
|
+
["Navigate to https://www.google.com/"],
|
|
71
|
+
["Maximize the browser"],
|
|
72
|
+
["enter asdfdsas in search field"],
|
|
73
|
+
["Close browser"]
|
|
74
|
+
],
|
|
75
|
+
platform: "web",
|
|
76
|
+
pageDetails: {
|
|
77
|
+
Web: {
|
|
78
|
+
pageId: "PAG73a7a0ad-c092-4351-8a93-68647f60e343",
|
|
79
|
+
pageName: "ai-Page"
|
|
80
|
+
}
|
|
81
|
+
},
|
|
82
|
+
service_accounts: "",
|
|
83
|
+
serverHost: "https://test3.fireflink.com",
|
|
84
|
+
webSocketId: "",
|
|
85
|
+
generatedBy: "",
|
|
86
|
+
licenseType: "C-Professional",
|
|
87
|
+
licenseId: "LIC3985",
|
|
88
|
+
userId: "USR26935",
|
|
89
|
+
topic: "Topic-FIREFLINK-aiAutomation-Updates-test3",
|
|
90
|
+
projectType: "Web",
|
|
91
|
+
browser: {
|
|
92
|
+
browserName: "edge",
|
|
93
|
+
},
|
|
94
|
+
serverData: {},
|
|
95
|
+
version: "asdfg",
|
|
96
|
+
type: "sdfg",
|
|
97
|
+
scriptName: "url",
|
|
98
|
+
scriptType: "android",
|
|
99
|
+
projectId: "PJT1116",
|
|
100
|
+
testCaseId: "SCR1208",
|
|
101
|
+
promptId: "3f6e123c-8ec6-47c1-90e1-1a2f53b49251",
|
|
102
|
+
userName: "default-user",
|
|
103
|
+
appiumPort: 0,
|
|
104
|
+
platformVersion: "",
|
|
105
|
+
realDeviceId: "",
|
|
106
|
+
kafkaProducerInstance: producer,
|
|
107
|
+
isCloud: false,
|
|
108
|
+
cloudConfig: {
|
|
109
|
+
accessKey: "yfAa_w199cJge2Gezsgb2Jnu7hKdqER1tExY5kKvgSvXfi1lRUelFsbTFI5pMq7zQuwwNXXnsLTkjKhvWcKDWsUoGLi9KjUV6gbUNDhqj0jWYFyW9h_0LIDEg5qXigwZdqzQqAvWwHin3gBhzGndeROtixv_VFhnseGSWRAHTajZzE-Zl0d8BP6gl0TEBUfoNgqBtAQVDLP6wAQzPfcyjjGFsdHkXWeHFkKmA78D7rKlnNuN2WgjIUlhYheDRDeqZ98Ig_PyS1GbUvjwJ73L38sr_cD4Y9lrKyWJV-m5RmtKhmkqRM8uk5gEfjzgwy30",
|
|
110
|
+
hostname: "devicefarm.fireflink.com",
|
|
111
|
+
licenseId: "LIC2026658",
|
|
112
|
+
projectName: "Project-6",
|
|
113
|
+
protocol: "https",
|
|
114
|
+
path: "backend/fireflinkcloud/wd/hub"
|
|
115
|
+
},
|
|
116
|
+
capabilities: {
|
|
117
|
+
browserName: "chrome",
|
|
118
|
+
platformName: "Windows 11",
|
|
119
|
+
browserVersion: "146"
|
|
120
|
+
},
|
|
121
|
+
isTerminate: true,
|
|
122
|
+
token: "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJRUFRfTnFuMkxxdDVmN09tOElWaW53dUJlR3ZVUUVBUkdxZkFuRHJxZU9NIn0.eyJleHAiOjE3NzQwNjgwMTMsImlhdCI6MTc3Mzk4MTYxMywianRpIjoib25ydHJ0OjkxZGZiY2EzLTc1OTItNGZlNi05MGI4LTkzN2Q0MWU5ZDZkYiIsImlzcyI6Imh0dHA6Ly8xMDMuMTgyLjIxMC4yMjY6MzAxMDcvcmVhbG1zL0ZpcmVGbGluay10ZXN0MyIsImF1ZCI6InRhcmdldC1jbGllbnQiLCJzdWIiOiJmOmNhMzBmNDk3LTY1Y2YtNGU4Zi1iZGE3LTE0ZjM1NTNiYzZmNTpqYWlha2FzaEB5b3BtYWlsLmNvbSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImZsaW5rLXNlcnZpY2UiLCJzaWQiOiJiZDljYzc5YS0wOGJmLTQzYmMtOTMwOS05MzQwMGM0NzYyMDQiLCJhY3IiOiIxIiwiYWxsb3dlZC1vcmlnaW5zIjpbIioiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsImN1cnJlbnRMaWNlbnNlSWQiOiJMSUMzOTg1IiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJjdXJyZW50UHJpdmlsZWdlIjoiU3VwZXIgQWRtaW4iLCJmdWxsTmFtZSI6ImphaSIsImFjdGl2YXRpb25TdGF0dXMiOiJBQ1RJVkUiLCJwcml2aWxlZ2UiOiJTdXBlciBBZG1pbiIsImxpY2Vuc2VOYW1lIjoiRmlyZUZsaW5rIC0gTElDMzk4NSIsInByZWZlcnJlZF91c2VybmFtZSI6ImphaSIsInVzZXJOYW1lIjoiamFpYWthc2hAeW9wbWFpbC5jb20iLCJiaWxsaW5nQ3ljbGUiOiJRdWFydGVybHkiLCJpZCI6IlVTUjI2OTM1IiwibGljZW5zZUlkIjoiTElDMzk4NSIsImVtYWlsIjoiamFpYWthc2hAeW9wbWFpbC5jb20ifQ.a34s4QW97kTqfNwhUigQaHD2fNtNrHuw2XjAw_Iu08iQ-xpGCE8ekt2iz4G_W3BAIe6eph6UwAT-MhgP91yEwsoDqusa-1ePiy2Y2nX_i1cNY6LU5S0UFCQR6NvXis0B3JeAfa3s909AsHnVHWH-ic8kCIi4kRedYFh7KBfN8uTeRCssjXS-I3tff9PSipUo2mjJdXhaUjOcv7dCXPpzgpVmeGyzzFHzxhngj3Fbqot3eLOCoWf4g6ofuup8Dov5o1A6L1nV5CpmGHOv1LrpF3feW4C8VTsru6yWW5G72mG1JJ8K2zMYmxxz8wpz1HXM44eHkvLzGl-P0k9H5ZSjYg"
|
|
64
123
|
});
|