From 8a751b7e8911563f7ad10baa74c5c0b6fff4b661 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 7 Dec 2023 14:25:53 +0100
Subject: [PATCH] fix test

---
 .../remix-ide-e2e/src/tests/vyper_api.test.ts | 42 +++++++------------
 apps/vyper/src/app/components/VyperResult.tsx |  2 +-
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/vyper_api.test.ts b/apps/remix-ide-e2e/src/tests/vyper_api.test.ts
index 7e81c68885..6c7e7c129f 100644
--- a/apps/remix-ide-e2e/src/tests/vyper_api.test.ts
+++ b/apps/remix-ide-e2e/src/tests/vyper_api.test.ts
@@ -47,27 +47,22 @@ module.exports = {
       .frame(0)
       .click('[data-id="remote-compiler"]')
       .click('[data-id="compile"]')
-      .isVisible({
-        selector: '[data-id="copy-abi"]',
-        timeout: 4000,
-        abortOnFailure: false,
-        suppressNotFoundErrors: true
-      }, (okVisible) => {
-        if (okVisible.value === null) {
-          console.log('retrying compilation...')
-          browser.click('[data-id="compile"]').waitForElementVisible('[data-id="copy-abi"]')
-        } else{
-          browser.assert.ok(okVisible.value === true, 'ABI should be visible')
-        }
+      .waitForElementVisible({
+        selector:'[data-id="compilation-details"]',
+        timeout: 60000
+      })
+      .click('[data-id="compilation-details"]')
+      .frameParent()
+      .waitForElementVisible('[data-id="copy-abi"]')
+      .waitForElementVisible({
+        selector: "//*[@class='variable-value' and contains(.,'highestBidder')]",
+        locateStrategy: 'xpath',
       })
-
-
   },
 
   'Compile test contract and deploy to remix VM #group1': function (browser: NightwatchBrowser) {
     let contractAddress
     browser
-      .frameParent()
       .clickLaunchIcon('filePanel')
       .switchWorkspace('default_workspace')
       .addFile('test.vy', { content: testContract })
@@ -75,20 +70,13 @@ module.exports = {
       // @ts-ignore
       .frame(0)
       .click('[data-id="compile"]')
-      .isVisible({
-        selector: '[data-id="copy-abi"]',
-        timeout: 4000,
-        abortOnFailure: false,
-        suppressNotFoundErrors: true
-      }, (okVisible) => {
-        if (okVisible.value === null) {
-          console.log('retrying compilation...')
-          browser.click('[data-id="compile"]').waitForElementVisible('[data-id="copy-abi"]')
-        } else{
-          browser.assert.ok(okVisible.value === true, 'ABI should be visible')
-        }
+      .waitForElementVisible({
+        selector:'[data-id="compilation-details"]',
+        timeout: 60000
       })
+      .click('[data-id="compilation-details"]')
       .frameParent()
+      .waitForElementVisible('[data-id="copy-abi"]')
       .clickLaunchIcon('udapp')
       .createContract('')
       .clickInstance(0)
diff --git a/apps/vyper/src/app/components/VyperResult.tsx b/apps/vyper/src/app/components/VyperResult.tsx
index 4689be6635..d229663f60 100644
--- a/apps/vyper/src/app/components/VyperResult.tsx
+++ b/apps/vyper/src/app/components/VyperResult.tsx
@@ -58,7 +58,7 @@ function VyperResult({ output, plugin }: VyperResultProps) {
     <>
       <div className="border border-top"></div>
       <div className="d-flex justify-content-center px-2 w-100">
-        <button className="btn btn-secondary w-100" onClick={async () => {
+        <button data-id="compilation-details" className="btn btn-secondary w-100" onClick={async () => {
           await plugin?.call('vyperCompilationDetails', 'showDetails', output)
         }}>
           <span>Compilation Details</span>