Skip to content

Commit fcca5e9

Browse files
osho-20osho-20
committed
added debugger.
1 parent 68b9e7c commit fcca5e9

File tree

7 files changed

+95
-90
lines changed

7 files changed

+95
-90
lines changed

‎bin/accessibility-automation/helper.js‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ exports.createAccessibilityTestRun = async (user_config, framework) => {
8686

8787
const config = {
8888
auth: {
89-
user: userName,
90-
pass: accessKey
89+
username: userName,
90+
password: accessKey
9191
},
9292
headers: {
9393
'Content-Type': 'application/json'
@@ -111,13 +111,15 @@ exports.createAccessibilityTestRun = async (user_config, framework) => {
111111

112112
} catch (error) {
113113
if (error.response) {
114+
logger.error("Incorrect Cred")
114115
logger.error(
115116
`Exception while creating test run for BrowserStack Accessibility Automation: ${
116117
error.response.status
117118
} ${error.response.statusText} ${JSON.stringify(error.response.data)}`
118119
);
119120
} else {
120121
if(error.message === 'Invalid configuration passed.') {
122+
logger.error("Invalid configuration passed.")
121123
logger.error(
122124
`Exception while creating test run for BrowserStack Accessibility Automation: ${
123125
error.message || error.stack
@@ -143,30 +145,29 @@ exports.createAccessibilityTestRun = async (user_config, framework) => {
143145

144146
const nodeRequest = (type, url, data, config) => {
145147
return new Promise(async (resolve, reject) => {
146-
const options = {...config,...{
148+
const options = {
149+
...config,
147150
method: type,
148151
url: `${API_URL}/${url}`,
149-
body: data,
150-
json: config.headers['Content-Type'] === 'application/json',
151-
}};
152+
data: data
153+
};
152154

153155
axios(options).then(response => {
154-
if(!(response.statusCode == 201 || response.statusCode == 200)) {
155-
logger.info("response.statusCode in nodeRequest", response.statusCode);
156-
reject(response && response.body ? response.body : `Received response from BrowserStack Server with status : ${response.statusCode}`);
157-
} else {
158-
try {
159-
if(typeof(response.body) !== 'object') body = JSON.parse(response.body);
160-
} catch(e) {
161-
if(!url.includes('/stop')) {
156+
if(!(response.status == 201 || response.status == 200)) {
157+
logger.info("response.status in nodeRequest", response.status);
158+
reject(response && response.data ? response.data : `Received response from BrowserStack Server with status : ${response.status}`);
159+
} else {
160+
try {
161+
if(typeof(response.data) !== 'object') body = JSON.parse(response.data);
162+
} catch(e) {
163+
if(!url.includes('/stop')) {
162164
reject('Not a JSON response from BrowserStack Server');
163-
}
164-
}
165-
resolve({
166-
data: body
167-
});
168-
}
169-
165+
}
166+
}
167+
resolve({
168+
data: response.data
169+
});
170+
}
170171
}).catch(error => {
171172
logger.info("error in nodeRequest", error);
172173
reject(error);

‎bin/accessibility-automation/plugin/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const browserstackAccessibility = (on, config) => {
99
on('task', {
1010
browserstack_log(message) {
1111
console.log(message)
12-
12+
1313
return null
1414
},
1515
})

‎bin/helpers/atsHelper.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,34 +47,34 @@ exports.getTurboScaleGridDetails = async (bsConfig, args, rawArgs) => {
4747

4848
return new Promise((resolve, reject) => {
4949
let options = {
50-
url: `${config.turboScaleAPIUrl}/grids/${gridName}`,
51-
auth: {
50+
url: `${config.turboScaleAPIUrl}/grids/${gridName}`,
51+
auth: {
5252
username: bsConfig.auth.username,
5353
password: bsConfig.auth.access_key,
54-
},
55-
headers: {
54+
},
55+
headers: {
5656
'User-Agent': utils.getUserAgent(),
57-
}
57+
}
5858
};
5959
let responseData = {};
6060
axios(options).then(response => {
61-
try {
61+
try {
6262
responseData = JSON.parse(response.data);
63-
} catch (e) {
63+
} catch (e) {
6464
responseData = {};
65-
}
66-
if(resp.statusCode != 200) {
67-
logger.warn(`Warn: Get Automate TurboScale Details Request failed with status code ${response.statusCode}`);
65+
}
66+
if(resp.status != 200) {
67+
logger.warn(`Warn: Get Automate TurboScale Details Request failed with status code ${response.status}`);
6868
utils.sendUsageReport(bsConfig, args, responseData["error"], Constants.messageTypes.ERROR, 'get_ats_details_failed', null, rawArgs);
6969
resolve({});
70-
}
71-
resolve(responseData);
70+
}
71+
resolve(responseData);
7272
}).catch(error => {
7373
logger.warn(utils.formatRequest(error, null, null));
7474
utils.sendUsageReport(bsConfig, args, err, Constants.messageTypes.ERROR, 'get_ats_details_failed', null, rawArgs);
7575
resolve({});
76-
});
7776
});
77+
});
7878
} catch (err) {
7979
logger.error(`Failed to find TurboScale Grid: ${err}: ${err.stack}`);
8080
}

‎bin/helpers/capabilityHelper.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ const validate = (bsConfig, args) => {
262262
if (!Utils.isUndefined(bsConfig.run_settings.integrationFolder) && !Utils.isCypressProjDirValid(bsConfig.run_settings.cypressProjectDir,bsConfig.run_settings.integrationFolder)) reject(Constants.validationMessages.INCORRECT_DIRECTORY_STRUCTURE);
263263
}
264264
} catch(error){
265-
logger.debug(error)
266265
reject(Constants.validationMessages.INVALID_CYPRESS_JSON)
267266
}
268267

‎bin/testObservability/crashReporter/index.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const https = require('https');
66
const logger = require("../../helpers/logger").winstonLogger;
77
const utils = require('../../helpers/utils');
88

9-
const { API_URL } = require('../helper/constants');
9+
const { API_URL, consoleHolder } = require('../helper/constants');
1010

1111
/* Below global methods are added here to remove cyclic dependency with helper.js, refactor later */
1212
const httpsKeepAliveAgent = new https.Agent({
@@ -150,19 +150,18 @@ class CrashReporter {
150150
},
151151
method: 'POST',
152152
url: `${API_URL}/api/v1/analytics`,
153-
body: data,
153+
data: data,
154154
json: true,
155155
agent: httpsKeepAliveAgent
156156
};
157157

158158
axios(options)
159159
.then(response => {
160-
if(response.statusCode != 200) {
161-
debug(`[Crash_Report_Upload] Failed due to ${response && response.body ? response.body : `Received response from BrowserStack Server with status : ${response.statusCode}`}`);
160+
if(response.status != 200) {
161+
debug(`[Crash_Report_Upload] Failed due to ${response && response.data ? response.data : `Received response from BrowserStack Server with status : ${response.status}`}`);
162162
} else {
163-
debug(`[Crash_Report_Upload] Success response: ${JSON.stringify({status: response.status, body: response.body})}`)
164-
165-
}
163+
debug(`[Crash_Report_Upload] Success response: ${JSON.stringify({status: response.status, body: response.data})}`)
164+
}
166165
})
167166
.catch(error => debug(`[Crash_Report_Upload] Failed due to ${error}`));
168167
} catch(e) {

‎bin/testObservability/helper/helper.js‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const glob = require('glob');
1010
const util = require('util');
1111
const axios = require('axios');
1212

13+
1314
const { runOptions } = require('../../helpers/runnerArgs')
1415

1516
const pGitconfig = promisify(gitconfig);
@@ -116,38 +117,43 @@ exports.printBuildLink = async (shouldStopSession, exitCode = null) => {
116117
}
117118

118119
const nodeRequest = (type, url, data, config) => {
119-
return new Promise(async (resolve, reject) => {
120-
const options = {...config,...{
120+
return new Promise(async (resolve, reject) => {
121+
const options = {
122+
...config,
121123
method: type,
122124
url: `${API_URL}/${url}`,
123-
body: data,
124-
json: config.headers['Content-Type'] === 'application/json',
125-
agent: this.httpsKeepAliveAgent,
126-
maxAttempts: 2
127-
}};
128-
129-
if(url === exports.requestQueueHandler.screenshotEventUrl) {
130-
options.agent = httpsScreenshotsKeepAliveAgent;
131-
}
132-
133-
axios(options)
125+
data: data,
126+
httpsAgent: this.httpsKeepAliveAgent,
127+
maxAttempts: 2,
128+
headers: {
129+
'Content-Type': 'application/json',
130+
...config.headers
131+
}
132+
};
133+
134+
if(url === exports.requestQueueHandler.screenshotEventUrl) {
135+
options.agent = httpsScreenshotsKeepAliveAgent;
136+
}
137+
axios(options)
134138
.then(response => {
135-
if(response.statusCode != 200) {
136-
reject(response && response.body ? response.body : `Received response from BrowserStack Server with status : ${response.statusCode}`);
137-
} else {
138-
try {
139-
const responseBody = typeof response.data === 'object' ? response.data : JSON.parse(response.data);
140-
resolve({ data: responseBody });
141-
} catch (error) {
142-
if (!url.includes('/stop')) {
143-
reject('Not a JSON response from BrowserStack Server');
144-
} else {
145-
resolve({ data: response.data });
146-
}
147-
}
139+
if(response.status != 200) {
140+
reject(response && response.data ? response.data : `Received response from BrowserStack Server with status : ${response.status}`);
141+
} else {
142+
try {
143+
const responseBody = typeof response.data === 'object' ? response.data : JSON.parse(response.data);
144+
resolve({ data: responseBody });
145+
} catch (error) {
146+
if (!url.includes('/stop')) {
147+
reject('Not a JSON response from BrowserStack Server');
148+
} else {
149+
resolve({ data: response.data });
148150
}
151+
}
152+
}
149153
})
150-
.catch(error => reject(error));
154+
.catch(error => {
155+
reject(error)
156+
});
151157
});
152158
}
153159

@@ -484,7 +490,7 @@ exports.batchAndPostEvents = async (eventUrl, kind, data) => {
484490

485491
try {
486492
const eventsUuids = data.map(eventData => `${eventData.event_type}:${eventData.test_run ? eventData.test_run.uuid : (eventData.hook_run ? eventData.hook_run.uuid : null)}`).join(', ');
487-
exports.debugOnConsole(`[Request Batch Send] for events:uuids ${eventsUuids}`);
493+
exports.debugOnConsole(`[Request Batch Send] for events:uuids ${eventsUuids}`);
488494
const response = await nodeRequest('POST',eventUrl,data,config);
489495
exports.debugOnConsole(`[Request Batch Response] for events:uuids ${eventsUuids}`);
490496
if(response.data.error) {

‎test/unit/bin/helpers/atsHelper.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
const { expect } = require("chai");
22
const chai = require("chai"),
33
chaiAsPromised = require("chai-as-promised"),
4-
sinon = require('sinon')
4+
sinon = require('sinon'),
55
request = require('axios');
66

77
const logger = require("../../../../bin/helpers/logger").winstonLogger,
88
testObjects = require("../../support/fixtures/testObjects"),
9-
utils = require('../../../../bin/helpers/utils')
10-
// atsHelper = require('../../../../bin/helpers/atsHelper.js');
9+
utils = require('../../../../bin/helpers/utils'),
10+
atsHelper = require('../../../../bin/helpers/atsHelper.js');
1111

1212
chai.use(chaiAsPromised);
1313
logger.transports["console.info"].silent = true;
@@ -28,48 +28,48 @@ describe('#atsHelper', () => {
2828
describe('#isTurboScaleSession', () => {
2929
it('return true if env var set to true', () => {
3030
process.env.BROWSERSTACK_TURBOSCALE = "true";
31-
// expect(atsHelper.isTurboScaleSession(bsConfig)).to.be.true;
31+
expect(atsHelper.isTurboScaleSession(bsConfig)).to.be.true;
3232
delete BROWSERSTACK_TURBOSCALE;
3333
});
3434

3535
it('return false if env var set to incorrect value', () => {
3636
process.env.BROWSERSTACK_TURBOSCALE = "false";
37-
// expect(atsHelper.isTurboScaleSession(bsConfig)).to.be.false;
37+
expect(atsHelper.isTurboScaleSession(bsConfig)).to.be.false;
3838
delete BROWSERSTACK_TURBOSCALE;
3939
});
4040

4141
it('return true if set in config', () => {
42-
// expect(atsHelper.isTurboScaleSession(testObjects.sampleATSBsConfig)).to.be.true;
42+
expect(atsHelper.isTurboScaleSession(testObjects.sampleATSBsConfig)).to.be.true;
4343
});
4444

4545
it('return false if not set in config as well as env var', () => {
46-
// expect(atsHelper.isTurboScaleSession(bsConfig)).to.be.false;
46+
expect(atsHelper.isTurboScaleSession(bsConfig)).to.be.false;
4747
});
4848
});
4949

5050
describe('#getTurboScaleOptions', () => {
5151
it('return empty object if not set', () => {
52-
// expect(atsHelper.getTurboScaleOptions(testObjects.sampleATSBsConfig)).to.deep.include({});
52+
expect(atsHelper.getTurboScaleOptions(testObjects.sampleATSBsConfig)).to.deep.include({});
5353
});
5454

5555
it('return obj if set in config', () => {
56-
// expect(atsHelper.getTurboScaleOptions(testObjects.sampleATSBsConfigWithOptions)).to.deep.include({ gridName: 'abc' });
56+
expect(atsHelper.getTurboScaleOptions(testObjects.sampleATSBsConfigWithOptions)).to.deep.include({ gridName: 'abc' });
5757
});
5858
});
5959

6060
describe('#getTurboScaleGridName', () => {
6161
it('return value set by env var', () => {
6262
process.env.BROWSERSTACK_TURBOSCALE_GRID_NAME = "my-grid";
63-
// expect(atsHelper.getTurboScaleGridName(testObjects.sampleATSBsConfigWithOptions)).to.eq('my-grid');
63+
expect(atsHelper.getTurboScaleGridName(testObjects.sampleATSBsConfigWithOptions)).to.eq('my-grid');
6464
delete process.env.BROWSERSTACK_TURBOSCALE_GRID_NAME;
6565
});
6666

6767
it('return value set in config', () => {
68-
// expect(atsHelper.getTurboScaleGridName(testObjects.sampleATSBsConfigWithOptions)).to.eq('abc');
68+
expect(atsHelper.getTurboScaleGridName(testObjects.sampleATSBsConfigWithOptions)).to.eq('abc');
6969
});
7070

7171
it('return NO_GRID_NAME_PASSED if value not set in config as well as env var', () => {
72-
// expect(atsHelper.getTurboScaleGridName(bsConfig)).to.eq('NO_GRID_NAME_PASSED');
72+
expect(atsHelper.getTurboScaleGridName(bsConfig)).to.eq('NO_GRID_NAME_PASSED');
7373
});
7474
});
7575

@@ -87,9 +87,9 @@ describe('#atsHelper', () => {
8787

8888
requestStub.yields(null, { statusCode: 200 }, body);
8989
sendUsageReportStub.notCalled;
90-
// atsHelper.getTurboScaleGridDetails(testObjects.sampleATSBsConfigWithOptions, {}, {}).then((result) => {
91-
// expect(result).to.eq(body);
92-
// })
90+
atsHelper.getTurboScaleGridDetails(testObjects.sampleATSBsConfigWithOptions, {}, {}).then((result) => {
91+
expect(result).to.eq(body);
92+
})
9393
});
9494

9595
it('reject with empty object', () => {
@@ -104,10 +104,10 @@ describe('#atsHelper', () => {
104104
};
105105

106106
requestStub.yields(null, { statusCode: 422 }, body);
107-
// atsHelper.getTurboScaleGridDetails(testObjects.sampleATSBsConfigWithOptions, {}, {}).then((result) => {
108-
// expect(result).to.eq({});
109-
// expect(sendUsageReportStub.calledOnce).to.be.true;
110-
// })
107+
atsHelper.getTurboScaleGridDetails(testObjects.sampleATSBsConfigWithOptions, {}, {}).then((result) => {
108+
expect(result).to.eq({});
109+
expect(sendUsageReportStub.calledOnce).to.be.true;
110+
})
111111
});
112112
});
113113
});

0 commit comments

Comments
 (0)