diff --git a/apps/remix-ide-e2e/src/tests/dgit_local.test.ts b/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
index ad7f9031fb..b4a0973309 100644
--- a/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
+++ b/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
@@ -3,7 +3,13 @@ import kill from 'tree-kill'
import init from "../helpers/init"
import { Nightwatch, NightwatchBrowser } from "nightwatch"
let gitserver: ChildProcess
-// if needed kill the server: kill -9 $(sudo lsof -t -i:6868)
+
+/*
+/ uses the git-http-backend package to create a git server ( if needed kill the server: kill -9 $(sudo lsof -t -i:6868) )
+/ GROUP 1: file operations PUSH PULL COMMIT SYNC FETCH CLONE ADD
+/ GROUP 2: branch operations CREATE & PUBLISH
+*/
+
module.exports = {
'@disabled': true,
before: function (browser, done) {
@@ -17,14 +23,14 @@ module.exports = {
})
},
- 'run server #group1': function (browser: NightwatchBrowser) {
+ 'run server #group1 #group2': function (browser: NightwatchBrowser) {
browser.perform(async (done) => {
gitserver = await spawnGitServer('/tmp/')
console.log('working directory', process.cwd())
done()
})
},
- 'Update settings for git #group1': function (browser: NightwatchBrowser) {
+ 'Update settings for git #group1 #group2': function (browser: NightwatchBrowser) {
browser.
clickLaunchIcon('dgit')
.waitForElementVisible('*[data-id="initgit-btn"]')
@@ -35,7 +41,7 @@ module.exports = {
.modalFooterOKClick('github-credentials-error')
.pause(2000)
},
- 'clone a repo #group1': function (browser: NightwatchBrowser) {
+ 'clone a repo #group1 #group2': function (browser: NightwatchBrowser) {
browser
.waitForElementVisible('*[data-id="clone-panel"]')
.click('*[data-id="clone-panel"]')
@@ -47,6 +53,9 @@ module.exports = {
.waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
},
+
+ // GROUP 1
+
'check file added #group1': function (browser: NightwatchBrowser) {
browser.
addFile('test.txt', { content: 'hello world' }, 'README.md')
@@ -94,7 +103,7 @@ module.exports = {
console.log(logs)
browser.assert.ok(logs.includes('testcommit'))
},
- 'change a file': function (browser: NightwatchBrowser) {
+ 'change a file #group1': function (browser: NightwatchBrowser) {
browser.
openFile('test.txt').
pause(1000).
@@ -163,6 +172,16 @@ module.exports = {
browser
.clickLaunchIcon('filePanel')
.waitForElementVisible('*[data-id="treeViewLitreeViewItemtest2.txt"]')
+ },
+ // GROUP 2
+ 'create a branch #group2': function (browser: NightwatchBrowser) {
+ browser
+ .clickLaunchIcon('dgit')
+ .click('*[data-id="branches-panel"]')
+ .waitForElementVisible('*[data-id="newbranchname"]')
+ .setValue('*[data-id="newbranchname"]', 'testbranch')
+ .click('*[data-id="sourcecontrol-create-branch"]')
+ .waitForElementVisible('*[data-id="branches-current-branch-testbranch"]')
}
}
diff --git a/libs/remix-ui/git/src/components/buttons/commitmessage.tsx b/libs/remix-ui/git/src/components/buttons/commitmessage.tsx
index ffd08a5fdd..7f4e26d344 100644
--- a/libs/remix-ui/git/src/components/buttons/commitmessage.tsx
+++ b/libs/remix-ui/git/src/components/buttons/commitmessage.tsx
@@ -7,7 +7,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { syncStateContext } from "./sourceControlBase";
enum buttonStateValues {
- Commit ,
+ Commit,
Sync = 1,
PublishBranch = 2
}
@@ -24,7 +24,7 @@ export const CommitMessage = () => {
setMessage({ value: e.currentTarget.value })
}
- const commit = async() => {
+ const commit = async () => {
if (context.staged.length === 0 && context.allchangesnotstaged.length == 0) return
if (context.staged.length === 0)
await actions.addall(context.allchangesnotstaged)
@@ -36,7 +36,7 @@ export const CommitMessage = () => {
return context.upstream ? context.upstream : context.defaultRemote ? context.defaultRemote : null
}
- const sync = async() => {
+ const sync = async () => {
await actions.pull({
remote: getRemote(),
ref: context.currentBranch
@@ -52,7 +52,7 @@ export const CommitMessage = () => {
}
const commitNotAllowed = () => {
- return context.canCommit === false || message.value === "" || ( context.staged.length === 0 && context.allchangesnotstaged.length == 0 )
+ return context.canCommit === false || message.value === "" || (context.staged.length === 0 && context.allchangesnotstaged.length == 0)
}
const commitMessagePlaceholder = () => {
@@ -68,21 +68,28 @@ export const CommitMessage = () => {
const upDownArrows = () => {
return (
<>
- {syncState.commitsBehind && syncState.commitsBehind.length ? <>{syncState.commitsBehind.length}