Skip to content

configured for staging #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rahul-bs wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

configured for staging #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f30411
configured for staging
Nov 18, 2019
c80177d
added credentials file temp
Nov 21, 2019
bce6042
removed env authentication
Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,20 @@ function lint () {
}

function build () {
gulp.src('src/*.yml')
.pipe(gulp.dest('lib'));

return gulp
.src('src/**/*.js')
.src(['src/**/*.js'])
.pipe(babel())
.pipe(gulp.dest('lib'));
}

function ensureAuthCredentials () {
const ERROR_MESSAGES = require('./lib/templates/error-messages');

if (!process.env.BROWSERSTACK_USERNAME || !process.env.BROWSERSTACK_ACCESS_KEY)
throw new Error(ERROR_MESSAGES.BROWSERSTACK_AUTHENTICATION_FAILED());
// if (!process.env.BROWSERSTACK_USERNAME || !process.env.BROWSERSTACK_ACCESS_KEY)
// throw new Error(ERROR_MESSAGES.BROWSERSTACK_AUTHENTICATION_FAILED());
}

function testMocha () {
Expand Down Expand Up @@ -105,6 +108,7 @@ function testTestcafeAutomate () {
exports.clean = clean;
exports.lint = lint;
exports.build = gulp.parallel(gulp.series(clean, build), lint);
// exports.copy = copy
exports.test = gulp.series(exports.build, testMochaRest, testMochaAutomate, testTestcafeRest, testTestcafeAutomate);
exports.testTestcafeRest = gulp.series(exports.build, testTestcafeRest);
exports.testTestcafeAutomate = gulp.series(exports.build, testTestcafeAutomate);
74 changes: 48 additions & 26 deletions src/backends/automate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,57 +5,69 @@ import BaseBackend from './base';
import requestApiBase from '../utils/request-api';
import createBrowserstackStatus from '../utils/create-browserstack-status';
import * as ERROR_MESSAGES from '../templates/error-messages';
var fs = require('fs');
var yaml = require('js-yaml');
var dirpath = require('path');

const API_POLLING_INTERVAL = 80000;

const BROWSERSTACK_API_PATHS = {
browserList: {
url: 'https://api.browserstack.com/automate/browsers.json'
},
// browserList: {
// url: 'https://apici.bsstag.com/automate/browsers.json'
// },

newSession: {
url: 'http://hub-cloud.browserstack.com/wd/hub/session',
// newSession: {
// url: 'http://cihub.bsstag.com:4444/wd/hub/session',
// method: 'POST'
// },

browserList: id => ({
url: 'https://api' + id + '.bsstag.com/automate/browsers.json',
}),

newSession: id => ({
url: 'http://' + id + 'hub.bsstag.com:4444/wd/hub/session',
method: 'POST'
},
}),

openUrl: id => ({
url: `http://hub-cloud.browserstack.com/wd/hub/session/${id}/url`,
url: `http://${id[1]}hub.bsstag.com:4444/wd/hub/session/${id[0]}/url`,
method: 'POST'
}),

getWindowSize: id => ({
url: `http://hub-cloud.browserstack.com/wd/hub/session/${id}/window/current/size`
url: `http://${id[1]}hub.bsstag.com:4444/wd/hub/session/${id[0]}/window/current/size`
}),

setWindowSize: id => ({
url: `http://hub-cloud.browserstack.com/wd/hub/session/${id}/window/current/size`,
url: `http://${id[1]}hub.bsstag.com:4444/wd/hub/session/${id[0]}/window/current/size`,
method: 'POST'
}),

maximizeWindow: id => ({
url: `http://hub-cloud.browserstack.com/wd/hub/session/${id}/window/current/maximize`,
url: `http://${id[1]}hub.bsstag.com:4444/wd/hub/session/${id[0]}/window/current/maximize`,
method: 'POST'
}),

getUrl: id => ({
url: `http://hub-cloud.browserstack.com/wd/hub/session/${id}/url`
url: `http://${id[1]}hub.bsstag.com:4444/wd/hub/session/${id[0]}/url`
}),

deleteSession: id => ({
url: `http://hub-cloud.browserstack.com/wd/hub/session/${id}`,
url: `http://cihub.bsstag.com:4444/wd/hub/session/${id[0]}`,
method: 'DELETE'
}),

screenshot: id => ({
url: `http://hub-cloud.browserstack.com/wd/hub/session/${id}/screenshot`
url: `http://api${id[1]}.bsstag.com/wd/hub/session/${id[0]}/screenshot`
}),

getStatus: id => ({
url: `https://api.browserstack.com/automate/sessions/${id}.json`
url: `https://api${id[1]}.bsstag.com/automate/sessions/${id[0]}.json`
}),

setStatus: id => ({
url: `https://api.browserstack.com/automate/sessions/${id}.json`,
url: `https://api${id[1]}.bsstag.com/automate/sessions/${id[0]}.json`,
method: 'PUT'
})
};
Expand Down Expand Up @@ -109,22 +121,23 @@ export default class AutomateBackend extends BaseBackend {
}

async _requestSessionUrl (id) {
var sessionInfo = await requestApiBase(BROWSERSTACK_API_PATHS.getStatus(this.sessions[id].sessionId));
var sessionInfo = await requestApiBase(BROWSERSTACK_API_PATHS.getStatus([this.sessions[id].sessionId, this.test()]));

return sessionInfo['automation_session']['browser_url'];
}

async _requestCurrentWindowSize (id) {
var currentWindowSizeData = await requestApi(BROWSERSTACK_API_PATHS.getWindowSize(this.sessions[id].sessionId));
var currentWindowSizeData = await requestApi(BROWSERSTACK_API_PATHS.getWindowSize([this.sessions[id].sessionId, this.test()]));

return {

width: currentWindowSizeData.value.width,
height: currentWindowSizeData.value.height
};
}

async getBrowsersList () {
var platformsInfo = await requestApiBase(BROWSERSTACK_API_PATHS.browserList);
var platformsInfo = await requestApiBase(BROWSERSTACK_API_PATHS.browserList(this.test()));

return platformsInfo.reverse();
}
Expand All @@ -142,7 +155,9 @@ export default class AutomateBackend extends BaseBackend {
...restCapabilities
};

this.sessions[id] = await requestApi(BROWSERSTACK_API_PATHS.newSession, {
// console.warn('new session: ', BROWSERSTACK_API_PATHS.newSession);

this.sessions[id] = await requestApi(BROWSERSTACK_API_PATHS.newSession(this.test()), {
body: { desiredCapabilities: capabilities },

executeImmediately: true
Expand All @@ -154,9 +169,9 @@ export default class AutomateBackend extends BaseBackend {

var sessionId = this.sessions[id].sessionId;

this.sessions[id].interval = setInterval(() => requestApi(BROWSERSTACK_API_PATHS.getUrl(sessionId), { executeImmediately: true }), API_POLLING_INTERVAL);
this.sessions[id].interval = setInterval(() => requestApi(BROWSERSTACK_API_PATHS.getUrl([sessionId, this.test()]), { executeImmediately: true }), API_POLLING_INTERVAL);

await requestApi(BROWSERSTACK_API_PATHS.openUrl(sessionId), { body: { url: pageUrl } });
await requestApi(BROWSERSTACK_API_PATHS.openUrl([sessionId, this.test()]), { body: { url: pageUrl } });
}

async closeBrowser (id) {
Expand All @@ -171,12 +186,19 @@ export default class AutomateBackend extends BaseBackend {

// Delete session whose sessionId is created
if (session.sessionId && session.sessionId !== '')
await requestApi(BROWSERSTACK_API_PATHS.deleteSession(session.sessionId));
await requestApi(BROWSERSTACK_API_PATHS.deleteSession([session.sessionId, this.test()]));
}

test () {
var fileContents = fs.readFileSync(dirpath.join(__dirname, '../credentials.yml'), 'utf8');
var data = yaml.safeLoad(fileContents);

return data[process.argv[4]]['hub'];
}

async takeScreenshot (id, screenshotPath) {
return new Promise(async (resolve, reject) => {
var base64Data = await requestApi(BROWSERSTACK_API_PATHS.screenshot(this.sessions[id].sessionId));
var base64Data = await requestApi(BROWSERSTACK_API_PATHS.screenshot([this.sessions[id].sessionId, this.test()]));
var buffer = Buffer.from(base64Data.value, 'base64');

jimp
Expand All @@ -193,17 +215,17 @@ export default class AutomateBackend extends BaseBackend {
var requestedSize = { width, height };
var correctedSize = getCorrectedSize(currentClientAreaSize, currentWindowSize, requestedSize);

await requestApi(BROWSERSTACK_API_PATHS.setWindowSize(sessionId), { body: correctedSize });
await requestApi(BROWSERSTACK_API_PATHS.setWindowSize([sessionId, this.test()]), { body: correctedSize });
}

async maximizeWindow (id) {
await requestApi(BROWSERSTACK_API_PATHS.maximizeWindow(this.sessions[id].sessionId));
await requestApi(BROWSERSTACK_API_PATHS.maximizeWindow([this.sessions[id].sessionId, this.test()]));
}

async reportJobResult (id, jobResult, jobData, possibleResults) {
var sessionId = this.sessions[id].sessionId;
var jobStatus = createBrowserstackStatus(jobResult, jobData, possibleResults);

await requestApiBase(BROWSERSTACK_API_PATHS.setStatus(sessionId), { body: jobStatus });
await requestApiBase(BROWSERSTACK_API_PATHS.setStatus([sessionId, this.test()]), { body: jobStatus });
}
}
1 change: 1 addition & 0 deletions src/connector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export default class BrowserstackConnector {

var opts = {
key: this.accessKey,
'': 'ci.bsstag.com',
logfile,
forceLocal: !!process.env['BROWSERSTACK_FORCE_LOCAL'],
forceProxy: !!process.env['BROWSERSTACK_FORCE_PROXY'],
Expand Down
11 changes: 10 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { parse as parseUrl } from 'url';
const fs = require('fs');
const yaml = require('js-yaml');
var path = require('path');

import Promise from 'pinkie';
import parseCapabilities from 'desired-capabilities';
import BrowserstackConnector from './connector';
Expand All @@ -25,12 +29,17 @@ export default {
workers: {},
platformsInfo: [],
browserNames: [],
data: {},

_getConnector () {
this.connectorPromise = this.connectorPromise
.then(async connector => {
if (!connector && isLocalEnabled()) {
connector = new BrowserstackConnector(process.env['BROWSERSTACK_ACCESS_KEY']);
const fileContents = fs.readFileSync(path.join(__dirname, 'credentials.yml'), 'utf8');

this.data = yaml.safeLoad(fileContents);
// connector = new _connector2.default(this.data[process.argv[3]]['key']);
connector = new BrowserstackConnector(this.data[process.argv[4]]['key']);

await connector.create();
}
Expand Down
13 changes: 9 additions & 4 deletions src/utils/request-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
import Promise from 'pinkie';
import request from 'request-promise';
import * as ERROR_MESSAGES from '../templates/error-messages';
var fs = require('fs');
var yaml = require('js-yaml');
var dirpath = require('path');

const apiRequestPromise = Promise.resolve(null);

export default function (apiPath, params = {}) {
if (!process.env['BROWSERSTACK_USERNAME'] || !process.env['BROWSERSTACK_ACCESS_KEY'])
throw new Error(ERROR_MESSAGES.BROWSERSTACK_AUTHENTICATION_FAILED());
// if (!process.env['BROWSERSTACK_USERNAME'] || !process.env['BROWSERSTACK_ACCESS_KEY'])
// throw new Error(ERROR_MESSAGES.BROWSERSTACK_AUTHENTICATION_FAILED());
var fileContents = fs.readFileSync(dirpath.join(__dirname, '../credentials.yml'), 'utf8');
var data = yaml.safeLoad(fileContents);

var { body, executeImmediately, ...queryParams } = params;

var opts = {
url: apiPath.url,
auth: {
user: process.env['BROWSERSTACK_USERNAME'],
pass: process.env['BROWSERSTACK_ACCESS_KEY'],
user: data[process.argv[4]]['username'],
pass: data[process.argv[4]]['key']
},

headers: {
Expand Down