@eclipse-che/che-e2e 7.74.0-dev-41d1364 → 7.74.0-dev-715064a
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/.eslintrc.js +15 -1
- package/CODE_STYLE.md +144 -0
- package/configs/inversify.config.ts +26 -5
- package/configs/inversify.types.ts +17 -3
- package/constants/CHROME_DRIVER_CONSTANTS.ts +1 -13
- package/dist/configs/inversify.config.js +22 -1
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/inversify.types.js +17 -3
- package/dist/configs/inversify.types.js.map +1 -1
- package/dist/constants/CHROME_DRIVER_CONSTANTS.js +1 -9
- package/dist/constants/CHROME_DRIVER_CONSTANTS.js.map +1 -1
- package/dist/driver/ChromeDriver.js +1 -7
- package/dist/driver/ChromeDriver.js.map +1 -1
- package/dist/index.js +9 -3
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +5 -5
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +5 -6
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +34 -39
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +27 -28
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +2 -2
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js +18 -4
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js +11 -11
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +2 -2
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpLoginPage.js +20 -24
- package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +10 -13
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +3 -3
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js +16 -20
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +16 -15
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpApplicationPage.js +7 -7
- package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js +20 -20
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpMainPage.js +38 -25
- package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
- package/dist/specs/MochaHooks.js +9 -6
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +6 -6
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +7 -14
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +11 -19
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +10 -16
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/specs/api/PodOverridesAPI.spec.js +7 -14
- package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +5 -5
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/Quarkus.spec.js +6 -6
- package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +11 -11
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +11 -12
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +13 -16
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +17 -18
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +17 -19
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +35 -41
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
- package/dist/specs/web-terminal/WebTerminalTest.spec.js +23 -0
- package/dist/specs/web-terminal/WebTerminalTest.spec.js.map +1 -0
- package/dist/tests-library/LoginTests.js +8 -8
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/tests-library/ProjectAndFileTests.js +2 -2
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +8 -8
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/BrowserTabsUtil.js +4 -9
- package/dist/utils/BrowserTabsUtil.js.map +1 -1
- package/dist/utils/CheReporter.js +49 -23
- package/dist/utils/CheReporter.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +27 -17
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesRegistryHelper.js +15 -5
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
- package/dist/utils/DriverHelper.js +9 -2
- package/dist/utils/DriverHelper.js.map +1 -1
- package/dist/utils/IContextParams.js +12 -0
- package/dist/utils/IContextParams.js.map +1 -0
- package/dist/utils/IKubernetesCommandLineToolsExecutor.js +3 -0
- package/dist/utils/IKubernetesCommandLineToolsExecutor.js.map +1 -0
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +133 -98
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/dist/utils/ScreenCatcher.js +8 -4
- package/dist/utils/ScreenCatcher.js.map +1 -1
- package/dist/utils/ShellExecutor.js +20 -9
- package/dist/utils/ShellExecutor.js.map +1 -1
- package/dist/utils/StringUtil.js +4 -2
- package/dist/utils/StringUtil.js.map +1 -1
- package/dist/utils/request-handlers/CheApiRequestHandler.js +2 -2
- package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +2 -2
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/dist/utils/workspace/ApiUrlResolver.js +2 -2
- package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
- package/dist/utils/workspace/TestWorkspaceUtil.js +4 -4
- package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
- package/driver/ChromeDriver.ts +0 -7
- package/index.ts +2 -0
- package/package.json +3 -3
- package/pageobjects/dashboard/CreateWorkspace.ts +5 -4
- package/pageobjects/dashboard/Dashboard.ts +3 -4
- package/pageobjects/dashboard/Workspaces.ts +40 -48
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +23 -26
- package/pageobjects/ide/CheCodeLocatorLoader.ts +3 -1
- package/pageobjects/login/interfaces/ICheLoginPage.ts +1 -1
- package/pageobjects/login/interfaces/IOcpLoginPage.ts +1 -1
- package/pageobjects/login/kubernetes/DexLoginPage.ts +9 -9
- package/pageobjects/login/openshift/OcpLoginPage.ts +18 -30
- package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +6 -11
- package/pageobjects/login/openshift/OcpUserLoginPage.ts +1 -1
- package/pageobjects/login/openshift/RedHatLoginPage.ts +17 -16
- package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +16 -11
- package/pageobjects/openshift/OcpApplicationPage.ts +5 -4
- package/pageobjects/openshift/OcpImportFromGitPage.ts +18 -20
- package/pageobjects/openshift/OcpMainPage.ts +42 -25
- package/specs/MochaHooks.ts +3 -5
- package/specs/SmokeTest.spec.ts +4 -5
- package/specs/api/ContainerOverridesAPI.spec.ts +8 -2
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +9 -7
- package/specs/api/EmptyWorkspaceAPI.spec.ts +8 -4
- package/specs/api/PodOverridesAPI.spec.ts +8 -3
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +5 -5
- package/specs/dashboard-samples/Quarkus.spec.ts +7 -6
- package/specs/dashboard-samples/RecommendedExtensions.spec.ts +8 -7
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +12 -11
- package/specs/factory/Factory.spec.ts +8 -12
- package/specs/factory/NoSetupRepoFactory.spec.ts +10 -11
- package/specs/factory/RefusedOAuthFactory.spec.ts +8 -10
- package/specs/miscellaneous/PredefinedNamespace.spec.ts +40 -44
- package/specs/web-terminal/WebTerminalTest.spec.ts +25 -0
- package/tests-library/LoginTests.ts +3 -3
- package/tests-library/WorkspaceHandlingTests.ts +2 -2
- package/utils/BrowserTabsUtil.ts +7 -9
- package/utils/CheReporter.ts +26 -20
- package/utils/DevWorkspaceConfigurationHelper.ts +9 -24
- package/utils/DevfilesRegistryHelper.ts +8 -3
- package/utils/DriverHelper.ts +14 -12
- package/utils/IContextParams.ts +26 -0
- package/utils/IKubernetesCommandLineToolsExecutor.ts +42 -0
- package/utils/KubernetesCommandLineToolsExecutor.ts +133 -101
- package/utils/ShellExecutor.ts +10 -7
- package/utils/StringUtil.ts +6 -1
|
@@ -34,12 +34,12 @@ let LoginTests = class LoginTests {
|
|
|
34
34
|
this.ocpLoginPage = ocpLoginPage;
|
|
35
35
|
this.dashboard = dashboard;
|
|
36
36
|
}
|
|
37
|
-
loginIntoChe() {
|
|
37
|
+
loginIntoChe(userName, password) {
|
|
38
38
|
test('Login', async () => {
|
|
39
39
|
if (!(await this.browserTabsUtil.getCurrentUrl()).includes(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL)) {
|
|
40
40
|
await this.browserTabsUtil.navigateTo(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL);
|
|
41
41
|
}
|
|
42
|
-
await this.productLoginPage.login();
|
|
42
|
+
await this.productLoginPage.login(userName, password);
|
|
43
43
|
await this.browserTabsUtil.maximize();
|
|
44
44
|
await this.dashboard.waitStartingPageLoaderDisappearance();
|
|
45
45
|
});
|
|
@@ -48,7 +48,7 @@ let LoginTests = class LoginTests {
|
|
|
48
48
|
test('Login into ocp console', async () => {
|
|
49
49
|
const openshiftConsoleUrl = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace('devspaces', 'console-openshift-console');
|
|
50
50
|
await this.browserTabsUtil.navigateTo(openshiftConsoleUrl);
|
|
51
|
-
this.ocpLoginPage.login();
|
|
51
|
+
await this.ocpLoginPage.login();
|
|
52
52
|
await this.browserTabsUtil.maximize();
|
|
53
53
|
});
|
|
54
54
|
}
|
|
@@ -59,11 +59,11 @@ let LoginTests = class LoginTests {
|
|
|
59
59
|
}
|
|
60
60
|
};
|
|
61
61
|
LoginTests = __decorate([
|
|
62
|
-
inversify_1.injectable(),
|
|
63
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
64
|
-
__param(1, inversify_1.inject(inversify_types_1.TYPES.CheLogin)),
|
|
65
|
-
__param(2, inversify_1.inject(inversify_types_1.TYPES.OcpLogin)),
|
|
66
|
-
__param(3, inversify_1.inject(inversify_types_1.CLASSES.Dashboard)),
|
|
62
|
+
(0, inversify_1.injectable)(),
|
|
63
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
64
|
+
__param(1, (0, inversify_1.inject)(inversify_types_1.TYPES.CheLogin)),
|
|
65
|
+
__param(2, (0, inversify_1.inject)(inversify_types_1.TYPES.OcpLogin)),
|
|
66
|
+
__param(3, (0, inversify_1.inject)(inversify_types_1.CLASSES.Dashboard)),
|
|
67
67
|
__metadata("design:paramtypes", [BrowserTabsUtil_1.BrowserTabsUtil, Object, Object, Dashboard_1.Dashboard])
|
|
68
68
|
], LoginTests);
|
|
69
69
|
exports.LoginTests = LoginTests;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginTests.js","sourceRoot":"","sources":["../../tests-library/LoginTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,gEAA4D;AAE5D,8DAA2D;AAC3D,yCAA+C;AAC/C,kEAA+D;AAE/D,0EAAuE;
|
|
1
|
+
{"version":3,"file":"LoginTests.js","sourceRoot":"","sources":["../../tests-library/LoginTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,gEAA4D;AAE5D,8DAA2D;AAC3D,yCAA+C;AAC/C,kEAA+D;AAE/D,0EAAuE;AAGhE,IAAM,UAAU,GAAhB,MAAM,UAAU;IACtB,YAEkB,eAAgC,EAEhC,gBAA+B,EACP,YAA2B,EACxB,SAAoB;QAJ/C,oBAAe,GAAf,eAAe,CAAiB;QAEhC,qBAAgB,GAAhB,gBAAgB,CAAe;QACP,iBAAY,GAAZ,YAAY,CAAe;QACxB,cAAS,GAAT,SAAS,CAAW;IAC9D,CAAC;IAEJ,YAAY,CAAC,QAAiB,EAAE,QAAiB;QAChD,IAAI,CAAC,OAAO,EAAE,KAAK,IAAmB,EAAE;YACvC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,yCAAmB,CAAC,oBAAoB,CAAC,EAAE;gBACrG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,yCAAmB,CAAC,oBAAoB,CAAC,CAAC;aAChF;YACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACtD,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,SAAS,CAAC,mCAAmC,EAAE,CAAC;QAC5D,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,mBAAmB;QAClB,IAAI,CAAC,wBAAwB,EAAE,KAAK,IAAmB,EAAE;YACxD,MAAM,mBAAmB,GAAW,yCAAmB,CAAC,oBAAoB,CAAC,OAAO,CAAC,WAAW,EAAE,2BAA2B,CAAC,CAAC;YAC/H,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;YAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,aAAa;QACZ,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAmB,EAAE;YACxC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAnCY,UAAU;IADtB,IAAA,sBAAU,GAAE;IAGV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAE/B,WAAA,IAAA,kBAAM,EAAC,uBAAK,CAAC,QAAQ,CAAC,CAAA;IAEtB,WAAA,IAAA,kBAAM,EAAC,uBAAK,CAAC,QAAQ,CAAC,CAAA;IACtB,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,SAAS,CAAC,CAAA;qCAJQ,iCAAe,kBAIM,qBAAS;GAPrD,UAAU,CAmCtB;AAnCY,gCAAU"}
|
|
@@ -50,8 +50,8 @@ let ProjectAndFileTests = class ProjectAndFileTests {
|
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
52
|
ProjectAndFileTests = __decorate([
|
|
53
|
-
inversify_1.injectable(),
|
|
54
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
53
|
+
(0, inversify_1.injectable)(),
|
|
54
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
55
55
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
56
56
|
], ProjectAndFileTests);
|
|
57
57
|
exports.ProjectAndFileTests = ProjectAndFileTests;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../tests-library/ProjectAndFileTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAA+C;AAC/C,wDAAqD;AACrD,gEAAqD;AACrD,4CAAyC;AACzC,sEAAmE;
|
|
1
|
+
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../tests-library/ProjectAndFileTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAA+C;AAC/C,wDAAqD;AACrD,gEAAqD;AACrD,4CAAyC;AACzC,sEAAmE;AAG5D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,sCAAsC;QAC3C,eAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACpC,IAAI;YACH,MAAM,KAAK,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,YAAY;iBACrB,SAAS,EAAE;iBACX,IAAI,CAAC,0BAAK,CAAC,cAAc,CAAC,uBAAE,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,EAAE,qCAAiB,CAAC,mCAAmC,CAAC,CAAC;YACtH,MAAM,GAAG,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACzC,eAAM,CAAC,KAAK,CAAC,wBAAwB,GAAG,GAAG,KAAK,WAAW,CAAC,CAAC;SAC7D;QAAC,OAAO,GAAG,EAAE;YACb,eAAM,CAAC,KAAK,CAAC,2CAA2C,GAAG,EAAE,CAAC,CAAC;YAC/D,MAAM,GAAG,CAAC;SACV;IACF,CAAC;CACD,CAAA;AApBY,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;IAGV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GAHhC,mBAAmB,CAoB/B;AApBY,kDAAmB"}
|
|
@@ -80,7 +80,7 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
80
80
|
try {
|
|
81
81
|
const startingWorkspaceLineContent = await this.driverHelper
|
|
82
82
|
.getDriver()
|
|
83
|
-
.findElement(WorkspaceHandlingTests_1.
|
|
83
|
+
.findElement(WorkspaceHandlingTests_1.WORKSPACE_NAME)
|
|
84
84
|
.getText();
|
|
85
85
|
Logger_1.Logger.trace(`obtained starting workspace getText():${startingWorkspaceLineContent}`);
|
|
86
86
|
// cutting away leading text
|
|
@@ -123,15 +123,15 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
123
123
|
await this.dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
|
|
124
124
|
}
|
|
125
125
|
};
|
|
126
|
-
WorkspaceHandlingTests.
|
|
126
|
+
WorkspaceHandlingTests.WORKSPACE_NAME = selenium_webdriver_1.By.xpath('//h1[contains(.,"Starting workspace ")]');
|
|
127
127
|
WorkspaceHandlingTests.workspaceName = 'undefined';
|
|
128
128
|
WorkspaceHandlingTests = WorkspaceHandlingTests_1 = __decorate([
|
|
129
|
-
inversify_1.injectable(),
|
|
130
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.Dashboard)),
|
|
131
|
-
__param(1, inversify_1.inject(inversify_types_1.CLASSES.CreateWorkspace)),
|
|
132
|
-
__param(2, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
133
|
-
__param(3, inversify_1.inject(inversify_types_1.CLASSES.ApiUrlResolver)),
|
|
134
|
-
__param(4, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
129
|
+
(0, inversify_1.injectable)(),
|
|
130
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.Dashboard)),
|
|
131
|
+
__param(1, (0, inversify_1.inject)(inversify_types_1.CLASSES.CreateWorkspace)),
|
|
132
|
+
__param(2, (0, inversify_1.inject)(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
133
|
+
__param(3, (0, inversify_1.inject)(inversify_types_1.CLASSES.ApiUrlResolver)),
|
|
134
|
+
__param(4, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
135
135
|
__metadata("design:paramtypes", [Dashboard_1.Dashboard,
|
|
136
136
|
CreateWorkspace_1.CreateWorkspace,
|
|
137
137
|
BrowserTabsUtil_1.BrowserTabsUtil,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceHandlingTests.js","sourceRoot":"","sources":["../../tests-library/WorkspaceHandlingTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,gEAAqD;AACrD,kEAA+D;AAC/D,8EAA2E;AAC3E,8DAA2D;AAC3D,4CAAyC;AACzC,sEAAmE;AACnE,sEAAmE;AACnE,wDAAqD;AACrD,2DAA+C;
|
|
1
|
+
{"version":3,"file":"WorkspaceHandlingTests.js","sourceRoot":"","sources":["../../tests-library/WorkspaceHandlingTests.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,6 @@ const inversify_1 = require("inversify");
|
|
|
26
26
|
const inversify_types_1 = require("../configs/inversify.types");
|
|
27
27
|
const DriverHelper_1 = require("./DriverHelper");
|
|
28
28
|
const Logger_1 = require("./Logger");
|
|
29
|
-
const TIMEOUT_CONSTANTS_1 = require("../constants/TIMEOUT_CONSTANTS");
|
|
30
29
|
const CHROME_DRIVER_CONSTANTS_1 = require("../constants/CHROME_DRIVER_CONSTANTS");
|
|
31
30
|
let BrowserTabsUtil = class BrowserTabsUtil {
|
|
32
31
|
constructor(driverHelper) {
|
|
@@ -46,12 +45,7 @@ let BrowserTabsUtil = class BrowserTabsUtil {
|
|
|
46
45
|
}
|
|
47
46
|
async navigateTo(url) {
|
|
48
47
|
Logger_1.Logger.debug(`${url}`);
|
|
49
|
-
await this.driverHelper.
|
|
50
|
-
}
|
|
51
|
-
async navigateAndWaitToUrl(url, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL) {
|
|
52
|
-
Logger_1.Logger.trace(`${url}`);
|
|
53
|
-
await this.navigateTo(url);
|
|
54
|
-
await this.waitURL(url, timeout);
|
|
48
|
+
await this.driverHelper.navigateToUrl(url);
|
|
55
49
|
}
|
|
56
50
|
async waitAndSwitchToAnotherWindow(currentWindowHandle, timeout) {
|
|
57
51
|
Logger_1.Logger.debug();
|
|
@@ -71,6 +65,7 @@ let BrowserTabsUtil = class BrowserTabsUtil {
|
|
|
71
65
|
await (await this.driverHelper.getDriver()).navigate().refresh();
|
|
72
66
|
}
|
|
73
67
|
async getCurrentUrl() {
|
|
68
|
+
Logger_1.Logger.trace();
|
|
74
69
|
return await this.driverHelper.getDriver().getCurrentUrl();
|
|
75
70
|
}
|
|
76
71
|
async waitURL(expectedUrl, timeout) {
|
|
@@ -108,8 +103,8 @@ let BrowserTabsUtil = class BrowserTabsUtil {
|
|
|
108
103
|
}
|
|
109
104
|
};
|
|
110
105
|
BrowserTabsUtil = __decorate([
|
|
111
|
-
inversify_1.injectable(),
|
|
112
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
106
|
+
(0, inversify_1.injectable)(),
|
|
107
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
113
108
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
114
109
|
], BrowserTabsUtil);
|
|
115
110
|
exports.BrowserTabsUtil = BrowserTabsUtil;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrowserTabsUtil.js","sourceRoot":"","sources":["../../utils/BrowserTabsUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,yCAA+C;AAC/C,gEAAqD;AACrD,iDAA8C;AAC9C,qCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"BrowserTabsUtil.js","sourceRoot":"","sources":["../../utils/BrowserTabsUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -11,13 +15,26 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
11
15
|
}) : function(o, v) {
|
|
12
16
|
o["default"] = v;
|
|
13
17
|
});
|
|
18
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
19
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
21
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
22
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
|
+
};
|
|
14
24
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
25
|
if (mod && mod.__esModule) return mod;
|
|
16
26
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
27
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
28
|
__setModuleDefault(result, mod);
|
|
19
29
|
return result;
|
|
20
30
|
};
|
|
31
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
32
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
|
+
};
|
|
34
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
35
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
36
|
+
};
|
|
37
|
+
var CheReporter_1;
|
|
21
38
|
/** *******************************************************************
|
|
22
39
|
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
23
40
|
*
|
|
@@ -31,22 +48,22 @@ const mocha = __importStar(require("mocha"));
|
|
|
31
48
|
const inversify_types_1 = require("../configs/inversify.types");
|
|
32
49
|
const fs = __importStar(require("fs"));
|
|
33
50
|
const rm = __importStar(require("rimraf"));
|
|
51
|
+
const DriverHelper_1 = require("./DriverHelper");
|
|
52
|
+
const ScreenCatcher_1 = require("./ScreenCatcher");
|
|
34
53
|
const TIMEOUT_CONSTANTS_1 = require("../constants/TIMEOUT_CONSTANTS");
|
|
35
54
|
const Logger_1 = require("./Logger");
|
|
36
|
-
const inversify_config_1 = require("../configs/inversify.config");
|
|
37
55
|
const StringUtil_1 = require("./StringUtil");
|
|
38
56
|
const BASE_TEST_CONSTANTS_1 = require("../constants/BASE_TEST_CONSTANTS");
|
|
39
57
|
const CHROME_DRIVER_CONSTANTS_1 = require("../constants/CHROME_DRIVER_CONSTANTS");
|
|
40
58
|
const OAUTH_CONSTANTS_1 = require("../constants/OAUTH_CONSTANTS");
|
|
41
59
|
const REPORTER_CONSTANTS_1 = require("../constants/REPORTER_CONSTANTS");
|
|
42
60
|
const PLUGIN_TEST_CONSTANTS_1 = require("../constants/PLUGIN_TEST_CONSTANTS");
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
let deleteScreencast = true;
|
|
47
|
-
class CheReporter extends mocha.reporters.Spec {
|
|
48
|
-
constructor(runner, options) {
|
|
61
|
+
const inversify_1 = require("inversify");
|
|
62
|
+
let CheReporter = CheReporter_1 = class CheReporter extends mocha.reporters.Spec {
|
|
63
|
+
constructor(runner, options, driverHelper, screenCatcher) {
|
|
49
64
|
super(runner, options);
|
|
65
|
+
this.driverHelper = driverHelper;
|
|
66
|
+
this.screenCatcher = screenCatcher;
|
|
50
67
|
runner.on('start', () => {
|
|
51
68
|
let launchInformation = `################## Launch Information ##################
|
|
52
69
|
|
|
@@ -85,17 +102,17 @@ class CheReporter extends mocha.reporters.Spec {
|
|
|
85
102
|
console.log(launchInformation);
|
|
86
103
|
rm.sync(REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER);
|
|
87
104
|
});
|
|
88
|
-
runner.on('test', async
|
|
105
|
+
runner.on('test', async (test) => {
|
|
89
106
|
if (!REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_EXECUTION_SCREENCAST) {
|
|
90
107
|
return;
|
|
91
108
|
}
|
|
92
|
-
methodIndex = methodIndex + 1;
|
|
93
|
-
const currentMethodIndex = methodIndex;
|
|
109
|
+
CheReporter_1.methodIndex = CheReporter_1.methodIndex + 1;
|
|
110
|
+
const currentMethodIndex = CheReporter_1.methodIndex;
|
|
94
111
|
let iterationIndex = 1;
|
|
95
112
|
while (!(test.state === 'passed' || test.state === 'failed')) {
|
|
96
|
-
await screenCatcher.catchMethodScreen(test.title, currentMethodIndex, iterationIndex);
|
|
113
|
+
await this.screenCatcher.catchMethodScreen(test.title, currentMethodIndex, iterationIndex);
|
|
97
114
|
iterationIndex = iterationIndex + 1;
|
|
98
|
-
await driverHelper.wait(REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_DELAY_BETWEEN_SCREENSHOTS);
|
|
115
|
+
await this.driverHelper.wait(REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_DELAY_BETWEEN_SCREENSHOTS);
|
|
99
116
|
}
|
|
100
117
|
});
|
|
101
118
|
runner.on('pass', (test) => {
|
|
@@ -111,18 +128,18 @@ class CheReporter extends mocha.reporters.Spec {
|
|
|
111
128
|
});
|
|
112
129
|
runner.on('end', async () => {
|
|
113
130
|
// ensure that fired events done
|
|
114
|
-
await driverHelper.wait(5000);
|
|
131
|
+
await this.driverHelper.wait(5000);
|
|
115
132
|
// close driver
|
|
116
|
-
await driverHelper.getDriver().quit();
|
|
133
|
+
await this.driverHelper.getDriver().quit();
|
|
117
134
|
// delete screencast folder if conditions matched
|
|
118
|
-
if (deleteScreencast && REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.DELETE_SCREENCAST_IF_TEST_PASS) {
|
|
135
|
+
if (CheReporter_1.deleteScreencast && REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.DELETE_SCREENCAST_IF_TEST_PASS) {
|
|
119
136
|
rm.sync(REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER);
|
|
120
137
|
}
|
|
121
138
|
});
|
|
122
|
-
runner.on('fail', async
|
|
139
|
+
runner.on('fail', async (test) => {
|
|
123
140
|
Logger_1.Logger.error(`CheReporter runner.on.fail: ${test.fullTitle()} failed after ${test.duration}ms`);
|
|
124
141
|
// raise flag for keeping the screencast
|
|
125
|
-
deleteScreencast = false;
|
|
142
|
+
CheReporter_1.deleteScreencast = false;
|
|
126
143
|
Logger_1.Logger.trace(`FullTitle:${test.fullTitle()}`);
|
|
127
144
|
const testFullTitle = StringUtil_1.StringUtil.sanitizeTitle(test.fullTitle());
|
|
128
145
|
Logger_1.Logger.trace(`FullTitleSanitized:${testFullTitle}`);
|
|
@@ -144,17 +161,17 @@ class CheReporter extends mocha.reporters.Spec {
|
|
|
144
161
|
fs.mkdirSync(testReportDirPath);
|
|
145
162
|
}
|
|
146
163
|
// take screenshot and write to file
|
|
147
|
-
const screenshot = await driverHelper.getDriver().takeScreenshot();
|
|
164
|
+
const screenshot = await this.driverHelper.getDriver().takeScreenshot();
|
|
148
165
|
const screenshotStream = fs.createWriteStream(screenshotFileName);
|
|
149
166
|
screenshotStream.write(Buffer.from(screenshot, 'base64'));
|
|
150
167
|
screenshotStream.end();
|
|
151
168
|
// take page source and write to file
|
|
152
|
-
const pageSource = await driverHelper.getDriver().getPageSource();
|
|
169
|
+
const pageSource = await this.driverHelper.getDriver().getPageSource();
|
|
153
170
|
const pageSourceStream = fs.createWriteStream(pageSourceFileName);
|
|
154
171
|
pageSourceStream.write(Buffer.from(pageSource));
|
|
155
172
|
pageSourceStream.end();
|
|
156
173
|
// take browser console logs and write to file
|
|
157
|
-
const browserLogsEntries = await driverHelper.getDriver().manage().logs().get('browser');
|
|
174
|
+
const browserLogsEntries = await this.driverHelper.getDriver().manage().logs().get('browser');
|
|
158
175
|
let browserLogs = '';
|
|
159
176
|
browserLogsEntries.forEach((log) => {
|
|
160
177
|
browserLogs += `\"${log.level}\" \"${log.type}\" \"${log.message}\"\n`;
|
|
@@ -164,6 +181,15 @@ class CheReporter extends mocha.reporters.Spec {
|
|
|
164
181
|
browserLogsStream.end();
|
|
165
182
|
});
|
|
166
183
|
}
|
|
167
|
-
}
|
|
184
|
+
};
|
|
185
|
+
CheReporter.methodIndex = 0;
|
|
186
|
+
CheReporter.deleteScreencast = true;
|
|
187
|
+
CheReporter = CheReporter_1 = __decorate([
|
|
188
|
+
(0, inversify_1.injectable)(),
|
|
189
|
+
__param(2, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
190
|
+
__param(3, (0, inversify_1.inject)(inversify_types_1.CLASSES.ScreenCatcher)),
|
|
191
|
+
__metadata("design:paramtypes", [mocha.Runner, Object, DriverHelper_1.DriverHelper,
|
|
192
|
+
ScreenCatcher_1.ScreenCatcher])
|
|
193
|
+
], CheReporter);
|
|
168
194
|
module.exports = CheReporter;
|
|
169
195
|
//# sourceMappingURL=CheReporter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheReporter.js","sourceRoot":"","sources":["../../utils/CheReporter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CheReporter.js","sourceRoot":"","sources":["../../utils/CheReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -11,36 +15,38 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
11
15
|
}) : function(o, v) {
|
|
12
16
|
o["default"] = v;
|
|
13
17
|
});
|
|
18
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
19
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
21
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
22
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
|
+
};
|
|
14
24
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
25
|
if (mod && mod.__esModule) return mod;
|
|
16
26
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
27
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
28
|
__setModuleDefault(result, mod);
|
|
19
29
|
return result;
|
|
20
30
|
};
|
|
31
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
32
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
|
+
};
|
|
21
34
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
22
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
36
|
};
|
|
24
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
38
|
exports.DevWorkspaceConfigurationHelper = void 0;
|
|
26
|
-
/** *******************************************************************
|
|
27
|
-
* copyright (c) 2023 Red Hat, Inc.
|
|
28
|
-
*
|
|
29
|
-
* This program and the accompanying materials are made
|
|
30
|
-
* available under the terms of the Eclipse Public License 2.0
|
|
31
|
-
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
32
|
-
*
|
|
33
|
-
* SPDX-License-Identifier: EPL-2.0
|
|
34
|
-
**********************************************************************/
|
|
35
|
-
const main_1 = require("@eclipse-che/che-devworkspace-generator/lib/main");
|
|
36
39
|
const yaml_1 = __importDefault(require("yaml"));
|
|
37
40
|
const axios = __importStar(require("axios"));
|
|
38
41
|
const Logger_1 = require("./Logger");
|
|
39
|
-
const ShellExecutor_1 = require("./ShellExecutor");
|
|
40
42
|
const API_TEST_CONSTANTS_1 = require("../constants/API_TEST_CONSTANTS");
|
|
41
|
-
|
|
43
|
+
const inversify_1 = require("inversify");
|
|
44
|
+
const inversify_config_1 = require("../configs/inversify.config");
|
|
45
|
+
const inversify_types_1 = require("../configs/inversify.types");
|
|
46
|
+
let DevWorkspaceConfigurationHelper = class DevWorkspaceConfigurationHelper {
|
|
42
47
|
constructor(params) {
|
|
43
|
-
this.generator =
|
|
48
|
+
this.generator = inversify_config_1.e2eContainer.get(inversify_types_1.EXTERNAL_CLASSES.Generator);
|
|
49
|
+
this.shellExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ShellExecutor);
|
|
44
50
|
// check if all undefined
|
|
45
51
|
if (!(params.editorPath || params.editorEntry || params.editorContent)) {
|
|
46
52
|
params.editorEntry = 'che-incubator/che-code/latest';
|
|
@@ -58,7 +64,7 @@ class DevWorkspaceConfigurationHelper {
|
|
|
58
64
|
params.pluginRegistryUrl = API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_PLUGIN_REGISTRY_URL;
|
|
59
65
|
}
|
|
60
66
|
if (API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI && !params.editorContent) {
|
|
61
|
-
params.editorContent =
|
|
67
|
+
params.editorContent = this.shellExecutor.curl(API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI).stdout;
|
|
62
68
|
}
|
|
63
69
|
this.params = params;
|
|
64
70
|
}
|
|
@@ -76,6 +82,10 @@ class DevWorkspaceConfigurationHelper {
|
|
|
76
82
|
allContentArray.push(yaml_1.default.stringify(context.devWorkspace));
|
|
77
83
|
return allContentArray.join('---\n');
|
|
78
84
|
}
|
|
79
|
-
}
|
|
85
|
+
};
|
|
86
|
+
DevWorkspaceConfigurationHelper = __decorate([
|
|
87
|
+
(0, inversify_1.injectable)(),
|
|
88
|
+
__metadata("design:paramtypes", [Object])
|
|
89
|
+
], DevWorkspaceConfigurationHelper);
|
|
80
90
|
exports.DevWorkspaceConfigurationHelper = DevWorkspaceConfigurationHelper;
|
|
81
91
|
//# sourceMappingURL=DevWorkspaceConfigurationHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,gDAAwB;AACxB,6CAA+B;AAC/B,qCAAkC;AAElC,wEAAqE;AACrE,yCAAuC;AAEvC,kEAA2D;AAC3D,gEAAuE;AAGhE,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAM3C,YAAY,MAAsB;QAL1B,cAAS,GAAc,+BAAY,CAAC,GAAG,CAAC,kCAAgB,CAAC,SAAS,CAAC,CAAC;QACpE,kBAAa,GAAkB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,aAAa,CAAC,CAAC;QAK9E,yBAAyB;QACzB,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE;YACvE,MAAM,CAAC,WAAW,GAAG,+BAA+B,CAAC;SACrD;QACD,iCAAiC;QACjC,IAAI,uCAAkB,CAAC,qBAAqB,IAAI,MAAM,CAAC,qBAAqB,EAAE;YAC7E,MAAM,CAAC,sBAAsB,GAAG,MAAM,CAAC;YACvC,sEAAsE;YACtE,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE;gBAClC,MAAM,CAAC,qBAAqB,GAAG,uCAAkB,CAAC,qBAAqB,CAAC;aACxE;SACD;QACD,2DAA2D;QAC3D,IAAI,uCAAkB,CAAC,+BAA+B,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YACpF,MAAM,CAAC,iBAAiB,GAAG,uCAAkB,CAAC,+BAA+B,CAAC;SAC9E;QACD,IAAI,uCAAkB,CAAC,uCAAuC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACxF,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,uCAAkB,CAAC,uCAAuC,CAAC,CAAC,MAAM,CAAC;SAClH;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC3B,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC1B;QACD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,iCAE7C,IAAI,CAAC,MAAM,KACd,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,KAE/B,KAAK,CAAC,OAAc,CACpB,CAAC;IACH,CAAC;IAED,yDAAyD;IACzD,wCAAwC,CAAC,OAAuB;QAC/D,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,eAAe,GAAU,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,QAAsC,EAAU,EAAE,CACnH,cAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CACxB,CAAC;QACF,eAAe,CAAC,IAAI,CAAC,cAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QAE3D,OAAO,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;CACD,CAAA;AArDY,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;;GACA,+BAA+B,CAqD3C;AArDY,0EAA+B"}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
2
8
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
9
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
10
|
};
|
|
@@ -17,13 +23,14 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
17
23
|
const Logger_1 = require("./Logger");
|
|
18
24
|
const yaml_1 = __importDefault(require("yaml"));
|
|
19
25
|
const API_TEST_CONSTANTS_1 = require("../constants/API_TEST_CONSTANTS");
|
|
20
|
-
|
|
26
|
+
const inversify_1 = require("inversify");
|
|
27
|
+
let DevfilesRegistryHelper = class DevfilesRegistryHelper {
|
|
21
28
|
async getInbuiltDevfilesRegistryContent() {
|
|
22
|
-
Logger_1.Logger.
|
|
29
|
+
Logger_1.Logger.trace();
|
|
23
30
|
return await this.getContent(API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.INBUILT_APPLICATION_DEVFILE_REGISTRY_URL());
|
|
24
31
|
}
|
|
25
32
|
async getGitHubCheDevfileRegistryContent() {
|
|
26
|
-
Logger_1.Logger.
|
|
33
|
+
Logger_1.Logger.trace();
|
|
27
34
|
return await this.getContent(API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL);
|
|
28
35
|
}
|
|
29
36
|
async collectPathsToDevfilesFromRegistry() {
|
|
@@ -72,7 +79,7 @@ class DevfilesRegistryHelper {
|
|
|
72
79
|
return devfileSamples;
|
|
73
80
|
}
|
|
74
81
|
async getContent(url, headers) {
|
|
75
|
-
Logger_1.Logger.
|
|
82
|
+
Logger_1.Logger.trace(`${url}`);
|
|
76
83
|
let response;
|
|
77
84
|
try {
|
|
78
85
|
response = await axios_1.default.get(url, headers);
|
|
@@ -83,6 +90,9 @@ class DevfilesRegistryHelper {
|
|
|
83
90
|
}
|
|
84
91
|
return response === null || response === void 0 ? void 0 : response.data;
|
|
85
92
|
}
|
|
86
|
-
}
|
|
93
|
+
};
|
|
94
|
+
DevfilesRegistryHelper = __decorate([
|
|
95
|
+
(0, inversify_1.injectable)()
|
|
96
|
+
], DevfilesRegistryHelper);
|
|
87
97
|
exports.DevfilesRegistryHelper = DevfilesRegistryHelper;
|
|
88
98
|
//# sourceMappingURL=DevfilesRegistryHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevfilesRegistryHelper.js","sourceRoot":"","sources":["../../utils/DevfilesRegistryHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DevfilesRegistryHelper.js","sourceRoot":"","sources":["../../utils/DevfilesRegistryHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -563,25 +563,32 @@ let DriverHelper = class DriverHelper {
|
|
|
563
563
|
throw new selenium_webdriver_1.error.TimeoutError(`Exceeded maximum mouse move attempts, for the '${elementLocator}' element`);
|
|
564
564
|
}
|
|
565
565
|
async scrollToAndClick(elementLocator, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM) {
|
|
566
|
+
Logger_1.Logger.trace();
|
|
566
567
|
await this.scrollTo(elementLocator, timeout);
|
|
567
568
|
await this.waitAndClick(elementLocator, timeout);
|
|
568
569
|
}
|
|
569
570
|
async scrollToAndEnterValue(elementLocator, value, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM) {
|
|
571
|
+
Logger_1.Logger.trace();
|
|
570
572
|
await this.scrollTo(elementLocator, timeout);
|
|
571
573
|
await this.enterValue(elementLocator, value, timeout);
|
|
572
574
|
}
|
|
573
575
|
// method is useful to debug page object elements
|
|
574
576
|
async highLightElement(element) {
|
|
577
|
+
Logger_1.Logger.trace();
|
|
575
578
|
await this.getDriver().executeScript('arguments[0].style.border="2px solid red"', element);
|
|
576
579
|
}
|
|
577
580
|
getDriver() {
|
|
578
581
|
Logger_1.Logger.trace();
|
|
579
582
|
return this.driver;
|
|
580
583
|
}
|
|
584
|
+
async navigateToUrl(url) {
|
|
585
|
+
Logger_1.Logger.trace();
|
|
586
|
+
await this.getDriver().navigate().to(url);
|
|
587
|
+
}
|
|
581
588
|
};
|
|
582
589
|
DriverHelper = __decorate([
|
|
583
|
-
inversify_1.injectable(),
|
|
584
|
-
__param(0, inversify_1.inject(inversify_types_1.TYPES.Driver)),
|
|
590
|
+
(0, inversify_1.injectable)(),
|
|
591
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.TYPES.Driver)),
|
|
585
592
|
__metadata("design:paramtypes", [Object])
|
|
586
593
|
], DriverHelper);
|
|
587
594
|
exports.DriverHelper = DriverHelper;
|