@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
package/.eslintrc.js
CHANGED
|
@@ -35,7 +35,21 @@ module.exports = {
|
|
|
35
35
|
'@typescript-eslint/member-ordering': [
|
|
36
36
|
'error',
|
|
37
37
|
{
|
|
38
|
-
|
|
38
|
+
default: [
|
|
39
|
+
'static-field',
|
|
40
|
+
'public-field',
|
|
41
|
+
'instance-field',
|
|
42
|
+
'protected-field',
|
|
43
|
+
'private-field',
|
|
44
|
+
'abstract-field',
|
|
45
|
+
'constructor',
|
|
46
|
+
'public-static-method',
|
|
47
|
+
'protected-static-method',
|
|
48
|
+
'private-static-method',
|
|
49
|
+
'public-method',
|
|
50
|
+
'protected-method',
|
|
51
|
+
'private-method'
|
|
52
|
+
]
|
|
39
53
|
}
|
|
40
54
|
],
|
|
41
55
|
'@typescript-eslint/explicit-function-return-type': [
|
package/CODE_STYLE.md
ADDED
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
# Coding Standards and Conventions
|
|
2
|
+
|
|
3
|
+
### Introducing
|
|
4
|
+
|
|
5
|
+
#### Why are coding standards important?
|
|
6
|
+
|
|
7
|
+
Coding standards offer several advantages, including:
|
|
8
|
+
|
|
9
|
+
1. Increase Code Quality: By adhering to coding standards, developers can create code that is more secure, efficient,
|
|
10
|
+
maintainable, and uniform. This, in turn, can result in fewer errors and improved overall performance.
|
|
11
|
+
|
|
12
|
+
2. Improved Readability and Maintainability: Coding standards contribute to code that is more comprehensible and easier
|
|
13
|
+
to maintain. Consistently formatted code aids other developers in comprehending and modifying it, saving time and
|
|
14
|
+
reducing the likelihood of introducing errors.
|
|
15
|
+
|
|
16
|
+
3. Accelerated Development: The adherence to coding standards can expedite the development process. When developers
|
|
17
|
+
adhere to a predefined set of guidelines, they can produce code more swiftly and with fewer mistakes. Additionally,
|
|
18
|
+
uniform code formatting facilitates the identification and resolution of issues.
|
|
19
|
+
|
|
20
|
+
4. Better Scalability: Coding standards facilitate the creation of scalable code, simplifying the incorporation of new
|
|
21
|
+
features or updates. Consistent coding practices also streamline code maintenance as the codebase expands.
|
|
22
|
+
|
|
23
|
+
5. Elevated Collaboration and Communication: Uniform guidelines encourage better understanding and manipulation of code
|
|
24
|
+
written by fellow developers. This fosters smoother teamwork and facilitates the sharing of code.
|
|
25
|
+
|
|
26
|
+
6. Consistency Across Projects: The adoption of coding standards guarantees a consistent coding approach across various
|
|
27
|
+
projects. This simplifies the task of upholding code quality, transitioning between tasks, and fostering
|
|
28
|
+
collaborative work.
|
|
29
|
+
|
|
30
|
+
### Automated tools
|
|
31
|
+
|
|
32
|
+
Automated lint checking and code format performs with ESLint and Prettier tools before every commit using Husky
|
|
33
|
+
pre-commit hook.
|
|
34
|
+
Full set of rules can be found:
|
|
35
|
+
|
|
36
|
+
- [.eslintrc](.eslintrc.js)
|
|
37
|
+
- [.prettierrc](.prettierrc.json)
|
|
38
|
+
|
|
39
|
+
### Preferable code style
|
|
40
|
+
|
|
41
|
+
1. Page-object and util classes
|
|
42
|
+
|
|
43
|
+
1. ✔ Class declaration using dependency injection (inversify library)
|
|
44
|
+
|
|
45
|
+
```
|
|
46
|
+
@injectable()
|
|
47
|
+
export class BrowserTabsUtil {
|
|
48
|
+
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
|
|
49
|
+
```
|
|
50
|
+
|
|
51
|
+
2. Public methods
|
|
52
|
+
|
|
53
|
+
- ✔ Declare public methods without "public "keyword
|
|
54
|
+
- ✔ Add Logger.debug() inside method to log its name (with optional message)
|
|
55
|
+
|
|
56
|
+
```
|
|
57
|
+
async switchToWindow(windowHandle: string): Promise<void> {
|
|
58
|
+
Logger.debug(); // logs BrowserUtils.sswitchToWindow
|
|
59
|
+
|
|
60
|
+
await this.driverHelper.getDriver().switchTo().window(windowHandle);
|
|
61
|
+
}
|
|
62
|
+
```
|
|
63
|
+
|
|
64
|
+
3. Locators
|
|
65
|
+
|
|
66
|
+
- ✔ For static locators - private static readonly fields type of By
|
|
67
|
+
|
|
68
|
+
```
|
|
69
|
+
private static readonly FACTORY_URL_LOCATOR: By = By.xpath('//input[@id="git-repo-url"]');
|
|
70
|
+
```
|
|
71
|
+
|
|
72
|
+
- ✔ For dynamic locators - private methods which returns By
|
|
73
|
+
|
|
74
|
+
```
|
|
75
|
+
private getExpandedActionsLocator(workspaceName: string): By {
|
|
76
|
+
return By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//button[@aria-label='Actions' and @aria-expanded='true']`);
|
|
77
|
+
}
|
|
78
|
+
```
|
|
79
|
+
|
|
80
|
+
- ✗ Avoid to declare locators as constant in methods
|
|
81
|
+
|
|
82
|
+
```
|
|
83
|
+
async waitTitleContains(expectedText: string, timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
|
|
84
|
+
Logger.debug();
|
|
85
|
+
|
|
86
|
+
const pageTitleLocator: By = By.xpath(`//h1[contains(text(), '${expectedText}')]`);
|
|
87
|
+
await this.driverHelper.waitVisibility(pageTitleLocator, timeout);
|
|
88
|
+
}
|
|
89
|
+
```
|
|
90
|
+
|
|
91
|
+
#### Page object sample:
|
|
92
|
+
|
|
93
|
+
```
|
|
94
|
+
import { e2eContainer } from '../../configs/inversify.config';
|
|
95
|
+
|
|
96
|
+
@injectable()
|
|
97
|
+
export class OcpMainPage {
|
|
98
|
+
|
|
99
|
+
private static readonly MAIN_PAGE_HEADER_LOCATOR: By = By.id('page-main-header');
|
|
100
|
+
private static readonly SELECT_ROLE_BUTTON_LOCATOR: By = By.xpath('//*[@data-test-id="perspective-switcher-toggle"]');
|
|
101
|
+
|
|
102
|
+
constructor(
|
|
103
|
+
@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
|
|
104
|
+
|
|
105
|
+
async waitOpenMainPage(): Promise<void> {
|
|
106
|
+
Logger.debug();
|
|
107
|
+
|
|
108
|
+
await this.driverHelper.waitVisibility(OcpMainPage.MAIN_PAGE_HEADER_LOCATOR, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
private getProjectDropdownItemLocator(projectName: string): By {
|
|
112
|
+
return By.xpath(`//button//*[text()="${projectName}"]`);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
```
|
|
117
|
+
|
|
118
|
+
2. Mocha framework
|
|
119
|
+
|
|
120
|
+
- ✔ TDD framework (`suit()`, `test()`)
|
|
121
|
+
- ✔ Inject class instances, declare all test data inside test `suit()` function to avoid unnecessary code execution if test suit will not be run
|
|
122
|
+
|
|
123
|
+
```
|
|
124
|
+
suite('name', function(): void {
|
|
125
|
+
const webCheCodeLocators: Locators = e2eContainer.get(CLASSES.CheCodeLocatorLoader);
|
|
126
|
+
// test specific data
|
|
127
|
+
const gitImportReference: string = 'pipeline';
|
|
128
|
+
```
|
|
129
|
+
|
|
130
|
+
- ✗ Don`t use arrow functions in test declaration https://mochajs.org/#arrow-functions
|
|
131
|
+
- ✔ Specs which don`t use browser should have API in name ending (like EmptyWorkspaceAPI.spec)
|
|
132
|
+
- ✗ Don\`t create scripts in package.json for each test. Instead of it use [dynamic config](configs/mocharc.ts), `mocha --spec` or `mocha --grep` flags to run specific test.
|
|
133
|
+
- ✔ Use test [./constants](constants) to make test flexible
|
|
134
|
+
|
|
135
|
+
3. Packages
|
|
136
|
+
|
|
137
|
+
1. Add packages as dev dependencies
|
|
138
|
+
2. If any changes re-create package-lock.json before push
|
|
139
|
+
|
|
140
|
+
4. Comments
|
|
141
|
+
1. If some code commented or added as workaround mark it as `//todo` with number of issue to get possibility to find it quickly
|
|
142
|
+
```
|
|
143
|
+
// todo commented due to issue crw-1010
|
|
144
|
+
```
|
|
@@ -9,10 +9,10 @@
|
|
|
9
9
|
**********************************************************************/
|
|
10
10
|
|
|
11
11
|
import 'reflect-metadata';
|
|
12
|
-
import { Container } from 'inversify';
|
|
12
|
+
import { Container, decorate, injectable, unmanaged } from 'inversify';
|
|
13
13
|
import { IDriver } from '../driver/IDriver';
|
|
14
14
|
import { ChromeDriver } from '../driver/ChromeDriver';
|
|
15
|
-
import { CLASSES, TYPES } from './inversify.types';
|
|
15
|
+
import { CLASSES, EXTERNAL_CLASSES, TYPES } from './inversify.types';
|
|
16
16
|
import { TestWorkspaceUtil } from '../utils/workspace/TestWorkspaceUtil';
|
|
17
17
|
import { IOcpLoginPage } from '../pageobjects/login/interfaces/IOcpLoginPage';
|
|
18
18
|
import { OcpUserLoginPage } from '../pageobjects/login/openshift/OcpUserLoginPage';
|
|
@@ -44,8 +44,21 @@ import { KubernetesLoginPage } from '../pageobjects/login/kubernetes/KubernetesL
|
|
|
44
44
|
import { DexLoginPage } from '../pageobjects/login/kubernetes/DexLoginPage';
|
|
45
45
|
import { OAUTH_CONSTANTS } from '../constants/OAUTH_CONSTANTS';
|
|
46
46
|
import { BASE_TEST_CONSTANTS, Platform } from '../constants/BASE_TEST_CONSTANTS';
|
|
47
|
+
import { CheCodeLocatorLoader } from '../pageobjects/ide/CheCodeLocatorLoader';
|
|
48
|
+
import { LocatorLoader } from 'monaco-page-objects/out/locators/loader';
|
|
49
|
+
import { OauthPage } from '../pageobjects/git-providers/OauthPage';
|
|
50
|
+
import { DevfilesRegistryHelper } from '../utils/DevfilesRegistryHelper';
|
|
51
|
+
import { Main as Generator } from '@eclipse-che/che-devworkspace-generator/lib/main';
|
|
52
|
+
import { ContainerTerminal, KubernetesCommandLineToolsExecutor } from '../utils/KubernetesCommandLineToolsExecutor';
|
|
53
|
+
import { ShellExecutor } from '../utils/ShellExecutor';
|
|
47
54
|
|
|
48
|
-
|
|
55
|
+
decorate(injectable(), Generator);
|
|
56
|
+
decorate(injectable(), LocatorLoader);
|
|
57
|
+
decorate(unmanaged(), LocatorLoader, 0);
|
|
58
|
+
decorate(unmanaged(), LocatorLoader, 1);
|
|
59
|
+
decorate(unmanaged(), LocatorLoader, 2);
|
|
60
|
+
|
|
61
|
+
const e2eContainer: Container = new Container({ defaultScope: 'Transient', skipBaseClassChecks: true });
|
|
49
62
|
|
|
50
63
|
e2eContainer.bind<IDriver>(TYPES.Driver).to(ChromeDriver).inSingletonScope();
|
|
51
64
|
e2eContainer.bind<ITestWorkspaceUtil>(TYPES.WorkspaceUtil).to(TestWorkspaceUtil);
|
|
@@ -59,11 +72,12 @@ e2eContainer.bind<WorkspaceDetails>(CLASSES.WorkspaceDetails).to(WorkspaceDetail
|
|
|
59
72
|
e2eContainer.bind<ScreenCatcher>(CLASSES.ScreenCatcher).to(ScreenCatcher);
|
|
60
73
|
e2eContainer.bind<OcpLoginPage>(CLASSES.OcpLoginPage).to(OcpLoginPage);
|
|
61
74
|
e2eContainer.bind<DexLoginPage>(CLASSES.DexLoginPage).to(DexLoginPage);
|
|
62
|
-
|
|
75
|
+
e2eContainer.bind<CheCodeLocatorLoader>(CLASSES.CheCodeLocatorLoader).to(CheCodeLocatorLoader);
|
|
76
|
+
e2eContainer.bind<LocatorLoader>(CLASSES.LocatorLoader).to(LocatorLoader);
|
|
77
|
+
e2eContainer.bind<OauthPage>(CLASSES.OauthPage).to(OauthPage);
|
|
63
78
|
e2eContainer.bind<OcpMainPage>(CLASSES.OcpMainPage).to(OcpMainPage);
|
|
64
79
|
e2eContainer.bind<OcpImportFromGitPage>(CLASSES.OcpImportFromGitPage).to(OcpImportFromGitPage);
|
|
65
80
|
e2eContainer.bind<OcpApplicationPage>(CLASSES.OcpApplicationPage).to(OcpApplicationPage);
|
|
66
|
-
|
|
67
81
|
e2eContainer.bind<CheApiRequestHandler>(CLASSES.CheApiRequestHandler).to(CheApiRequestHandler);
|
|
68
82
|
e2eContainer.bind<CreateWorkspace>(CLASSES.CreateWorkspace).to(CreateWorkspace);
|
|
69
83
|
e2eContainer.bind<ProjectAndFileTests>(CLASSES.ProjectAndFileTests).to(ProjectAndFileTests);
|
|
@@ -72,6 +86,13 @@ e2eContainer.bind<StringUtil>(CLASSES.StringUtil).to(StringUtil);
|
|
|
72
86
|
e2eContainer.bind<ApiUrlResolver>(CLASSES.ApiUrlResolver).to(ApiUrlResolver);
|
|
73
87
|
e2eContainer.bind<WorkspaceHandlingTests>(CLASSES.WorkspaceHandlingTests).to(WorkspaceHandlingTests);
|
|
74
88
|
e2eContainer.bind<RedHatLoginPage>(CLASSES.RedHatLoginPage).to(RedHatLoginPage);
|
|
89
|
+
e2eContainer.bind<DevfilesRegistryHelper>(CLASSES.DevfilesRegistryHelper).to(DevfilesRegistryHelper);
|
|
90
|
+
e2eContainer.bind<KubernetesCommandLineToolsExecutor>(CLASSES.KubernetesCommandLineToolsExecutor).to(KubernetesCommandLineToolsExecutor);
|
|
91
|
+
e2eContainer.bind<ShellExecutor>(CLASSES.ShellExecutor).to(ShellExecutor);
|
|
92
|
+
e2eContainer.bind<ContainerTerminal>(CLASSES.ContainerTerminal).to(ContainerTerminal);
|
|
93
|
+
|
|
94
|
+
e2eContainer.bind<Generator>(EXTERNAL_CLASSES.Generator).to(Generator);
|
|
95
|
+
e2eContainer.bind<LocatorLoader>(EXTERNAL_CLASSES.LocatorLoader).to(LocatorLoader);
|
|
75
96
|
|
|
76
97
|
if (BASE_TEST_CONSTANTS.TS_PLATFORM === Platform.OPENSHIFT) {
|
|
77
98
|
if (OAUTH_CONSTANTS.TS_SELENIUM_VALUE_OPENSHIFT_OAUTH) {
|
|
@@ -14,7 +14,9 @@ const TYPES: any = {
|
|
|
14
14
|
OcpLogin: Symbol.for('OcpLogin'),
|
|
15
15
|
WorkspaceUtil: Symbol.for('WorkspaceUtil'),
|
|
16
16
|
IAuthorizationHeaderHandler: Symbol.for('IAuthorizationHeaderHandler'),
|
|
17
|
-
ITokenHandler: Symbol.for('ITokenHandler')
|
|
17
|
+
ITokenHandler: Symbol.for('ITokenHandler'),
|
|
18
|
+
IKubernetesCommandLineToolsExecutor: Symbol.for('IKubernetesCommandLineToolsExecutor'),
|
|
19
|
+
IContextParams: Symbol.for('IContextParams')
|
|
18
20
|
};
|
|
19
21
|
|
|
20
22
|
const CLASSES: any = {
|
|
@@ -38,7 +40,19 @@ const CLASSES: any = {
|
|
|
38
40
|
OcpRedHatLoginPage: 'OcpRedHatLoginPage',
|
|
39
41
|
OcpApplicationPage: 'OcpApplicationPage',
|
|
40
42
|
OcpMainPage: 'OcpMainPage',
|
|
41
|
-
OcpImportFromGitPage: 'OcpImportFromGitPage'
|
|
43
|
+
OcpImportFromGitPage: 'OcpImportFromGitPage',
|
|
44
|
+
CheCodeLocatorLoader: 'CheCodeLocatorLoader',
|
|
45
|
+
LocatorLoader: 'LocatorLoader',
|
|
46
|
+
OauthPage: 'OauthPage',
|
|
47
|
+
DevfilesRegistryHelper: 'DevfilesRegistryHelper',
|
|
48
|
+
KubernetesCommandLineToolsExecutor: 'KubernetesCommandLineToolsExecutor',
|
|
49
|
+
ShellExecutor: 'ShellExecutor',
|
|
50
|
+
ContainerTerminal: 'ContainerTerminal'
|
|
42
51
|
};
|
|
43
52
|
|
|
44
|
-
|
|
53
|
+
const EXTERNAL_CLASSES: any = {
|
|
54
|
+
Generator: 'Generator',
|
|
55
|
+
LocatorLoader: 'LocatorLoader'
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
export { TYPES, CLASSES, EXTERNAL_CLASSES };
|
|
@@ -8,11 +8,9 @@
|
|
|
8
8
|
* SPDX-License-Identifier: EPL-2.0
|
|
9
9
|
**********************************************************************/
|
|
10
10
|
export const CHROME_DRIVER_CONSTANTS: {
|
|
11
|
-
TS_SELENIUM_RESOLUTION_WIDTH: number;
|
|
12
11
|
TS_SELENIUM_W3C_CHROME_OPTION: boolean;
|
|
13
12
|
TS_SELENIUM_HEADLESS: boolean;
|
|
14
13
|
TS_USE_WEB_DRIVER_FOR_TEST: boolean;
|
|
15
|
-
TS_SELENIUM_RESOLUTION_HEIGHT: number;
|
|
16
14
|
TS_SELENIUM_LAUNCH_FULLSCREEN: boolean;
|
|
17
15
|
TS_SELENIUM_REMOTE_DRIVER_URL: string;
|
|
18
16
|
} = {
|
|
@@ -40,15 +38,5 @@ export const CHROME_DRIVER_CONSTANTS: {
|
|
|
40
38
|
/**
|
|
41
39
|
* run browser with an enabled or disabled W3C protocol (on Chrome 76 and upper, it is enabled by default), "true" by default.
|
|
42
40
|
*/
|
|
43
|
-
TS_SELENIUM_W3C_CHROME_OPTION: process.env.TS_SELENIUM_W3C_CHROME_OPTION !== 'false'
|
|
44
|
-
|
|
45
|
-
/**
|
|
46
|
-
* browser width resolution, "1920" by default.
|
|
47
|
-
*/
|
|
48
|
-
TS_SELENIUM_RESOLUTION_WIDTH: Number(process.env.TS_SELENIUM_RESOLUTION_WIDTH) || 1920,
|
|
49
|
-
|
|
50
|
-
/**
|
|
51
|
-
* browser height resolution, "1080" by default.
|
|
52
|
-
*/
|
|
53
|
-
TS_SELENIUM_RESOLUTION_HEIGHT: Number(process.env.TS_SELENIUM_RESOLUTION_HEIGHT) || 1080
|
|
41
|
+
TS_SELENIUM_W3C_CHROME_OPTION: process.env.TS_SELENIUM_W3C_CHROME_OPTION !== 'false'
|
|
54
42
|
};
|
|
@@ -41,7 +41,19 @@ const KubernetesLoginPage_1 = require("../pageobjects/login/kubernetes/Kubernete
|
|
|
41
41
|
const DexLoginPage_1 = require("../pageobjects/login/kubernetes/DexLoginPage");
|
|
42
42
|
const OAUTH_CONSTANTS_1 = require("../constants/OAUTH_CONSTANTS");
|
|
43
43
|
const BASE_TEST_CONSTANTS_1 = require("../constants/BASE_TEST_CONSTANTS");
|
|
44
|
-
const
|
|
44
|
+
const CheCodeLocatorLoader_1 = require("../pageobjects/ide/CheCodeLocatorLoader");
|
|
45
|
+
const loader_1 = require("monaco-page-objects/out/locators/loader");
|
|
46
|
+
const OauthPage_1 = require("../pageobjects/git-providers/OauthPage");
|
|
47
|
+
const DevfilesRegistryHelper_1 = require("../utils/DevfilesRegistryHelper");
|
|
48
|
+
const main_1 = require("@eclipse-che/che-devworkspace-generator/lib/main");
|
|
49
|
+
const KubernetesCommandLineToolsExecutor_1 = require("../utils/KubernetesCommandLineToolsExecutor");
|
|
50
|
+
const ShellExecutor_1 = require("../utils/ShellExecutor");
|
|
51
|
+
(0, inversify_1.decorate)((0, inversify_1.injectable)(), main_1.Main);
|
|
52
|
+
(0, inversify_1.decorate)((0, inversify_1.injectable)(), loader_1.LocatorLoader);
|
|
53
|
+
(0, inversify_1.decorate)((0, inversify_1.unmanaged)(), loader_1.LocatorLoader, 0);
|
|
54
|
+
(0, inversify_1.decorate)((0, inversify_1.unmanaged)(), loader_1.LocatorLoader, 1);
|
|
55
|
+
(0, inversify_1.decorate)((0, inversify_1.unmanaged)(), loader_1.LocatorLoader, 2);
|
|
56
|
+
const e2eContainer = new inversify_1.Container({ defaultScope: 'Transient', skipBaseClassChecks: true });
|
|
45
57
|
exports.e2eContainer = e2eContainer;
|
|
46
58
|
e2eContainer.bind(inversify_types_1.TYPES.Driver).to(ChromeDriver_1.ChromeDriver).inSingletonScope();
|
|
47
59
|
e2eContainer.bind(inversify_types_1.TYPES.WorkspaceUtil).to(TestWorkspaceUtil_1.TestWorkspaceUtil);
|
|
@@ -55,6 +67,9 @@ e2eContainer.bind(inversify_types_1.CLASSES.WorkspaceDetails).to(WorkspaceDetail
|
|
|
55
67
|
e2eContainer.bind(inversify_types_1.CLASSES.ScreenCatcher).to(ScreenCatcher_1.ScreenCatcher);
|
|
56
68
|
e2eContainer.bind(inversify_types_1.CLASSES.OcpLoginPage).to(OcpLoginPage_1.OcpLoginPage);
|
|
57
69
|
e2eContainer.bind(inversify_types_1.CLASSES.DexLoginPage).to(DexLoginPage_1.DexLoginPage);
|
|
70
|
+
e2eContainer.bind(inversify_types_1.CLASSES.CheCodeLocatorLoader).to(CheCodeLocatorLoader_1.CheCodeLocatorLoader);
|
|
71
|
+
e2eContainer.bind(inversify_types_1.CLASSES.LocatorLoader).to(loader_1.LocatorLoader);
|
|
72
|
+
e2eContainer.bind(inversify_types_1.CLASSES.OauthPage).to(OauthPage_1.OauthPage);
|
|
58
73
|
e2eContainer.bind(inversify_types_1.CLASSES.OcpMainPage).to(OcpMainPage_1.OcpMainPage);
|
|
59
74
|
e2eContainer.bind(inversify_types_1.CLASSES.OcpImportFromGitPage).to(OcpImportFromGitPage_1.OcpImportFromGitPage);
|
|
60
75
|
e2eContainer.bind(inversify_types_1.CLASSES.OcpApplicationPage).to(OcpApplicationPage_1.OcpApplicationPage);
|
|
@@ -66,6 +81,12 @@ e2eContainer.bind(inversify_types_1.CLASSES.StringUtil).to(StringUtil_1.StringUt
|
|
|
66
81
|
e2eContainer.bind(inversify_types_1.CLASSES.ApiUrlResolver).to(ApiUrlResolver_1.ApiUrlResolver);
|
|
67
82
|
e2eContainer.bind(inversify_types_1.CLASSES.WorkspaceHandlingTests).to(WorkspaceHandlingTests_1.WorkspaceHandlingTests);
|
|
68
83
|
e2eContainer.bind(inversify_types_1.CLASSES.RedHatLoginPage).to(RedHatLoginPage_1.RedHatLoginPage);
|
|
84
|
+
e2eContainer.bind(inversify_types_1.CLASSES.DevfilesRegistryHelper).to(DevfilesRegistryHelper_1.DevfilesRegistryHelper);
|
|
85
|
+
e2eContainer.bind(inversify_types_1.CLASSES.KubernetesCommandLineToolsExecutor).to(KubernetesCommandLineToolsExecutor_1.KubernetesCommandLineToolsExecutor);
|
|
86
|
+
e2eContainer.bind(inversify_types_1.CLASSES.ShellExecutor).to(ShellExecutor_1.ShellExecutor);
|
|
87
|
+
e2eContainer.bind(inversify_types_1.CLASSES.ContainerTerminal).to(KubernetesCommandLineToolsExecutor_1.ContainerTerminal);
|
|
88
|
+
e2eContainer.bind(inversify_types_1.EXTERNAL_CLASSES.Generator).to(main_1.Main);
|
|
89
|
+
e2eContainer.bind(inversify_types_1.EXTERNAL_CLASSES.LocatorLoader).to(loader_1.LocatorLoader);
|
|
69
90
|
if (BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_PLATFORM === BASE_TEST_CONSTANTS_1.Platform.OPENSHIFT) {
|
|
70
91
|
if (OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_VALUE_OPENSHIFT_OAUTH) {
|
|
71
92
|
e2eContainer.bind(inversify_types_1.TYPES.CheLogin).to(RegularUserOcpCheLoginPage_1.RegularUserOcpCheLoginPage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inversify.config.js","sourceRoot":"","sources":["../../configs/inversify.config.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;AAExE,4BAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"inversify.config.js","sourceRoot":"","sources":["../../configs/inversify.config.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,14 +9,16 @@
|
|
|
9
9
|
* SPDX-License-Identifier: EPL-2.0
|
|
10
10
|
**********************************************************************/
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.CLASSES = exports.TYPES = void 0;
|
|
12
|
+
exports.EXTERNAL_CLASSES = exports.CLASSES = exports.TYPES = void 0;
|
|
13
13
|
const TYPES = {
|
|
14
14
|
Driver: Symbol.for('Driver'),
|
|
15
15
|
CheLogin: Symbol.for('CheLogin'),
|
|
16
16
|
OcpLogin: Symbol.for('OcpLogin'),
|
|
17
17
|
WorkspaceUtil: Symbol.for('WorkspaceUtil'),
|
|
18
18
|
IAuthorizationHeaderHandler: Symbol.for('IAuthorizationHeaderHandler'),
|
|
19
|
-
ITokenHandler: Symbol.for('ITokenHandler')
|
|
19
|
+
ITokenHandler: Symbol.for('ITokenHandler'),
|
|
20
|
+
IKubernetesCommandLineToolsExecutor: Symbol.for('IKubernetesCommandLineToolsExecutor'),
|
|
21
|
+
IContextParams: Symbol.for('IContextParams')
|
|
20
22
|
};
|
|
21
23
|
exports.TYPES = TYPES;
|
|
22
24
|
const CLASSES = {
|
|
@@ -40,7 +42,19 @@ const CLASSES = {
|
|
|
40
42
|
OcpRedHatLoginPage: 'OcpRedHatLoginPage',
|
|
41
43
|
OcpApplicationPage: 'OcpApplicationPage',
|
|
42
44
|
OcpMainPage: 'OcpMainPage',
|
|
43
|
-
OcpImportFromGitPage: 'OcpImportFromGitPage'
|
|
45
|
+
OcpImportFromGitPage: 'OcpImportFromGitPage',
|
|
46
|
+
CheCodeLocatorLoader: 'CheCodeLocatorLoader',
|
|
47
|
+
LocatorLoader: 'LocatorLoader',
|
|
48
|
+
OauthPage: 'OauthPage',
|
|
49
|
+
DevfilesRegistryHelper: 'DevfilesRegistryHelper',
|
|
50
|
+
KubernetesCommandLineToolsExecutor: 'KubernetesCommandLineToolsExecutor',
|
|
51
|
+
ShellExecutor: 'ShellExecutor',
|
|
52
|
+
ContainerTerminal: 'ContainerTerminal'
|
|
44
53
|
};
|
|
45
54
|
exports.CLASSES = CLASSES;
|
|
55
|
+
const EXTERNAL_CLASSES = {
|
|
56
|
+
Generator: 'Generator',
|
|
57
|
+
LocatorLoader: 'LocatorLoader'
|
|
58
|
+
};
|
|
59
|
+
exports.EXTERNAL_CLASSES = EXTERNAL_CLASSES;
|
|
46
60
|
//# sourceMappingURL=inversify.types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inversify.types.js","sourceRoot":"","sources":["../../configs/inversify.types.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;AAExE,MAAM,KAAK,GAAQ;IAClB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;IAC1C,2BAA2B,EAAE,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC;IACtE,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"inversify.types.js","sourceRoot":"","sources":["../../configs/inversify.types.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;AAExE,MAAM,KAAK,GAAQ;IAClB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;IAC1C,2BAA2B,EAAE,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC;IACtE,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;IAC1C,mCAAmC,EAAE,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC;IACtF,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC;CAC5C,CAAC;AAsCO,sBAAK;AApCd,MAAM,OAAO,GAAQ;IACpB,YAAY,EAAE,cAAc;IAC5B,SAAS,EAAE,WAAW;IACtB,UAAU,EAAE,YAAY;IACxB,gBAAgB,EAAE,kBAAkB;IACpC,aAAa,EAAE,eAAe;IAC9B,YAAY,EAAE,cAAc;IAC5B,oBAAoB,EAAE,sBAAsB;IAC5C,eAAe,EAAE,iBAAiB;IAClC,eAAe,EAAE,iBAAiB;IAClC,mBAAmB,EAAE,qBAAqB;IAC1C,UAAU,EAAE,YAAY;IACxB,cAAc,EAAE,gBAAgB;IAChC,UAAU,EAAE,YAAY;IACxB,sBAAsB,EAAE,wBAAwB;IAChD,eAAe,EAAE,iBAAiB;IAClC,mBAAmB,EAAE,qBAAqB;IAC1C,YAAY,EAAE,cAAc;IAC5B,kBAAkB,EAAE,oBAAoB;IACxC,kBAAkB,EAAE,oBAAoB;IACxC,WAAW,EAAE,aAAa;IAC1B,oBAAoB,EAAE,sBAAsB;IAC5C,oBAAoB,EAAE,sBAAsB;IAC5C,aAAa,EAAE,eAAe;IAC9B,SAAS,EAAE,WAAW;IACtB,sBAAsB,EAAE,wBAAwB;IAChD,kCAAkC,EAAE,oCAAoC;IACxE,aAAa,EAAE,eAAe;IAC9B,iBAAiB,EAAE,mBAAmB;CACtC,CAAC;AAOc,0BAAO;AALvB,MAAM,gBAAgB,GAAQ;IAC7B,SAAS,EAAE,WAAW;IACtB,aAAa,EAAE,eAAe;CAC9B,CAAC;AAEuB,4CAAgB"}
|
|
@@ -31,14 +31,6 @@ exports.CHROME_DRIVER_CONSTANTS = {
|
|
|
31
31
|
/**
|
|
32
32
|
* run browser with an enabled or disabled W3C protocol (on Chrome 76 and upper, it is enabled by default), "true" by default.
|
|
33
33
|
*/
|
|
34
|
-
TS_SELENIUM_W3C_CHROME_OPTION: process.env.TS_SELENIUM_W3C_CHROME_OPTION !== 'false'
|
|
35
|
-
/**
|
|
36
|
-
* browser width resolution, "1920" by default.
|
|
37
|
-
*/
|
|
38
|
-
TS_SELENIUM_RESOLUTION_WIDTH: Number(process.env.TS_SELENIUM_RESOLUTION_WIDTH) || 1920,
|
|
39
|
-
/**
|
|
40
|
-
* browser height resolution, "1080" by default.
|
|
41
|
-
*/
|
|
42
|
-
TS_SELENIUM_RESOLUTION_HEIGHT: Number(process.env.TS_SELENIUM_RESOLUTION_HEIGHT) || 1080
|
|
34
|
+
TS_SELENIUM_W3C_CHROME_OPTION: process.env.TS_SELENIUM_W3C_CHROME_OPTION !== 'false'
|
|
43
35
|
};
|
|
44
36
|
//# sourceMappingURL=CHROME_DRIVER_CONSTANTS.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CHROME_DRIVER_CONSTANTS.js","sourceRoot":"","sources":["../../constants/CHROME_DRIVER_CONSTANTS.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AAC3D,QAAA,uBAAuB,
|
|
1
|
+
{"version":3,"file":"CHROME_DRIVER_CONSTANTS.js","sourceRoot":"","sources":["../../constants/CHROME_DRIVER_CONSTANTS.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AAC3D,QAAA,uBAAuB,GAMhC;IACH;;OAEG;IACH,6BAA6B,EAAE,OAAO,CAAC,GAAG,CAAC,6BAA6B,IAAI,EAAE;IAE9E;;OAEG;IACH,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM;IAEjE;;OAEG;IACH,0BAA0B,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,OAAO;IAE9E;;;OAGG;IACH,6BAA6B,EAAE,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,OAAO;IAEpF;;OAEG;IACH,6BAA6B,EAAE,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,OAAO;CACpF,CAAC"}
|
|
@@ -35,12 +35,6 @@ let ChromeDriver = class ChromeDriver {
|
|
|
35
35
|
get() {
|
|
36
36
|
return this.driver;
|
|
37
37
|
}
|
|
38
|
-
async setWindowSize() {
|
|
39
|
-
await this.driver
|
|
40
|
-
.manage()
|
|
41
|
-
.window()
|
|
42
|
-
.setSize(CHROME_DRIVER_CONSTANTS_1.CHROME_DRIVER_CONSTANTS.TS_SELENIUM_RESOLUTION_WIDTH, CHROME_DRIVER_CONSTANTS_1.CHROME_DRIVER_CONSTANTS.TS_SELENIUM_RESOLUTION_HEIGHT);
|
|
43
|
-
}
|
|
44
38
|
getDriverOptions() {
|
|
45
39
|
let options = new chrome_1.Options()
|
|
46
40
|
.addArguments('--no-sandbox')
|
|
@@ -68,7 +62,7 @@ let ChromeDriver = class ChromeDriver {
|
|
|
68
62
|
}
|
|
69
63
|
};
|
|
70
64
|
ChromeDriver = __decorate([
|
|
71
|
-
inversify_1.injectable(),
|
|
65
|
+
(0, inversify_1.injectable)(),
|
|
72
66
|
__metadata("design:paramtypes", [])
|
|
73
67
|
], ChromeDriver);
|
|
74
68
|
exports.ChromeDriver = ChromeDriver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChromeDriver.js","sourceRoot":"","sources":["../../driver/ChromeDriver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,wBAAsB;AACtB,4BAA0B;AAC1B,yCAAuC;AACvC,2DAAgE;AAEhE,sDAAoD;AACpD,kFAA+E;
|
|
1
|
+
{"version":3,"file":"ChromeDriver.js","sourceRoot":"","sources":["../../driver/ChromeDriver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,wBAAsB;AACtB,4BAA0B;AAC1B,yCAAuC;AACvC,2DAAgE;AAEhE,sDAAoD;AACpD,kFAA+E;AAGxE,IAAM,YAAY,GAAlB,MAAM,YAAY;IAGxB;QACC,MAAM,OAAO,GAAY,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACjD,IAAI,iDAAuB,CAAC,0BAA0B,EAAE;YACvD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;SACrD;IACF,CAAC;IAED,GAAG;QACF,OAAO,IAAI,CAAC,MAA2B,CAAC;IACzC,CAAC;IAEO,gBAAgB;QACvB,IAAI,OAAO,GAAY,IAAI,gBAAO,EAAE;aAClC,YAAY,CAAC,cAAc,CAAC;aAC5B,YAAY,CAAC,wBAAwB,CAAC;aACtC,YAAY,CAAC,kCAAkC,CAAC;aAChD,YAAY,CAAC,6BAA6B,CAAC,CAAC;QAC9C,mCAAmC;QACnC,IAAI,iDAAuB,CAAC,oBAAoB,EAAE;YACjD,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;SAC3C;QACD,OAAO,OAAO,CAAC;IAChB,CAAC;IAEO,gBAAgB,CAAC,OAAgB;QACxC,MAAM,cAAc,GAAW,EAAE,oBAAoB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;QACxE,IAAI,OAAO,GAAY,IAAI,4BAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpF,sCAAsC;QACtC,IAAI,CAAC,iDAAuB,CAAC,6BAA6B,EAAE;YAC3D,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;SACxF;QAED,mCAAmC;QACnC,IAAI,iDAAuB,CAAC,6BAA6B,EAAE;YAC1D,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,iDAAuB,CAAC,6BAA6B,CAAC,CAAC;SACrF;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;CACD,CAAA;AA3CY,YAAY;IADxB,IAAA,sBAAU,GAAE;;GACA,YAAY,CA2CxB;AA3CY,oCAAY"}
|
package/dist/index.js
CHANGED
|
@@ -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];
|
|
@@ -14,12 +18,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
14
18
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
19
|
if (mod && mod.__esModule) return mod;
|
|
16
20
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
22
|
__setModuleDefault(result, mod);
|
|
19
23
|
return result;
|
|
20
24
|
};
|
|
21
25
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
22
|
-
for (var p in m) if (p !== "default" && !
|
|
26
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
23
27
|
};
|
|
24
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
29
|
exports.inversifyConfig = void 0;
|
|
@@ -33,6 +37,8 @@ __exportStar(require("./utils/BrowserTabsUtil"), exports);
|
|
|
33
37
|
__exportStar(require("./utils/DevWorkspaceConfigurationHelper"), exports);
|
|
34
38
|
__exportStar(require("./utils/DevfilesRegistryHelper"), exports);
|
|
35
39
|
__exportStar(require("./utils/DriverHelper"), exports);
|
|
40
|
+
__exportStar(require("./utils/IContextParams"), exports);
|
|
41
|
+
__exportStar(require("./utils/IKubernetesCommandLineToolsExecutor"), exports);
|
|
36
42
|
__exportStar(require("./utils/KubernetesCommandLineToolsExecutor"), exports);
|
|
37
43
|
__exportStar(require("./utils/Logger"), exports);
|
|
38
44
|
__exportStar(require("./utils/ScreenCatcher"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAA8D;AACrD,0CAAe;AACxB,4DAA0C;AAC1C,oDAAkC;AAClC,wDAAsC;AACtC,mDAAiC;AACjC,0DAAwC;AACxC,0EAAwD;AACxD,iEAA+C;AAC/C,uDAAqC;AACrC,yDAAuC;AACvC,8EAA4D;AAC5D,6EAA2D;AAC3D,iDAA+B;AAC/B,wDAAsC;AACtC,wDAAsC;AACtC,qDAAmC;AACnC,gFAA8D;AAC9D,0GAAwF;AACxF,+FAA6E;AAC7E,mEAAiD;AACjD,uEAAqD;AACrD,sEAAoD;AACpD,oEAAkD;AAClD,0EAAwD;AACxD,oEAAkD;AAClD,qEAAmD;AACnD,6FAA2E;AAC3E,wEAAsD;AACtD,yEAAuD;AACvD,+EAA6D;AAC7D,+EAA6D;AAC7D,8EAA4D;AAC5D,qFAAmE;AACnE,6EAA2D;AAC3D,mFAAiE;AACjE,iFAA+D;AAC/D,gFAA8D;AAC9D,2FAAyE;AACzE,6EAA2D;AAC3D,+EAA6D;AAC7D,sEAAoD;AACpD,6DAA2C;AAC3C,sEAAoD;AACpD,yEAAuD;AACvD,iEAA+C;AAC/C,kEAAgD;AAChD,sEAAoD;AACpD,qEAAmD;AACnD,+DAA6C;AAC7C,8DAA4C;AAC5C,oEAAkD;AAClD,iEAA+C;AAC/C,gEAA8C"}
|
|
@@ -56,8 +56,8 @@ let CreateWorkspace = CreateWorkspace_1 = class CreateWorkspace {
|
|
|
56
56
|
}
|
|
57
57
|
async importFromGitUsingUI(factoryUrl, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
58
58
|
Logger_1.Logger.debug(`factoryUrl: "${factoryUrl}"`);
|
|
59
|
-
await this.driverHelper.waitVisibility(CreateWorkspace_1.
|
|
60
|
-
await this.driverHelper.type(CreateWorkspace_1.
|
|
59
|
+
await this.driverHelper.waitVisibility(CreateWorkspace_1.FACTORY_URL, timeout);
|
|
60
|
+
await this.driverHelper.type(CreateWorkspace_1.FACTORY_URL, selenium_webdriver_1.Key.chord(factoryUrl, selenium_webdriver_1.Key.ENTER), timeout);
|
|
61
61
|
}
|
|
62
62
|
async clickOnEditorsDropdownListButton(sampleName, timeout) {
|
|
63
63
|
Logger_1.Logger.debug(`sampleName: "${sampleName}, editor ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_EDITOR}"`);
|
|
@@ -88,10 +88,10 @@ let CreateWorkspace = CreateWorkspace_1 = class CreateWorkspace {
|
|
|
88
88
|
return selenium_webdriver_1.By.xpath(`//article[contains(@class, 'sample-card')]//div[text()='${sampleName}']`);
|
|
89
89
|
}
|
|
90
90
|
};
|
|
91
|
-
CreateWorkspace.
|
|
91
|
+
CreateWorkspace.FACTORY_URL = selenium_webdriver_1.By.xpath('//input[@id="git-repo-url"]');
|
|
92
92
|
CreateWorkspace = CreateWorkspace_1 = __decorate([
|
|
93
|
-
inversify_1.injectable(),
|
|
94
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
93
|
+
(0, inversify_1.injectable)(),
|
|
94
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
95
95
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
96
96
|
], CreateWorkspace);
|
|
97
97
|
exports.CreateWorkspace = CreateWorkspace;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateWorkspace.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/CreateWorkspace.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,yCAA+C;AAC/C,mEAAwD;AACxD,2DAAwD;AACxD,2DAA6C;AAC7C,+CAA4C;AAC5C,yEAAsE;AACtE,6EAA0E;
|
|
1
|
+
{"version":3,"file":"CreateWorkspace.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/CreateWorkspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,12 +58,11 @@ let Dashboard = Dashboard_1 = class Dashboard {
|
|
|
58
58
|
async stopAndRemoveWorkspaceByUI(workspaceName) {
|
|
59
59
|
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
60
60
|
await this.stopWorkspaceByUI(workspaceName);
|
|
61
|
-
await this.
|
|
62
|
-
await this.workspaces.waitWorkspaceListItemAbsence(workspaceName);
|
|
61
|
+
await this.deleteStoppedWorkspaceByUI(workspaceName);
|
|
63
62
|
}
|
|
64
63
|
async openDashboard() {
|
|
65
64
|
Logger_1.Logger.debug();
|
|
66
|
-
await this.driverHelper.
|
|
65
|
+
await this.driverHelper.navigateToUrl(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL);
|
|
67
66
|
await this.waitPage();
|
|
68
67
|
}
|
|
69
68
|
async waitPage(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
@@ -108,9 +107,9 @@ Dashboard.LOADER_ALERT = selenium_webdriver_1.By.xpath('//*[@data-testid="loader
|
|
|
108
107
|
Dashboard.LOGOUT_BUTTON = selenium_webdriver_1.By.xpath('//button[text()="Logout"]');
|
|
109
108
|
Dashboard.USER_SETTINGS_DROPDOWN = selenium_webdriver_1.By.xpath('//header//button/span[text()!=""]//parent::button');
|
|
110
109
|
Dashboard = Dashboard_1 = __decorate([
|
|
111
|
-
inversify_1.injectable(),
|
|
112
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
113
|
-
__param(1, inversify_1.inject(inversify_types_1.CLASSES.Workspaces)),
|
|
110
|
+
(0, inversify_1.injectable)(),
|
|
111
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
112
|
+
__param(1, (0, inversify_1.inject)(inversify_types_1.CLASSES.Workspaces)),
|
|
114
113
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper,
|
|
115
114
|
Workspaces_1.Workspaces])
|
|
116
115
|
], Dashboard);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Dashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,4BAA0B;AAC1B,mEAAwD;AACxD,2DAAwC;AACxC,2DAAwD;AACxD,yEAAsE;AACtE,6CAA0C;AAC1C,+CAA4C;AAC5C,6EAA0E;
|
|
1
|
+
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Dashboard.ts"],"names":[],"mappings":"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"}
|