|
|
@ -271,7 +271,7 @@ module.exports = { |
|
|
|
.waitForElementPresent('.fa-spinner') |
|
|
|
.waitForElementPresent('.fa-spinner') |
|
|
|
.waitForElementVisible({ |
|
|
|
.waitForElementVisible({ |
|
|
|
selector: '*[data-id="treeViewLitreeViewItem.git"]', |
|
|
|
selector: '*[data-id="treeViewLitreeViewItem.git"]', |
|
|
|
timeout: 60000 |
|
|
|
timeout: 240000 |
|
|
|
}) |
|
|
|
}) |
|
|
|
.waitForElementContainsText('[data-id="workspacesSelect"]', 'test-branch-submodule') |
|
|
|
.waitForElementContainsText('[data-id="workspacesSelect"]', 'test-branch-submodule') |
|
|
|
.waitForElementVisible('[data-id="updatesubmodules"]') |
|
|
|
.waitForElementVisible('[data-id="updatesubmodules"]') |
|
|
@ -279,32 +279,47 @@ module.exports = { |
|
|
|
.waitForElementPresent('.fa-spinner') |
|
|
|
.waitForElementPresent('.fa-spinner') |
|
|
|
.waitForElementVisible({ |
|
|
|
.waitForElementVisible({ |
|
|
|
selector: '*[data-id="treeViewLitreeViewItem.git"]', |
|
|
|
selector: '*[data-id="treeViewLitreeViewItem.git"]', |
|
|
|
timeout: 60000 |
|
|
|
timeout: 240000, |
|
|
|
|
|
|
|
abortOnFailure: false, |
|
|
|
|
|
|
|
suppressNotFoundErrors: true |
|
|
|
}) |
|
|
|
}) |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemplugins"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemwebsite"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive"]') |
|
|
|
|
|
|
|
.pause(2000) |
|
|
|
.pause(2000) |
|
|
|
.click('[data-id="treeViewDivtreeViewItemwebsite"]') |
|
|
|
// check recursive submodule
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemwebsite/index.html"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemplugins"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemplugins/README.md"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive/test-branch-submodule-2"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemrecursive"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive/test-branch-submodule-2"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/README.md"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive/test-branch-submodule-2/submodule2.ts"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/plugins"]') |
|
|
|
// check test-branch-submodule-2 submodule
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemrecursive/plugins"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemtest-branch-submodule-2"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/plugins/build"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemtest-branch-submodule-2"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemtest-branch-submodule-2/submodule2.ts"]') |
|
|
|
|
|
|
|
// check libdeep submodule
|
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep/test-branch-submodule-2"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep/test-branch-submodule-2"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep/test-branch-submodule-2/submodule2.ts"]') |
|
|
|
|
|
|
|
// check libdeep2 submodule
|
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep2"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep2"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep2/recursive"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep2/recursive"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep2/recursive/test-branch-submodule-2"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep2/recursive/test-branch-submodule-2"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep2/recursive/test-branch-submodule-2/submodule2.ts"]') |
|
|
|
}, |
|
|
|
}, |
|
|
|
'When switching branches the submodules should disappear #group4': function (browser: NightwatchBrowser) { |
|
|
|
'When switching branches the submodules should disappear #group4': function (browser: NightwatchBrowser) { |
|
|
|
browser |
|
|
|
browser |
|
|
|
.waitForElementVisible('[data-id="workspaceGitBranchesDropdown"]') |
|
|
|
.waitForElementVisible('[data-id="workspaceGitBranchesDropdown"]') |
|
|
|
.click('[data-id="workspaceGitBranchesDropdown"]') |
|
|
|
.click('[data-id="workspaceGitBranchesDropdown"]') |
|
|
|
.waitForElementVisible('[data-id="custom-dropdown-menu"]') |
|
|
|
.waitForElementVisible('[data-id="custom-dropdown-menu"]') |
|
|
|
.waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/second') |
|
|
|
.waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/empty') |
|
|
|
.waitForElementPresent('[data-id="workspaceGit-origin/second"]') |
|
|
|
.waitForElementPresent('[data-id="workspaceGit-origin/empty"]') |
|
|
|
.click('[data-id="workspaceGit-origin/second"]') |
|
|
|
.click('[data-id="workspaceGit-origin/empty"]') |
|
|
|
.waitForElementNotPresent('[data-id="treeViewDivtreeViewItemplugins"]') |
|
|
|
.waitForElementNotPresent('[data-id="treeViewDivtreeViewItemlibdeep"]') |
|
|
|
.waitForElementNotPresent('[data-id="treeViewDivtreeViewItemwebsite"]') |
|
|
|
.waitForElementNotPresent('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive"]') |
|
|
|
|
|
|
|
.waitForElementNotPresent('[data-id="treeViewDivtreeViewItemtest-branch-submodule-2"]') |
|
|
|
}, |
|
|
|
}, |
|
|
|
'When switching to main update the modules #group4': function (browser: NightwatchBrowser) { |
|
|
|
'When switching to main update the modules #group4': function (browser: NightwatchBrowser) { |
|
|
|
browser |
|
|
|
browser |
|
|
@ -319,23 +334,36 @@ module.exports = { |
|
|
|
.waitForElementPresent('.fa-spinner') |
|
|
|
.waitForElementPresent('.fa-spinner') |
|
|
|
.waitForElementVisible({ |
|
|
|
.waitForElementVisible({ |
|
|
|
selector: '*[data-id="treeViewLitreeViewItem.git"]', |
|
|
|
selector: '*[data-id="treeViewLitreeViewItem.git"]', |
|
|
|
timeout: 60000 |
|
|
|
timeout: 240000 |
|
|
|
}) |
|
|
|
}) |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemplugins"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemwebsite"]') |
|
|
|
|
|
|
|
.pause(2000) |
|
|
|
.pause(2000) |
|
|
|
.click('[data-id="treeViewDivtreeViewItemwebsite"]') |
|
|
|
// check recursive submodule
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemwebsite"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemwebsite/index.html"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemplugins"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemplugins"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive/test-branch-submodule-2"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemplugins/README.md"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive/test-branch-submodule-2"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemrecursive"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemtest-branch-submodule-recursive/test-branch-submodule-2/submodule2.ts"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemrecursive"]') |
|
|
|
// check test-branch-submodule-2 submodule
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/README.md"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemtest-branch-submodule-2"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/plugins"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemtest-branch-submodule-2"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemrecursive/plugins"]') |
|
|
|
.click('[data-id="treeViewDivtreeViewItemtest-branch-submodule-2"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/plugins/build"]') |
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemtest-branch-submodule-2/submodule2.ts"]') |
|
|
|
|
|
|
|
// check libdeep submodule
|
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep/test-branch-submodule-2"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep/test-branch-submodule-2"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep/test-branch-submodule-2/submodule2.ts"]') |
|
|
|
|
|
|
|
// check libdeep2 submodule
|
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep2"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep2"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep2/recursive"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep2/recursive"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep2/recursive/test-branch-submodule-2"]') |
|
|
|
|
|
|
|
.click('[data-id="treeViewDivtreeViewItemlibdeep2/recursive/test-branch-submodule-2"]') |
|
|
|
|
|
|
|
.waitForElementVisible('[data-id="treeViewDivtreeViewItemlibdeep2/recursive/test-branch-submodule-2/submodule2.ts"]') |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// GIT SUBMODULES E2E ENDS
|
|
|
|
// GIT SUBMODULES E2E ENDS
|
|
|
|