diff --git a/apps/remix-ide-e2e/src/tests/dgit_github.test.ts b/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
index c85775a3cb..37e72a6207 100644
--- a/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
+++ b/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
@@ -79,9 +79,26 @@ module.exports = {
.clickLaunchIcon('filePanel')
.waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
},
- 'check the remotes #group1': function (browser: NightwatchBrowser) {
+ 'check the commands panel #group1': function (browser: NightwatchBrowser) {
browser
.clickLaunchIcon('dgit')
+ .click('*[data-id="commands-panel"]')
+ .waitForElementVisible({
+ selector: "//div[@id='commands-remote-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'master')]",
+ locateStrategy: 'xpath'
+ })
+ .waitForElementVisible({
+ selector: "//div[@id='commands-remote-origin-select']//div[contains(@class, 'singleValue') and contains(text(), 'origin')]",
+ locateStrategy: 'xpath'
+ })
+ .waitForElementVisible({
+ selector: "//div[@id='commands-local-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'master')]",
+ locateStrategy: 'xpath'
+ })
+ },
+ 'check the remotes #group1': function (browser: NightwatchBrowser) {
+ browser
+
.click('*[data-id="remotes-panel"]')
.waitForElementVisible('*[data-id="remotes-panel-content"]')
.click({
@@ -143,7 +160,7 @@ module.exports = {
'check the local commits #group1': function (browser: NightwatchBrowser) {
browser
.click('*[data-id="commits-panel"]')
- .pause()
+ .pause(1000)
.waitForElementVisible({
selector: '//*[@data-id="commits-current-branch-links"]//*[@data-id="commit-summary-linking fixed-"]',
locateStrategy: 'xpath'
@@ -156,5 +173,21 @@ module.exports = {
selector: '//*[@data-id="commits-current-branch-links"]//*[@data-id="commit-change-modified-README.md"]',
locateStrategy: 'xpath'
})
+ },
+ 'check the commands panel for links #group1': function (browser: NightwatchBrowser) {
+ browser
+ .click('*[data-id="commands-panel"]')
+ .waitForElementVisible({
+ selector: "//div[@id='commands-remote-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'links')]",
+ locateStrategy: 'xpath'
+ })
+ .waitForElementVisible({
+ selector: "//div[@id='commands-remote-origin-select']//div[contains(@class, 'singleValue') and contains(text(), 'origin')]",
+ locateStrategy: 'xpath'
+ })
+ .waitForElementVisible({
+ selector: "//div[@id='commands-local-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'links')]",
+ locateStrategy: 'xpath'
+ })
}
}
diff --git a/libs/remix-ui/git/src/components/panels/commands/pushpull.tsx b/libs/remix-ui/git/src/components/panels/commands/pushpull.tsx
index 26f309ad48..74a88ff983 100644
--- a/libs/remix-ui/git/src/components/panels/commands/pushpull.tsx
+++ b/libs/remix-ui/git/src/components/panels/commands/pushpull.tsx
@@ -135,6 +135,7 @@ export const PushPull = () => {