Merge branch 'master' of https://github.com/ethereum/remix-project into editorcontext

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

@@ -266,8 +266,86 @@ module.exports = {
       .waitForElementVisible('[data-id="workspacesSelect"]')
       .click('[data-id="workspacesSelect"]')
       .waitForElementNotPresent(`[data-id="dropdown-item-workspace_name_1"]`)
-      .end()
   },
 
+    // CLONE REPOSITORY E2E START
+
+    'Should clone a repository #group2': function (browser: NightwatchBrowser) {
+      browser
+        .waitForElementVisible('[data-id="cloneGitRepository"]')
+        .click('[data-id="cloneGitRepository"]')
+        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+        .click('[data-id="fileSystemModalDialogModalBody-react"]')
+        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+        .click('[data-id="fileSystem-modal-footer-ok-react"]')
+        .waitForElementPresent('.fa-spinner')
+        .pause(5000)
+        .waitForElementNotPresent('.fa-spinner')
+        .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
+        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix')
+    },
+
+    'Should display dgit icon for cloned workspace #group2': function (browser: NightwatchBrowser) {
+      browser
+        .switchWorkspace('default_workspace')
+        .waitForElementNotVisible('[data-id="workspacesSelect"] .fa-code-branch')
+        .switchWorkspace('awesome-remix')
+        .waitForElementVisible('[data-id="workspacesSelect"] .fa-code-branch')
+    },
+    
+    'Should display non-clashing names for duplicate clone #group2': '' + function (browser: NightwatchBrowser) {
+      browser
+        .waitForElementVisible('[data-id="cloneGitRepository"]')
+        .click('[data-id="cloneGitRepository"]')
+        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+        .click('[data-id="fileSystemModalDialogModalBody-react"]')
+        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+        .click('[data-id="fileSystem-modal-footer-ok-react"]')
+        .pause(5000)
+        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix1')
+        .waitForElementVisible('[data-id="cloneGitRepository"]')
+        .click('[data-id="cloneGitRepository"]')
+        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+        .click('[data-id="fileSystemModalDialogModalBody-react"]')
+        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+        .click('[data-id="fileSystem-modal-footer-ok-react"]')
+        .pause(5000)
+        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix2')
+        .waitForElementVisible('[data-id="cloneGitRepository"]')
+        .click('[data-id="cloneGitRepository"]')
+        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+        .click('[data-id="fileSystemModalDialogModalBody-react"]')
+        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+        .click('[data-id="fileSystem-modal-footer-ok-react"]')
+        .pause(5000)
+        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix3')
+        .switchWorkspace('awesome-remix')
+        .switchWorkspace('awesome-remix1')
+        .switchWorkspace('awesome-remix2')
+        .switchWorkspace('awesome-remix3')
+    },
+
+    'Should display error message in modal for failed clone #group2': function (browser: NightwatchBrowser) {
+      browser
+        .waitForElementVisible('[data-id="cloneGitRepository"]')
+        .click('[data-id="cloneGitRepository"]')
+        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+        .click('[data-id="fileSystemModalDialogModalBody-react"]')
+        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/non-existent-repo')
+        .click('[data-id="fileSystem-modal-footer-ok-react"]')
+        .pause(5000)
+        .waitForElementVisible('[data-id="cloneGitRepositoryModalDialogModalBody-react"]')
+        .waitForElementContainsText('[data-id="cloneGitRepositoryModalDialogModalBody-react"]', 'An error occurred: Please check that you have the correct URL for the repo. If the repo is private, you need to add your github credentials (with the valid token permissions) in Settings plugin')
+        .click('[data-id="cloneGitRepository-modal-footer-ok-react"]')
+        .end()
+    },
+
+    // CLONE REPOSITORY E2E END
+
   tearDown: sauce
 }

libs/remixd/src/bin/remixd.ts

@@ -166,7 +166,7 @@ function errorHandler (error: any, service: string) {
   async function isValidOrigin (origin: string): Promise<any> {
     if (!origin) return false
     const domain = getDomain(origin)
-    const gistUrl = 'https://gist.githubusercontent.com/EthereumRemix/091ccc57986452bbb33f57abfb13d173/raw/3367e019335746b73288e3710af2922d4c8ef5a3/origins.json'
+    const gistUrl = 'https://gist.githubusercontent.com/EthereumRemix/091ccc57986452bbb33f57abfb13d173/raw/59cedab38ae94cc72b68854b3706f11819e4a0af/origins.json'
 
     try {
       const { data } = (await Axios.get(gistUrl)) as { data: any }

libs/remixd/src/origins.json

@@ -1,8 +1,10 @@
 {
     "data":[
         "http://remix-alpha.ethereum.org",
+        "http://remix-beta.ethereum.org",
         "http://remix.ethereum.org",
         "https://remix-alpha.ethereum.org",
+        "https://remix-beta.ethereum.org",
         "https://remix.ethereum.org",
         "package://a7df6d3c223593f3550b35e90d7b0b1f.mod",
         "package://6fd22d6fe5549ad4c4d8fd3ca0b7816b.mod",