more testing

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

@@ -1,6 +1,7 @@
 import { ChildProcess, spawn } from "child_process"
 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)
 module.exports = {
@@ -8,7 +9,7 @@ module.exports = {
     before: function (browser, done) {
         init(browser, done)
     },
-    after: function (browser) {
+    after: function (browser: NightwatchBrowser) {
         browser.perform((done) => {
             console.log('kill server', gitserver.pid)
             kill(gitserver.pid)
@@ -16,64 +17,305 @@ module.exports = {
         })
     },
 
-    'run server #group1': function (browser) {
+    'run server #group1': 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) {
+    'Update settings for git #group1': function (browser: NightwatchBrowser) {
         browser.
-        clickLaunchIcon('dgit')
-        .waitForElementVisible('*[data-id="initgit-btn"]')
-        .click('*[data-id="initgit-btn"]')
-        .setValue('*[data-id="gitubUsername"]', 'git')
-        .setValue('*[data-id="githubEmail"]', 'git@example.com')
-        .click('*[data-id="saveGitHubCredentials"]')
-        .modalFooterOKClick('github-credentials-error')
-        .pause(2000)
-    },
-    'clone a repo #group1': function (browser) {
+            clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="initgit-btn"]')
+            .click('*[data-id="initgit-btn"]')
+            .setValue('*[data-id="gitubUsername"]', 'git')
+            .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .click('*[data-id="saveGitHubCredentials"]')
+            .modalFooterOKClick('github-credentials-error')
+            .pause(2000)
+    },
+    'clone a repo #group1': function (browser: NightwatchBrowser) {
         browser
-        .waitForElementVisible('*[data-id="clone-panel"]')
-        .click('*[data-id="clone-panel"]')
-        .waitForElementVisible('*[data-id="clone-url"]')
-        .setValue('*[data-id="clone-url"]', 'http://localhost:6868/bare.git')
-        .waitForElementVisible('*[data-id="clone-btn"]')
-        .click('*[data-id="clone-btn"]')
-        .clickLaunchIcon('filePanel')
-        .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
+            .waitForElementVisible('*[data-id="clone-panel"]')
+            .click('*[data-id="clone-panel"]')
+            .waitForElementVisible('*[data-id="clone-url"]')
+            .setValue('*[data-id="clone-url"]', 'http://localhost:6868/bare.git')
+            .waitForElementVisible('*[data-id="clone-btn"]')
+            .click('*[data-id="clone-btn"]')
+            .clickLaunchIcon('filePanel')
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
 
     },
-    'check file added #group1': function (browser) {
+    'check file added #group1': function (browser: NightwatchBrowser) {
         browser.
-        addFile('test.txt', { content: 'hello world' }, 'README.md')
-        .clickLaunchIcon('dgit')
-        .click('*[data-id="sourcecontrol-panel"]')
-        .waitForElementVisible({
-            selector: "//*[@data-status='new-untracked' and @data-file='/test.txt']",
-            locateStrategy: 'xpath'
-        })
-        .waitForElementVisible('*[data-id="addToGitChangestest.txt"]')
-        .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"]')
+            addFile('test.txt', { content: 'hello world' }, 'README.md')
+            .clickLaunchIcon('dgit')
+            .click('*[data-id="sourcecontrol-panel"]')
+            .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"]')
     },
-    'look at the commit #group1': function (browser) {
+    'look at the commit #group1': function (browser: NightwatchBrowser) {
         browser
-        .click('*[data-id="commits-panel"]')
-        .waitForElementPresent({
-            selector: '//*[@data-id="commit-summary-testcommit-ahead"]',
-            locateStrategy: 'xpath'
-        })
+            .click('*[data-id="commits-panel"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testcommit-ahead"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'sync the commit #group1': function (browser: NightwatchBrowser) {
+        browser
+            .pause(1000)
+            .waitForElementVisible('*[data-id="sourcecontrol-panel"]')
+            .click('*[data-id="sourcecontrol-panel"]')
+            .waitForElementVisible('*[data-id="syncButton"]')
+            .click('*[data-id="syncButton"]')
+            .pause(2000)
+            .waitForElementVisible('*[data-id="commitButton"]')
+            .click('*[data-id="commits-panel"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testcommit-"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'check the log #group1': async function (browser: NightwatchBrowser) {
+        const logs = await getGitLog('/tmp/git/bare.git')
+        console.log(logs)
+        browser.assert.ok(logs.includes('testcommit'))
+    },
+    'change a file': function (browser: NightwatchBrowser) {
+        browser.
+            openFile('test.txt').
+            pause(1000).
+            setEditorValue('changes', null)
+    },
+    'stage changed file #group1': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .click('*[data-id="sourcecontrol-panel"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='modified-unstaged' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible('*[data-id="addToGitChangestest.txt"]')
+            .click('*[data-id="addToGitChangestest.txt"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='modified-staged' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .setValue('*[data-id="commitMessage"]', 'testcommit2')
+            .click('*[data-id="commitButton"]')
+    },
+    'push the commit #group1': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible('*[data-id="sourcecontrol-push"]')
+            .click('*[data-id="sourcecontrol-push"]')
+            .pause(2000)
+            .click('*[data-id="commits-panel"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testcommit2-"]',
+                locateStrategy: 'xpath'
+            }).pause(2000)
+    },
+    'check the log for testcommit2 #group1': async function (browser: NightwatchBrowser) {
+        const logs = await getGitLog('/tmp/git/bare.git')
+        console.log(logs)
+        browser.assert.ok(logs.includes('testcommit2'))
+    },
+    'clone locally and add a file and push #group1': async function (browser: NightwatchBrowser) {
+        await cloneOnServer('http://localhost:6868/bare.git', '/tmp/')
+        await onLocalGitRepoAddFile('/tmp/bare/', 'test2.txt')
+        await createCommitOnLocalServer('/tmp/bare/', 'testlocal')
+        await onLocalGitRepoPush('/tmp/bare/', 'master')
+    },
+    'run a git fetch #group1': function (browser: NightwatchBrowser) {
+        browser
+            .pause(2000)
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible('*[data-id="sourcecontrol-fetch-branch"]')
+            .click('*[data-id="sourcecontrol-fetch-branch"]')
+            .pause(2000)
+            .click('*[data-id="commits-panel"]')
+            .click('*[data-id="commits-panel-behind"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testlocal-"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'run pull from the header #group1': function (browser: NightwatchBrowser) {
+        browser.
+        click('*[data-id="sourcecontrol-button-pull"]')
+        .waitForElementNotPresent('*[data-id="commits-panel-behind"]')
+    },
+    'check if the file is added #group1': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest2.txt"]')
     }
 }
 
+async function getGitLog(path: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+        const git = spawn('git', ['log'], { cwd: path })
+        let logs = ''
+        git.stdout.on('data', function (data) {
+            logs += data.toString()
+        })
+        git.stderr.on('err', function (data) {
+            reject(data.toString())
+        })
+        git.on('close', function () {
+            resolve(logs)
+        })
+    })
+}
+
+async function cloneOnServer(repo: string, path: string) {
+    console.log('cloning', repo, path)
+    return new Promise((resolve, reject) => {
+        const git = spawn('rm -rf bare && git', ['clone', repo], { cwd: path, shell: true, detached: true });
+
+        git.stdout.on('data', function (data) {
+            console.log('stdout data cloning', data.toString());
+            if (data.toString().includes('done')) {
+                resolve(git);
+            }
+        });
+
+        git.stderr.on('data', function (data) {
+            console.log('stderr data cloning', data.toString());
+            if (data.toString().includes('into')) {
+                setTimeout(() => {
+                    resolve(git);
+                }, 5000)
+            }
+        });
+
+        git.on('error', (error) => {
+            reject(`Process error: ${error.message}`);
+        });
+
+        git.on('exit', (code, signal) => {
+            if (code !== 0) {
+                reject(`Process exited with code: ${code} and signal: ${signal}`);
+            }
+        });
+    });
+}
+
+async function onLocalGitRepoAddFile(path: string, file: string) {
+    console.log('adding file', file)
+    return new Promise((resolve, reject) => {
+        const git = spawn('touch', [file], { cwd: path });
+
+        git.stdout.on('data', function (data) {
+            console.log('stdout data adding file', data.toString());
+            if (data.toString().includes('done')) {
+                resolve(git);
+            }
+        });
+
+        git.stderr.on('data', function (data) {
+            console.error('stderr adding file', data.toString());
+            reject(data.toString());
+        });
+
+        git.on('error', (error) => {
+            reject(`Process error: ${error.message}`);
+        });
+
+        git.on('exit', (code, signal) => {
+            if (code !== 0) {
+                reject(`Process exited with code: ${code} and signal: ${signal}`);
+            } else {
+                resolve(git);
+            }
+        });
+    });
+}
+
+async function onLocalGitRepoPush(path: string, branch: string = 'master') {
+    console.log('pushing', path)
+    return new Promise((resolve, reject) => {
+        const git = spawn('git', ['push', 'origin', branch], { cwd: path, shell: true, detached: true });
+
+        git.stdout.on('data', function (data) {
+            console.log('stdout data pushing', data.toString());
+            if (data.toString().includes('done')) {
+                resolve(git);
+            }
+        });
+
+        git.stderr.on('data', function (data) {
+            console.error('stderr data pushing', data.toString());
+            if (data.toString().includes(branch)) {
+                resolve(git);
+            }
+        });
+
+        git.on('error', (error) => {
+            reject(`Process error: ${error.message}`);
+        });
+
+        git.on('exit', (code, signal) => {
+            if (code !== 0) {
+                reject(`Process exited with code: ${code} and signal: ${signal}`);
+            } else {
+                resolve(git);
+            }
+        });
+    });
+}
+
+
+async function createCommitOnLocalServer(path: string, message: string) {
+    console.log('committing', message, path)
+    return new Promise((resolve, reject) => {
+        const git = spawn('git add . && git', ['commit', '-m', message], { cwd: path, shell: true, detached: true });
+
+        git.stdout.on('data', function (data) {
+            console.log('data stdout committing', data.toString());
+            if (data.toString().includes(message)) {
+                setTimeout(() => {
+                    resolve(git);
+                }, 1000)
+            }
+        });
+
+        git.stderr.on('data', function (data) {
+            console.error('data commiting', data.toString());
+            reject(data.toString());
+        });
+
+        git.on('error', (error) => {
+            console.error('error', error);
+            reject(`Process error: ${error.message}`);
+        });
+
+        git.on('exit', (code, signal) => {
+            if (code !== 0) {
+                console.error('exit', code, signal);
+                reject(`Process exited with code: ${code} and signal: ${signal}`);
+            } else {
+                resolve(git);
+            }
+        });
+    });
+}
+
+
 async function spawnGitServer(path: string): Promise<ChildProcess> {
     console.log(process.cwd())
     try {

apps/remix-ide-e2e/src/types/index.d.ts

@@ -11,7 +11,7 @@ declare module 'nightwatch' {
     scrollInto(target: string): NightwatchBrowser
     testContracts(fileName: string, contractCode: NightwatchContractContent, compiledContractNames: string[]): NightwatchBrowser
     setEditorValue(value: string, callback?: () => void): NightwatchBrowser
-    addFile(name: string, content: NightwatchContractContent): NightwatchBrowser
+    addFile(name: string, content: NightwatchContractContent, readMeFile?: string): NightwatchBrowser
     verifyContracts(compiledContractNames: string[], opts?: {wait: number; version?: string; runs?: string}): NightwatchBrowser
     selectAccount(account?: string): NightwatchBrowser
     clickFunction(fnFullName: string, expectedInput?: NightwatchClickFunctionExpectedInput): NightwatchBrowser

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

@@ -67,7 +67,7 @@ export const SourceControlButtons = () => {
   return (
     <span className='d-flex justify-content-end align-items-center'>
       <CustomTooltip tooltipText={getTooltipText('git.pull')}>
-        <GitUIButton disabledCondition={buttonsDisabled()} onClick={pull} className='btn btn-sm pl-0 pr-2'>
+        <GitUIButton data-id='sourcecontrol-button-pull' disabledCondition={buttonsDisabled()} onClick={pull} className='btn btn-sm pl-0 pr-2'>
           <div className="d-flex align-items-baseline">
             {syncState.commitsBehind.length ? <div className="badge badge-pill pl-0">
               {syncState.commitsBehind.length}
@@ -77,7 +77,7 @@ export const SourceControlButtons = () => {
         </GitUIButton>
       </CustomTooltip>
       <CustomTooltip tooltipText={getTooltipText('git.push')}>
-        <GitUIButton disabledCondition={buttonsDisabled()} onClick={push} className='btn btn-sm pl-0 pr-2'>
+        <GitUIButton data-id='sourcecontrol-button-push' disabledCondition={buttonsDisabled()} onClick={push} className='btn btn-sm pl-0 pr-2'>
           <div className="d-flex align-items-baseline">
             {syncState.commitsAhead.length ? <div className="badge badge-pill pl-0">
               {syncState.commitsAhead.length}
@@ -87,7 +87,7 @@ export const SourceControlButtons = () => {
         </GitUIButton>
       </CustomTooltip>
       <CustomTooltip tooltipText={getTooltipText('git.sync')}>
-        <GitUIButton disabledCondition={buttonsDisabled()} onClick={sync} className='btn btn-sm  pl-0 pr-2'><FontAwesomeIcon icon={faArrowsUpDown} className="" /></GitUIButton>
+        <GitUIButton data-id='sourcecontrol-button-sync' disabledCondition={buttonsDisabled()} onClick={sync} className='btn btn-sm  pl-0 pr-2'><FontAwesomeIcon icon={faArrowsUpDown} className="" /></GitUIButton>
       </CustomTooltip>
       <CustomTooltip tooltipText={<FormattedMessage id="git.refresh" />}>
         <GitUIButton onClick={refresh} className='btn btn-sm'><FontAwesomeIcon icon={faArrowRotateRight} className="" /></GitUIButton>

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

@@ -21,7 +21,7 @@ export const CommandsNavigation = ({ eventKey, activePanel, callback }) => {
   return (
     <>
       <div className={'d-flex justify-content-between ' + (activePanel === eventKey ? 'bg-light' : '')}>
-        <span onClick={() => handleClick()} role={'button'} className='nav d-flex justify-content-start align-items-center w-75'>
+        <span data-id='commands-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/navigation/commits.tsx

@@ -42,7 +42,7 @@ export const CommitsNavigation = ({ eventKey, activePanel, callback, title, bran
   return (
     <>
       <div className={`d-flex justify-content-between ${activePanel === eventKey ? 'bg-light' : ''} ${ahead || behind? 'text-success':''}`}>
-        <span data-id='commits-panel' onClick={() => handleClick()} role={'button'} className='nav d-flex justify-content-start align-items-center w-100'>
+        <span data-id={`commits-panel${ahead?'-ahead':''}${behind?'-behind':''}`} onClick={() => handleClick()} role={'button'} className='nav d-flex justify-content-start align-items-center w-100'>
           {
             activePanel === eventKey ? <FontAwesomeIcon className='' icon={faCaretDown}></FontAwesomeIcon> : <FontAwesomeIcon className='' icon={faCaretRight}></FontAwesomeIcon>
           }

libs/remix-ui/git/src/components/panels/commands/fetch.tsx

@@ -13,10 +13,10 @@ export const Fetch = () => {
   return (
     <>
       <div className="btn-group w-100" role="group">
-        <GitUIButton disabledCondition={fetchIsDisabled()} type="button" onClick={async () => actions.fetch({
+        <GitUIButton data-id='sourcecontrol-fetch-remote' disabledCondition={fetchIsDisabled()} type="button" onClick={async () => actions.fetch({
           remote: context.upstream,
         })} className="btn btn-primary mr-1 w-50"><div>Fetch {context.upstream && context.upstream.name}</div></GitUIButton>
-        <GitUIButton disabledCondition={fetchIsDisabled()} type="button" onClick={async () => actions.fetch({
+        <GitUIButton data-id='sourcecontrol-fetch-branch' disabledCondition={fetchIsDisabled()} type="button" onClick={async () => actions.fetch({
           remote: context.upstream,
           ref: context.currentBranch
         })} className="btn btn-primary w-50 long-and-truncated">Fetch {context.currentBranch.name}</GitUIButton>

libs/remix-ui/git/src/components/panels/commands/pushpull.tsx

@@ -129,8 +129,8 @@ export const PushPull = () => {
 
       <div className="btn-group w-100" role="group">
 
-        <GitUIButton disabledCondition={pushPullIsDisabled()} type="button" onClick={async () => pull()} className="btn btn-primary mr-1">Pull</GitUIButton>
-        <GitUIButton disabledCondition={pushPullIsDisabled()} type="button" onClick={async () => push()} className="btn btn-primary">Push</GitUIButton>
+        <GitUIButton data-id='sourcecontrol-pull' disabledCondition={pushPullIsDisabled()} type="button" onClick={async () => pull()} className="btn btn-primary mr-1">Pull</GitUIButton>
+        <GitUIButton data-id='sourcecontrol-push' disabledCondition={pushPullIsDisabled()} type="button" onClick={async () => push()} className="btn btn-primary">Push</GitUIButton>
       </div>
 
       <label>Local Branch</label>