branch testing

apps/remix-ide-e2e/src/tests/dgit_local.test.ts

@@ -165,8 +165,8 @@ module.exports = {
     },
     'run pull from the header #group1': function (browser: NightwatchBrowser) {
         browser.
-        click('*[data-id="sourcecontrol-button-pull"]')
+            click('*[data-id="sourcecontrol-button-pull"]')
-        .waitForElementNotPresent('*[data-id="commits-panel-behind"]')
+            .waitForElementNotPresent('*[data-id="commits-panel-behind"]')
     },
     'check if the file is added #group1': function (browser: NightwatchBrowser) {
         browser
@@ -176,26 +176,93 @@ module.exports = {
     // GROUP 2 
     'create a branch #group2': function (browser: NightwatchBrowser) {
         browser
-        .clickLaunchIcon('dgit')
+            .clickLaunchIcon('dgit')
-        .click('*[data-id="branches-panel"]')
+            .click('*[data-id="branches-panel"]')
-        .waitForElementVisible('*[data-id="newbranchname"]')
+            .waitForElementVisible('*[data-id="newbranchname"]')
-        .setValue('*[data-id="newbranchname"]', 'testbranch')
+            .setValue('*[data-id="newbranchname"]', 'testbranch')
-        .click('*[data-id="sourcecontrol-create-branch"]')
+            .click('*[data-id="sourcecontrol-create-branch"]')
-        .waitForElementVisible('*[data-id="branches-current-branch-testbranch"]')
+            .waitForElementVisible('*[data-id="branches-current-branch-testbranch"]')
-        .pause(1000)
+            .pause(1000)
     },
     'publish the branch #group2': function (browser: NightwatchBrowser) {
         browser
-        .waitForElementVisible('*[data-id="sourcecontrol-panel"]')
+            .waitForElementVisible('*[data-id="sourcecontrol-panel"]')
-        .click('*[data-id="sourcecontrol-panel"]')
+            .click('*[data-id="sourcecontrol-panel"]')
-        .pause(1000)
+            .pause(1000)
-        .click('*[data-id="publishBranchButton"]')
+            .click('*[data-id="publishBranchButton"]')
-        .pause(2000)
+            .pause(2000)
-        .waitForElementNotVisible('*[data-id="publishBranchButton"]')
+            .waitForElementNotVisible('*[data-id="publishBranchButton"]')
     },
     'check if the branch is published #group2': async function (browser: NightwatchBrowser) {
         const branches = await getBranches('/tmp/git/bare.git')
         browser.assert.ok(branches.includes('testbranch'))
+    },
+    'add file to new branch #group2': function (browser: NightwatchBrowser) {
+        browser.
+            addFile('test.txt', { content: 'hello world' }, 'README.md')
+            .clickLaunchIcon('dgit')
+            .waitForElementVisible({
+                selector: "//*[@data-status='new-untracked' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible('*[data-id="addToGitChangestest.txt"]')
+            .pause(1000)
+            .click('*[data-id="addToGitChangestest.txt"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='added-staged' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .setValue('*[data-id="commitMessage"]', 'testcommit')
+            .click('*[data-id="commitButton"]')
+            .pause(1000)
+    },
+    'check if the commit is ahead in the branches list #group2': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="branches-panel"]')
+            .click('*[data-id="branches-panel"]')
+            .waitForElementVisible('*[data-id="branches-current-branch-testbranch"]')
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='branches-current-branch-testbranch']",
+                locateStrategy: 'xpath',
+                suppressNotFoundErrors: true
+            })
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='commits-panel-ahead']",
+                locateStrategy: 'xpath',
+                suppressNotFoundErrors: true
+            })
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='branchdifference-commits-testbranch-ahead']//*[@data-id='commit-summary-testcommit-ahead']",
+                locateStrategy: 'xpath',
+            })
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='branchdifference-commits-testbranch-ahead']//*[@data-id='commit-change-added-test.txt']",
+                locateStrategy: 'xpath',
+            })
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='local-branch-commits-testbranch']//*[@data-id='commit-summary-testcommit-ahead']",
+                locateStrategy: 'xpath',
+            })
+            .waitForElementVisible({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='local-branch-commits-testbranch']//*[@data-id='commit-change-added-test.txt']",
+                locateStrategy: 'xpath',
+            })
+    },
+    'switch back to master #group2': function (browser: NightwatchBrowser) {
+        browser
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='branches-toggle-branch-master']",
+                locateStrategy: 'xpath',
+            })
+            .waitForElementVisible({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='branches-toggle-current-branch-master']",
+                locateStrategy: 'xpath',
+            })
+    },
+    'check if test file is gone #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementNotPresent('*[data-id="treeViewLitreeViewItemtest.txt"]')
     }
 }
 

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

@@ -18,7 +18,7 @@ export const Branches = () => {
 
   return (
     <>
-      <div className="pt-1">
+      <div data-id='branches-panel-content' className="pt-1">
         {context.branches && context.branches.length ?
           <div>
             {context.branches && context.branches.filter((branch, index) => !branch.remote).map((branch, index) => {

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

@@ -36,7 +36,7 @@ export const BranchDifferenceDetails = (props: BrancheDifferenceProps) => {
     <Accordion activeKey={activePanel} defaultActiveKey="">
       <CommitsNavigation ahead={ahead} behind={behind} branch={branch} remote={remote} title={title} eventKey="0" activePanel={activePanel} callback={setActivePanel} />
       <Accordion.Collapse className="pl-2 border-left ml-1" eventKey="0">
-        <div className="ml-1">
+        <div data-id={`branchdifference-commits-${branch.name}${ahead?'-ahead':''}${behind?'-behind':''}`} className="ml-1">
           {commits && commits.map((commit, index) => {
             return (
               <CommitDetails branch={branch} getCommitChanges={getCommitChanges} key={index} checkout={()=>{}} commit={commit}></CommitDetails>

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

@@ -48,7 +48,7 @@ export const LocalBranchDetails = (props: BrancheDetailsProps) => {
     try {
 
       actions.checkout({ ref: oid })
-      ;
+        ;
     } catch (e) {
       //
     }
@@ -68,14 +68,16 @@ export const LocalBranchDetails = (props: BrancheDetailsProps) => {
       <>
         <div className="ml-1">
           <BranchDifferences branch={branch}></BranchDifferences>
-          {context.localBranchCommits && Object.entries(context.localBranchCommits).map(([key, value]) => {
+          <div data-id={`local-branch-commits-${branch && branch.name}`}>
-            if (key == branch.name) {
+            {context.localBranchCommits && Object.entries(context.localBranchCommits).map(([key, value]) => {
-              return value.map((commit, index) => {
-                return (<CommitDetails branch={branch} key={index} getCommitChanges={getCommitChanges} checkout={checkoutCommit} commit={commit}></CommitDetails>)
-              })
-            }
-          })}
 
+              if (key == branch.name) {
+                return value.map((commit, index) => {
+                  return (<CommitDetails branch={branch} key={index} getCommitChanges={getCommitChanges} checkout={checkoutCommit} commit={commit}></CommitDetails>)
+                })
+              }
+            })}
+          </div>
         </div>
         {hasNextPage && <GitUIButton className="mb-1 ml-2 btn btn-sm" onClick={loadNextPage}>Load more</GitUIButton>}
       </>

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

@@ -92,7 +92,7 @@ export const RemoteBranchDetails = (props: BrancheDetailsProps) => {
     <BrancheDetailsNavigation checkout={checkout} branch={branch} eventKey="0" activePanel={activePanel} callback={setActivePanel} />
     <Accordion.Collapse className="pl-2 border-left ml-1" eventKey="0">
       <>
-        <div className="ml-1">
+        <div data-id={`remote-branch-commits-${branch && branch.name}`} className="ml-1">
           {context.remoteBranchCommits && Object.entries(context.remoteBranchCommits).map(([key, value]) => {
             if (key == branch.name) {
               return value.map((page, index) => {

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

@@ -48,7 +48,7 @@ export const Commits = () => {
     <>
       {context.commits && context.commits.length ?
         <><BranchDifferences branch={context.currentBranch}></BranchDifferences><div>
-          <div className="pt-1">
+          <div data-id={`commits-current-branch-${context.currentBranch && context.currentBranch.name}`} className="pt-1">
             {context.commits && context.commits.map((commit, index) => {
               return (
                 <CommitDetails branch={context.currentBranch} getCommitChanges={getCommitChanges} key={index} checkout={checkout} commit={commit}></CommitDetails>

libs/remix-ui/git/src/components/panels/commits/commitdetailsitem.tsx

@@ -36,7 +36,7 @@ export const CommitDetailsItems = (props: CCommitDetailsItemsProps) => {
     </>)
   }
   return (<>
-    <div data-id={`commit-change-${path.basename(commitChange.path)}`} className={`d-flex w-100 d-flex flex-row commitdetailsitem ${isAheadOfRepo ? 'text-success' : ''}`}>
+    <div data-id={`commit-change-${commitChange.type}-${path.basename(commitChange.path)}`} className={`d-flex w-100 d-flex flex-row commitdetailsitem ${isAheadOfRepo ? 'text-success' : ''}`}>
       <div className='pointer gitfile long-and-truncated' onClick={async () => await openChanges(commitChange)}>
         <span className='font-weight-bold long-and-truncated'>{path.basename(commitChange.path)}</span>
         <div className='text-secondary long-and-truncated'> {commitChange.path}</div>

libs/remix-ui/git/src/lib/gitactions.ts

@@ -534,7 +534,7 @@ export const saveGitHubCredentials = async (credentials: { username: string, ema
     const userFetched = await loadGitHubUserFromToken()
     if (!userFetched) {
       if (credentials.username && credentials.email) {
-        await plugin.call('notification', 'alert' , {
+        await plugin.call('notification', 'alert', {
           title: 'Error',
           id: 'github-credentials-error',
           message: `Could not retreive the user from GitHub. You can continue to use the app, but you will not be able to push or pull.`
@@ -632,7 +632,7 @@ export const loadGitHubUserFromToken = async () => {
 }
 
 export const statusMatrix = async (filepaths: string[]) => {
-  const matrix = await plugin.call('dgitApi', 'status', { ref: "HEAD", filepaths: filepaths || ['.']});
+  const matrix = await plugin.call('dgitApi', 'status', { ref: "HEAD", filepaths: filepaths || ['.'] });
   const result = (matrix || []).map((x) => {
     return {
       filename: `/${x.shift()}`,
@@ -748,9 +748,16 @@ export const fetchBranch = async (branch: branch, page: number) => {
   if (page == 1) {
     dispatch(resetRemoteBranchCommits({ branch }))
   }
-  const { owner, repo } = await getRepoDetails(branch.remote.url);
+  try {
-  const rc = await plugin.call('dgitApi', 'remotecommits', { token, owner: owner, repo: repo, branch: branch.name, length, page });
+    const { owner, repo } = await getRepoDetails(branch.remote.url);
-  dispatch(setRemoteBranchCommits({ branch, commits: rc }))
+    const rc = await plugin.call('dgitApi', 'remotecommits', { token, owner: owner, repo: repo, branch: branch.name, length, page });
+    dispatch(setRemoteBranchCommits({ branch, commits: rc }))
+  } catch (e) {
+    sendToGitLog({
+      type: 'error',
+      message: `Error fetching remote commits: ${e.message}`
+    })
+  }
   return
 }