froth-webdriverio-framework 1.0.68 → 1.0.70
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.
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
|
|
2
2
|
async function getBSBuildDetails(sessiontype, bs_username, bs_pwd) {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
try {
|
|
4
|
+
// const sessionId = sessionIdd;
|
|
5
|
+
const username = bs_username;
|
|
6
|
+
const accessKey = bs_pwd;
|
|
7
|
+
const basicAuth = btoa(`${username}:${accessKey}`);
|
|
6
8
|
|
|
7
|
-
|
|
9
|
+
let hashed_id = null;
|
|
8
10
|
|
|
9
|
-
let hashed_id = null;
|
|
10
|
-
try {
|
|
11
11
|
// const sessionid= BUFFER.getItem("SESSION_ID");
|
|
12
12
|
|
|
13
13
|
const url = `https://api.browserstack.com/${sessiontype}/builds.json?name=${process.env.BROWSERSTACK_BUILD_NAME}`;
|
|
@@ -46,18 +46,17 @@ async function getBSBuildDetails(sessiontype, bs_username, bs_pwd) {
|
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
async function getBSSessionDetails(sessiontype, bs_username, bs_pwd) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
try {
|
|
49
|
+
try {
|
|
50
|
+
// const sessionId = sessionIdd;
|
|
51
|
+
console.log(bs_username, bs_pwd)
|
|
52
|
+
const username = bs_username;
|
|
53
|
+
const accessKey = Buffer.from(bs_pwd, 'base64').toString('utf-8');
|
|
54
|
+
const basicAuth = btoa(`${username}:${accessKey}`);
|
|
56
55
|
|
|
57
|
-
const hash_id=await getBSBuildDetails(sessiontype, bs_username,
|
|
58
|
-
|
|
56
|
+
const hash_id = await getBSBuildDetails(sessiontype, bs_username, accessKey)
|
|
57
|
+
// const sessionid = BUFFER.getItem("SESSION_ID");
|
|
59
58
|
|
|
60
|
-
|
|
59
|
+
// const url = `https://api.browserstack.com/${sessiontype}/sessions/${sessionid}.json`;
|
|
61
60
|
const url = `https://api.browserstack.com/${sessiontype}/builds/${hash_id}/sessions.json`;
|
|
62
61
|
|
|
63
62
|
const response = await fetch(url, {
|
|
@@ -2,12 +2,13 @@ const deepmerge = require('deepmerge')
|
|
|
2
2
|
const commonconfig = require('./commonconfig');
|
|
3
3
|
console.log("BROWSERSTACK_USERNAME"+process.env.BROWSERSTACK_USERNAME)
|
|
4
4
|
console.log("BROWSERSTACK_ACCESS_KEY"+process.env.BROWSERSTACK_ACCESS_KEY)
|
|
5
|
+
let bspass=Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8')
|
|
6
|
+
console.log("BROWSERSTACK_ACCESS_KEY parsed"+bspass)
|
|
5
7
|
|
|
6
8
|
const commonmobconfig = deepmerge.all([commonconfig, {
|
|
7
9
|
|
|
8
10
|
user: process.env.BROWSERSTACK_USERNAME,
|
|
9
|
-
key:
|
|
10
|
-
// key: Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8'),
|
|
11
|
+
key: bspass,
|
|
11
12
|
|
|
12
13
|
logLevel: 'info',
|
|
13
14
|
coloredLogs: true,
|
package/config/commonconfig.js
CHANGED
|
@@ -32,9 +32,7 @@ const commonconfig = {
|
|
|
32
32
|
console.log("Running suite:", suite.title);
|
|
33
33
|
// const sessionId = browser.sessionId;
|
|
34
34
|
// BUFFER.setItem("SESSION_ID", sessionId)
|
|
35
|
-
|
|
36
|
-
await getBSSessionDetails(process.env.BS_SESSION_TYPE, process.env.BROWSERSTACK_USERNAME,process.env.BROWSERSTACK_ACCESS_KEY);
|
|
37
|
-
|
|
35
|
+
await getBSSessionDetails(process.env.BS_SESSION_TYPE, process.env.BROWSERSTACK_USERNAME, process.env.BROWSERSTACK_ACCESS_KEY);
|
|
38
36
|
const resultdetails = {};
|
|
39
37
|
exeDetails.updateExecuitonDetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("LOGIN_TOKEN"), BUFFER.getItem("EXECUTION_ID"), resultdetails)
|
|
40
38
|
|