Fixed e2e tests

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

@@ -81,7 +81,7 @@ module.exports = {
   // these are test data entries
   'Should have a workspace_test #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
-      .click('*[data-id="workspacesSelect"] option[value="workspace_test"]')
+      .switchWorkspace('workspace_test')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest_contracts"]')
   },
   'Should have a sol file with test data #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
@@ -103,7 +103,7 @@ module.exports = {
   },
   'Should have a empty workspace #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
-      .click('*[data-id="workspacesSelect"] option[value="emptyspace"]')
+      .switchWorkspace('emptyspace')
   },
   // end of test data entries
   'Should load with all storage blocked #group4': function (browser: NightwatchBrowser) {

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

@@ -235,7 +235,7 @@ module.exports = {
       .pause(2000)
       .waitForElementNotPresent('*[data-id="treeViewLitreeViewItemtest.sol"]')
       .pause(2000)
-      .click('*[data-id="workspacesSelect"] option[value="workspace_name"]')
+      .switchWorkspace('workspace_name')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
   },
 
@@ -249,23 +249,23 @@ module.exports = {
       .setValue('*[data-id="modalDialogCustomPromptTextRename"]', 'workspace_name_renamed')
       .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-      .waitForElementPresent('*[data-id="workspacesSelect"] option[value="workspace_name_1"]')
-      .click('*[data-id="workspacesSelect"] option[value="workspace_name_1"]')
+      .switchWorkspace('workspace_name_1')
       .pause(2000)
       .waitForElementNotPresent('*[data-id="treeViewLitreeViewItemtest.sol"]')
-      .waitForElementPresent('*[data-id="workspacesSelect"] option[value="workspace_name_renamed"]')
-      .click('*[data-id="workspacesSelect"] option[value="workspace_name_renamed"]')
+      .switchWorkspace('workspace_name_renamed')
       .pause(2000)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest.sol"]')
   },
 
   'Should delete a workspace #group1': function (browser: NightwatchBrowser) {
     browser
-      .click('*[data-id="workspacesSelect"] option[value="workspace_name_1"]')
+      .switchWorkspace('workspace_name_1')
       .click('*[data-id="workspaceDelete"]') // delete workspace_name_1
       .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-      .waitForElementNotPresent('*[data-id="workspacesSelect"] option[value="workspace_name_1"]')
+      .waitForElementVisible('[data-id="workspacesSelect"]')
+      .click('[data-id="workspacesSelect"]')
+      .waitForElementNotPresent(`[data-id="dropdown-item-workspace_name_1"]`)
       .end()
   },