branch test

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"]')
     }
 }
 

libs/remix-ui/git/src/components/buttons/commitmessage.tsx

@@ -82,7 +82,14 @@ export const CommitMessage = () => {
   const publishBranch = async () => {
     if (context.currentBranch === undefined || context.currentBranch.name === "")
       return
-    //await actions.push(context.currentBranch.name)
+    await actions.push({
+      remote: getRemote(),
+      ref: context.currentBranch
+    })
+    await actions.pull({
+      remote: getRemote(),
+      ref: context.currentBranch
+    })
   }
 
   const messageEnabled = () => {

libs/remix-ui/git/src/components/navigation/branchedetails.tsx

@@ -58,7 +58,7 @@ export const BrancheDetailsNavigation = (props: BrancheDetailsNavigationProps) =
   return (
     <>
       <div className="d-flex flex-row w-100 mb-2 mt-2">
-        <div onClick={() => handleClick()} role={'button'} className='pointer d-flex flex-row w-100 commit-navigation'>
+        <div data-id={`branches-${context.currentBranch.name === branch.name ? 'current-' : ''}branch-${branch.name}`} onClick={() => handleClick()} role={'button'} className='pointer d-flex flex-row w-100 commit-navigation'>
           {
             activePanel === eventKey ? <FontAwesomeIcon className='' icon={faCaretDown}></FontAwesomeIcon> : <FontAwesomeIcon className='' icon={faCaretRight}></FontAwesomeIcon>
           }
@@ -67,11 +67,11 @@ export const BrancheDetailsNavigation = (props: BrancheDetailsNavigationProps) =
 
         </div>
         {context.currentBranch && context.currentBranch.name === branch.name ?
-          <GitUIButton className="btn btn-sm p-0 mr-1" onClick={() => { }}>
+          <GitUIButton data-id={`branches-toggle-current-branch-${branch.name}`} className="btn btn-sm p-0 mr-1" onClick={() => { }}>
             <FontAwesomeIcon className='pointer text-success' icon={faToggleOff} ></FontAwesomeIcon>
           </GitUIButton>
           :
-          <GitUIButton className="btn btn-sm p-0 mr-1" onClick={() => checkout(branch)}>
+          <GitUIButton data-id={`branches-toggle-branch-${branch.name}`} className="btn btn-sm p-0 mr-1" onClick={() => checkout(branch)}>
             <FontAwesomeIcon icon={faToggleOn}></FontAwesomeIcon>
           </GitUIButton>
         }

libs/remix-ui/git/src/components/navigation/branches.tsx

@@ -19,7 +19,7 @@ export const BranchesNavigation = ({ eventKey, activePanel, callback }) => {
   return (
     <>
       <div className={'d-flex justify-content-between pt-1 ' + (activePanel === eventKey? 'bg-light': '')}>
-        <span onClick={()=>handleClick()} role={'button'} className='nav d-flex justify-content-start align-items-center w-75'>
+        <span data-id='branches-panel' onClick={()=>handleClick()} role={'button'} className='nav d-flex justify-content-start align-items-center w-75'>
           {
             activePanel === eventKey ? <FontAwesomeIcon className='' icon={faCaretDown}></FontAwesomeIcon> : <FontAwesomeIcon className='' icon={faCaretRight}></FontAwesomeIcon>
           }

libs/remix-ui/git/src/components/panels/branches.tsx

@@ -41,11 +41,13 @@ export const Branches = () => {
             placeholder="branch name"
             onChange={handleChange}
             className="form-control w-md-25 w-100"
+            data-id="newbranchname"
             type="text"
             id="newbranchname"
           />
         </div>
         <GitUIButton
+          data-id="sourcecontrol-create-branch"
           onClick={async () => actions.createBranch(newBranch.value)}
           className="btn w-md-25 w-100 btn-primary"
           id="createbranch-btn"