@eclipse-che/che-e2e
Advanced tools
Comparing version 7.43.0-dev-ca842bf to 7.43.0-dev-fc26d86
@@ -38,7 +38,7 @@ "use strict"; | ||
Logger_1.Logger.debug('CheLoginPage.waitEclipseCheLoginFormPage'); | ||
await this.driverHelper.waitVisibility(selenium_webdriver_1.By.id('kc-form-login'), TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT); | ||
await this.driverHelper.waitVisibility(selenium_webdriver_1.By.id('login'), TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT); | ||
} | ||
async inputUserNameEclipseCheLoginPage(userName) { | ||
Logger_1.Logger.debug(`CheLoginPage.inputUserNameEclipseCheLoginPage username: "${userName}"`); | ||
await this.driverHelper.enterValue(selenium_webdriver_1.By.id('username'), userName); | ||
await this.driverHelper.enterValue(selenium_webdriver_1.By.id('login'), userName); | ||
} | ||
@@ -51,3 +51,3 @@ async inputPaswordEclipseCheLoginPage(passw) { | ||
Logger_1.Logger.debug('CheLoginPage.clickEclipseCheLoginButton'); | ||
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.id('kc-login')); | ||
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.id('submit-login')); | ||
} | ||
@@ -54,0 +54,0 @@ async isFirstBrokerLoginPageVisible() { |
@@ -134,3 +134,3 @@ "use strict"; | ||
test('Build application', async () => { | ||
const taskName = 'build'; | ||
const taskName = 'maven-build'; | ||
await topMenu.runTask(`${taskName}, ${globalTaskScope}`); | ||
@@ -260,2 +260,6 @@ await terminal.waitIconSuccess(taskName, 500000); | ||
} | ||
else { | ||
const { data } = await httpClient.get(urlToApp); | ||
console.log('>>>>>>>seems the app. is not set under debug properly: >>>>>>>>>>>>>>' + data); | ||
} | ||
} | ||
@@ -262,0 +266,0 @@ } |
@@ -32,2 +32,3 @@ "use strict"; | ||
const inversify_1 = require("inversify"); | ||
const Logger_1 = require("../Logger"); | ||
let CheApiRequestHandler = class CheApiRequestHandler { | ||
@@ -41,11 +42,19 @@ constructor(headerHandler) { | ||
static enableRequestInteceptor() { | ||
console.log(`CheApiRequestHandler.enableRequestInterceptor`); | ||
Logger_1.Logger.debug(`CheApiRequestHandler.enableRequestInterceptor`); | ||
return axios_1.default.interceptors.request.use(request => { | ||
try { | ||
let request_censored = JSON.parse(JSON.stringify(request)); | ||
if (request_censored === undefined) { | ||
Logger_1.Logger.error('JSON.parse returned an undefined object, cannot process request'); | ||
return request; | ||
} | ||
if (request_censored.headers === undefined) { | ||
Logger_1.Logger.warn('Request does not contain any headers object'); | ||
return request; | ||
} | ||
request_censored.headers.Authorization = 'CENSORED'; | ||
console.log(`RequestHandler request:\n`, request_censored); | ||
Logger_1.Logger.info(`RequestHandler request:\n` + request_censored); | ||
} | ||
catch (err) { | ||
console.log(`RequestHandler request: Failed to deep clone AxiosRequestConfig:`, err); | ||
Logger_1.Logger.error(`RequestHandler request: Failed to deep clone AxiosRequestConfig:` + err); | ||
} | ||
@@ -59,3 +68,3 @@ return request; | ||
static enableResponseInterceptor() { | ||
console.log(`CheApiRequestHandler.enableResponseRedirects`); | ||
Logger_1.Logger.debug(`CheApiRequestHandler.enableResponseRedirects`); | ||
return axios_1.default.interceptors.response.use(response => { | ||
@@ -69,2 +78,14 @@ try { | ||
})); | ||
if (response_censored === undefined) { | ||
Logger_1.Logger.error('JSON.parse returned an undefined object, cannot process response'); | ||
return response; | ||
} | ||
if (response_censored.config === undefined) { | ||
Logger_1.Logger.warn('Response does not contain any config object'); | ||
return response; | ||
} | ||
if (response_censored.config.headers === undefined) { | ||
Logger_1.Logger.warn('Response does not contain any config.headers object'); | ||
return response; | ||
} | ||
response_censored.config.headers.Authorization = 'CENSORED'; | ||
@@ -77,6 +98,6 @@ if (response_censored.data.access_token != null) { | ||
} | ||
console.log(`RequestHandler response:\n`, response_censored); | ||
Logger_1.Logger.info(`RequestHandler response:\n` + response_censored); | ||
} | ||
catch (err) { | ||
console.log(`RequestHandler response: Failed to deep clone AxiosResponse:`, err); | ||
Logger_1.Logger.error(`RequestHandler response: Failed to deep clone AxiosResponse:` + err); | ||
} | ||
@@ -83,0 +104,0 @@ return response; |
{ | ||
"name": "@eclipse-che/che-e2e", | ||
"version": "7.43.0-dev-ca842bf", | ||
"version": "7.43.0-dev-fc26d86", | ||
"description": "", | ||
@@ -40,5 +40,5 @@ "main": "dist/index.js", | ||
"@types/selenium-webdriver": "3.0.16", | ||
"axios": "0.21.1", | ||
"axios": "^0.25.0", | ||
"chai": "4.2.0", | ||
"chromedriver": "95.0.0", | ||
"chromedriver": "97.0.0", | ||
"mocha": "^9.1.3", | ||
@@ -45,0 +45,0 @@ "rimraf": "2.6.2", |
@@ -27,3 +27,3 @@ /********************************************************************* | ||
await this.driverHelper.waitVisibility(By.id('kc-form-login'), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT); | ||
await this.driverHelper.waitVisibility(By.id('login'), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT); | ||
} | ||
@@ -34,3 +34,3 @@ | ||
await this.driverHelper.enterValue(By.id('username'), userName); | ||
await this.driverHelper.enterValue(By.id('login'), userName); | ||
} | ||
@@ -47,3 +47,3 @@ | ||
await this.driverHelper.waitAndClick(By.id('kc-login')); | ||
await this.driverHelper.waitAndClick(By.id('submit-login')); | ||
} | ||
@@ -50,0 +50,0 @@ |
@@ -141,3 +141,3 @@ // /********************************************************************* | ||
test('Build application', async () => { | ||
const taskName: string = 'build'; | ||
const taskName: string = 'maven-build'; | ||
await topMenu.runTask(`${taskName}, ${globalTaskScope}`); | ||
@@ -279,2 +279,4 @@ await terminal.waitIconSuccess(taskName, 500_000); | ||
console.log('>>>>The debugger is set >>>>>>>>>>>>>>>>>>> ' + error.message); | ||
} else { const {data} = await httpClient.get(urlToApp); | ||
console.log('>>>>>>>seems the app. is not set under debug properly: >>>>>>>>>>>>>>' + data); | ||
} | ||
@@ -281,0 +283,0 @@ } |
@@ -16,2 +16,3 @@ /********************************************************************* | ||
import { IAuthorizationHeaderHandler } from './headers/IAuthorizationHeaderHandler'; | ||
import { Logger } from '../Logger'; | ||
@@ -25,10 +26,18 @@ @injectable() | ||
public static enableRequestInteceptor(): number { | ||
console.log(`CheApiRequestHandler.enableRequestInterceptor`); | ||
Logger.debug(`CheApiRequestHandler.enableRequestInterceptor`); | ||
return axios.interceptors.request.use( request => { | ||
try { | ||
let request_censored: AxiosRequestConfig = JSON.parse(JSON.stringify(request)); | ||
if (request_censored === undefined) { | ||
Logger.error('JSON.parse returned an undefined object, cannot process request'); | ||
return request; | ||
} | ||
if (request_censored.headers === undefined) { | ||
Logger.warn('Request does not contain any headers object'); | ||
return request; | ||
} | ||
request_censored.headers.Authorization = 'CENSORED'; | ||
console.log(`RequestHandler request:\n`, request_censored); | ||
Logger.info(`RequestHandler request:\n` + request_censored); | ||
} catch (err) { | ||
console.log(`RequestHandler request: Failed to deep clone AxiosRequestConfig:`, err); | ||
Logger.error(`RequestHandler request: Failed to deep clone AxiosRequestConfig:` + err); | ||
} | ||
@@ -43,3 +52,3 @@ return request; | ||
public static enableResponseInterceptor(): number { | ||
console.log(`CheApiRequestHandler.enableResponseRedirects`); | ||
Logger.debug(`CheApiRequestHandler.enableResponseRedirects`); | ||
return axios.interceptors.response.use( response => { | ||
@@ -53,2 +62,14 @@ try { | ||
})); | ||
if (response_censored === undefined) { | ||
Logger.error('JSON.parse returned an undefined object, cannot process response'); | ||
return response; | ||
} | ||
if (response_censored.config === undefined) { | ||
Logger.warn('Response does not contain any config object'); | ||
return response; | ||
} | ||
if (response_censored.config.headers === undefined) { | ||
Logger.warn('Response does not contain any config.headers object'); | ||
return response; | ||
} | ||
response_censored.config.headers.Authorization = 'CENSORED'; | ||
@@ -61,5 +82,5 @@ if (response_censored.data.access_token != null) { | ||
} | ||
console.log(`RequestHandler response:\n`, response_censored); | ||
Logger.info(`RequestHandler response:\n` + response_censored); | ||
} catch (err) { | ||
console.log(`RequestHandler response: Failed to deep clone AxiosResponse:`, err); | ||
Logger.error(`RequestHandler response: Failed to deep clone AxiosResponse:` + err); | ||
} | ||
@@ -66,0 +87,0 @@ return response; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Unidentified License
License(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.
Found 2 instances in 1 package
Unidentified License
License(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.
Found 2 instances in 1 package
1521190
20610