addFileSnekmate for vyper. update vyper e2e

apps/remix-ide-e2e/src/commands/addFileSnekmate.ts

@@ -0,0 +1,74 @@
+import EventEmitter from 'events'
+import { NightwatchBrowser, NightwatchContractContent } from 'nightwatch'
+
+class AddFileSnekmate extends EventEmitter {
+  command(this: NightwatchBrowser, name: string, content: NightwatchContractContent): NightwatchBrowser {
+    this.api.perform((done) => {
+      addFileSnekmate(this.api, name, content, () => {
+        done()
+        this.emit('complete')
+      })
+    })
+    return this
+  }
+}
+
+function addFileSnekmate(browser: NightwatchBrowser, name: string, content: NightwatchContractContent, done: VoidFunction) {
+  browser
+    .isVisible({
+      selector: "//*[@data-id='sidePanelSwapitTitle' and contains(.,'File explorer')]",
+      locateStrategy: 'xpath',
+      suppressNotFoundErrors: true,
+      timeout: 1000
+    }, (okVisible) => {
+      if (!okVisible.value) {
+        browser.clickLaunchIcon('filePanel')
+      }
+    })
+    .scrollInto('li[data-id="treeViewLitreeViewItemREADME.txt"]')
+    .waitForElementVisible('li[data-id="treeViewLitreeViewItemLICENSE"]')
+    .click('li[data-id="treeViewLitreeViewItemLICENSE"]').pause(1000) // focus on root directory
+    .isVisible({
+      selector: `//*[@data-id="treeViewLitreeViewItem${name}"]`,
+      locateStrategy: 'xpath',
+      abortOnFailure: false,
+      suppressNotFoundErrors: true,
+      timeout: 2000
+    }, (okVisible) => {
+      // @ts-ignore
+      // status === -1 means the element is not visible, 0 means it is visible.
+      if (okVisible.status === 0) {
+        browser.openFile(name)
+          .perform(function () {
+            done()
+          })
+      } else {
+        browser.click('[data-id="fileExplorerNewFilecreateNewFile"]')
+          .waitForElementContainsText('*[data-id$="fileExplorerTreeItemInput"]', '', 60000)
+          .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', name)
+          .sendKeys('*[data-id$="fileExplorerTreeItemInput"]', browser.Keys.ENTER)
+          // isvisible is protocol action called isDisplayed https://www.selenium.dev/selenium/docs/api/java/org/openqa/selenium/WebElement.html#isDisplayed--
+          .isVisible({
+            selector: `li[data-id="treeViewLitreeViewItem${name}"]`,
+            abortOnFailure: false,
+            suppressNotFoundErrors: true,
+            timeout: 60000
+          })
+          .waitForElementVisible({
+            selector: `//*[@data-id='tab-active' and contains(@data-path, "${name}")]`,
+            locateStrategy: 'xpath'
+          })
+          .setEditorValue(content.content)
+          .getEditorValue((result) => {
+            if(result != content.content) {
+              browser.setEditorValue(content.content)
+            }
+          })
+          .perform(function () {
+            done()
+          })
+      }
+    })
+}
+
+module.exports = AddFileSnekmate

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

@@ -33,13 +33,14 @@ module.exports = {
       })
       .currentWorkspaceIs('snekmate')
       .waitForElementVisible({
-        selector: "//*[@data-id='treeViewLitreeViewItemexamples' and contains(.,'examples')]",
+        selector: "//*[@data-id='treeViewLitreeViewItemsrc' and contains(.,'src')]",
         locateStrategy: 'xpath',
         timeout: 60000
       })
       .openFile('src')
-      .openFile('src/tokens')
-      .openFile('src/tokens/ERC721.vy')
+      .openFile('src/snekmate')
+      .openFile('src/snekmate/tokens')
+      .openFile('src/snekmate/tokens/ERC721.vy')
   },
   // 'Add vyper file to run tests #group1': function (browser: NightwatchBrowser) {
   //   browser.addFile('TestBallot.sol', sources[0]['TestBallot.sol'])
@@ -47,7 +48,7 @@ module.exports = {
   '@sources': () => sources,
   'Context menu click to compile blind_auction should succeed #group1': function (browser: NightwatchBrowser) {
     browser
-      .addFile('blind_auction.vy', sources[0]['blindAuction'])
+      .addFileSnekmate('blind_auction.vy', sources[0]['blindAuction'])
       .click('*[data-id="treeViewLitreeViewItemblind_auction.vy"]')
       .rightClick('*[data-id="treeViewLitreeViewItemblind_auction.vy"]')
       .waitForElementPresent('[data-id="contextMenuItemvyper"]')

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

@@ -73,6 +73,7 @@ declare module 'nightwatch' {
     waitForElementNotContainsText: (id: string, value: string, timeout: number = 10000) => NightwatchBrowser
     hideToolTips: (this: NightwatchBrowser) => NightwatchBrowser
     enableClipBoard: () => NightwatchBrowser
+    addFileSnekmate: (name: string, content: NightwatchContractContent) => NightwatchBrowser
   }
 
   export interface NightwatchBrowser {