@eclipse-che/che-e2e - npm Package Compare versions

Comparing version 7.42.0-dev-65aa3ae to 7.42.0-dev-8ddee57

dist/inversify.config.js

@@ -29,2 +29,3 @@ "use strict";
 const ProjectTree_1 = require("./pageobjects/ide/ProjectTree");
+const OpenEditors_1 = require("./pageobjects/ide/OpenEditors");
 const Editor_1 = require("./pageobjects/ide/Editor");
@@ -91,2 +92,3 @@ const TopMenu_1 = require("./pageobjects/ide/TopMenu");
 e2eContainer.bind(inversify_types_1.CLASSES.ProjectTree).to(ProjectTree_1.ProjectTree);
+e2eContainer.bind(inversify_types_1.CLASSES.OpenEditors).to(OpenEditors_1.OpenEditors);
 e2eContainer.bind(inversify_types_1.CLASSES.Editor).to(Editor_1.Editor);
@@ -93,0 +95,0 @@ e2eContainer.bind(inversify_types_1.CLASSES.TopMenu).to(TopMenu_1.TopMenu);

dist/inversify.types.js

@@ -31,2 +31,3 @@ "use strict";
     ProjectTree: 'ProjectTree',
+    OpenEditors: 'OpenEditors',
     Editor: 'Editor',
@@ -33,0 +34,0 @@ TopMenu: 'TopMenu',

dist/pageobjects/ide/ProjectTree.js

@@ -89,7 +89,7 @@ "use strict";
         Logger_1.Logger.debug('ProjectTree.waitProjectTreeContainer');
-        await this.driverHelper.waitPresence(selenium_webdriver_1.By.css(ProjectTree_1.PROJECT_TREE_CONTAINER_CSS), timeout);
+        await this.driverHelper.waitPresence(ProjectTree_1.PROJECT_TREE_CONTAINER_LOCATOR, timeout);
     }
     async waitProjectTreeContainerClosed(attempts = TestConstants_1.TestConstants.TS_SELENIUM_DEFAULT_ATTEMPTS, polling = TestConstants_1.TestConstants.TS_SELENIUM_DEFAULT_POLLING) {
         Logger_1.Logger.debug('ProjectTree.waitProjectTreeContainerClosed');
-        await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.css(ProjectTree_1.PROJECT_TREE_CONTAINER_CSS), attempts, polling);
+        await this.driverHelper.waitDisappearance(ProjectTree_1.PROJECT_TREE_CONTAINER_LOCATOR, attempts, polling);
     }
@@ -265,3 +265,3 @@ async waitItem(itemPath, timeout = TimeoutConstants_1.TimeoutConstants.TS_PROJECT_TREE_TIMEOUT) {
 };
-ProjectTree.PROJECT_TREE_CONTAINER_CSS = '#theia-left-side-panel .theia-TreeContainer';
+ProjectTree.PROJECT_TREE_CONTAINER_LOCATOR = selenium_webdriver_1.By.css('#theia-left-side-panel #explorer-view-container--files .theia-TreeContainer');
 ProjectTree = ProjectTree_1 = __decorate([
@@ -268,0 +268,0 @@ inversify_1.injectable(),

dist/testsLibrary/ProjectAndFileTests.js

@@ -30,2 +30,3 @@ "use strict";
 const ProjectTree_1 = require("../pageobjects/ide/ProjectTree");
+const OpenEditors_1 = require("../pageobjects/ide/OpenEditors");
 const Editor_1 = require("../pageobjects/ide/Editor");
@@ -36,6 +37,7 @@ const TimeoutConstants_1 = require("../TimeoutConstants");
 let ProjectAndFileTests = class ProjectAndFileTests {
-    constructor(ide, driverHelper, projectTree, editor) {
+    constructor(ide, driverHelper, projectTree, openEditors, editor) {
         this.ide = ide;
         this.driverHelper = driverHelper;
         this.projectTree = projectTree;
+        this.openEditors = openEditors;
         this.editor = editor;
@@ -54,2 +56,5 @@ }
             await this.projectTree.openProjectTreeContainer();
+            if (!await this.openEditors.isExpansionToggleCollapsed()) {
+                await this.openEditors.waitAndClickExpansionToggle();
+            }
             await this.projectTree.waitProjectImported(sampleName, folder);
@@ -66,2 +71,5 @@ });
             await this.projectTree.openProjectTreeContainer();
+            if (!await this.openEditors.isExpansionToggleCollapsed()) {
+                await this.openEditors.waitAndClickExpansionToggle();
+            }
             await this.projectTree.waitProjectImportedNoSubfolder(sampleName);
@@ -97,6 +105,8 @@ });
     __param(2, inversify_1.inject(inversify_types_1.CLASSES.ProjectTree)),
-    __param(3, inversify_1.inject(inversify_types_1.CLASSES.Editor)),
+    __param(3, inversify_1.inject(inversify_types_1.CLASSES.OpenEditors)),
+    __param(4, inversify_1.inject(inversify_types_1.CLASSES.Editor)),
     __metadata("design:paramtypes", [Ide_1.Ide,
         DriverHelper_1.DriverHelper,
         ProjectTree_1.ProjectTree,
+        OpenEditors_1.OpenEditors,
         Editor_1.Editor])
@@ -103,0 +113,0 @@ ], ProjectAndFileTests);

dist/TimeoutConstants.js

@@ -82,2 +82,11 @@ "use strict";
     TS_IMPORT_PROJECT_DEFAULT_POLLING: Number(process.env.TS_SELENIUM_DEFAULT_POLLING) || 50000,
+    // ---------------------------------------- OPEN EDITORS ------------------------------------------
+    /**
+     * Wait for IDE showing open editors tab, "60 000" by default.
+     */
+    TS_OPEN_EDITORS_TIMEOUT: Number(process.env.TS_OPEN_EDITORS_TIMEOUT) || 60000,
+    /**
+     * Click on item timeout (open editors), "10 000" by default.
+     */
+    TS_OPEN_EDITORS_CLICK_ON_ITEM_TIMEOUT: Number(process.env.TS_PROJECT_TREE_CLICK_ON_ITEM_TIMEOUT) || 10000,
     // -------------------------------------------- EDITOR --------------------------------------------
@@ -84,0 +93,0 @@ /**

inversify.config.ts

@@ -31,2 +31,3 @@ /*********************************************************************
 import { ProjectTree } from './pageobjects/ide/ProjectTree';
+import { OpenEditors } from './pageobjects/ide/OpenEditors';
 import { Editor } from './pageobjects/ide/Editor';
@@ -98,2 +99,3 @@ import { TopMenu } from './pageobjects/ide/TopMenu';
 e2eContainer.bind<ProjectTree>(CLASSES.ProjectTree).to(ProjectTree);
+e2eContainer.bind<OpenEditors>(CLASSES.OpenEditors).to(OpenEditors);
 e2eContainer.bind<Editor>(CLASSES.Editor).to(Editor);
@@ -100,0 +102,0 @@ e2eContainer.bind<TopMenu>(CLASSES.TopMenu).to(TopMenu);

inversify.types.ts

@@ -30,2 +30,3 @@
     ProjectTree: 'ProjectTree',
+    OpenEditors: 'OpenEditors',
     Editor: 'Editor',
@@ -32,0 +33,0 @@ TopMenu: 'TopMenu',

package.json

 {
   "name": "@eclipse-che/che-e2e",
-  "version": "7.42.0-dev-65aa3ae",
+  "version": "7.42.0-dev-8ddee57",
   "description": "",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

pageobjects/ide/ProjectTree.ts

@@ -24,3 +24,3 @@ /*********************************************************************
 export class ProjectTree {
-    private static readonly PROJECT_TREE_CONTAINER_CSS: string = '#theia-left-side-panel .theia-TreeContainer';
+    private static readonly PROJECT_TREE_CONTAINER_LOCATOR: By = By.css('#theia-left-side-panel #explorer-view-container--files .theia-TreeContainer');
 
@@ -98,3 +98,3 @@ constructor(
 
-        await this.driverHelper.waitPresence(By.css(ProjectTree.PROJECT_TREE_CONTAINER_CSS), timeout);
+        await this.driverHelper.waitPresence(ProjectTree.PROJECT_TREE_CONTAINER_LOCATOR, timeout);
     }
@@ -107,3 +107,3 @@
 
-        await this.driverHelper.waitDisappearance(By.css(ProjectTree.PROJECT_TREE_CONTAINER_CSS), attempts, polling);
+        await this.driverHelper.waitDisappearance(ProjectTree.PROJECT_TREE_CONTAINER_LOCATOR, attempts, polling);
     }
@@ -110,0 +110,0 @@

testsLibrary/ProjectAndFileTests.ts

@@ -16,2 +16,3 @@ /*********************************************************************
 import { ProjectTree } from '../pageobjects/ide/ProjectTree';
+import { OpenEditors } from '../pageobjects/ide/OpenEditors';
 import { Editor } from '../pageobjects/ide/Editor';
@@ -29,2 +30,3 @@ import { TimeoutConstants } from '../TimeoutConstants';
         @inject(CLASSES.ProjectTree) private readonly projectTree: ProjectTree,
+        @inject(CLASSES.OpenEditors) private readonly openEditors: OpenEditors,
         @inject(CLASSES.Editor) private readonly editor: Editor) {}
@@ -44,2 +46,5 @@
             await this.projectTree.openProjectTreeContainer();
+            if (!await this.openEditors.isExpansionToggleCollapsed()) {
+                await this.openEditors.waitAndClickExpansionToggle();
+            }
             await this.projectTree.waitProjectImported(sampleName, folder);
@@ -57,2 +62,5 @@ });
             await this.projectTree.openProjectTreeContainer();
+            if (!await this.openEditors.isExpansionToggleCollapsed()) {
+                await this.openEditors.waitAndClickExpansionToggle();
+            }
             await this.projectTree.waitProjectImportedNoSubfolder(sampleName);
@@ -59,0 +67,0 @@ });

TimeoutConstants.ts

@@ -77,3 +77,2 @@ /*********************************************************************
 
-
     // -------------------------------------------- PROJECT TREE --------------------------------------------
@@ -101,2 +100,14 @@
 
+    // ---------------------------------------- OPEN EDITORS ------------------------------------------
+
+    /**
+     * Wait for IDE showing open editors tab, "60 000" by default.
+     */
+    TS_OPEN_EDITORS_TIMEOUT: Number(process.env.TS_OPEN_EDITORS_TIMEOUT) || 60_000,
+
+    /**
+     * Click on item timeout (open editors), "10 000" by default.
+     */
+    TS_OPEN_EDITORS_CLICK_ON_ITEM_TIMEOUT: Number(process.env.TS_PROJECT_TREE_CLICK_ON_ITEM_TIMEOUT) || 10_000,
+
     // -------------------------------------------- EDITOR --------------------------------------------
@@ -103,0 +114,0 @@

New alerts

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 3 instances in 1 package

Fixed alerts

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 3 instances in 1 package

Improved metrics

Total package byte prevSize

1517785

increased by0.89%

Number of package files

362

increased by0.84%

Lines of code

20562

increased by0.81%

No dependency changes