This should leave only the tx tests broken

superfluid-finance · Jul 11, 2024 · f436093 · f436093
1 parent 4bc2ac0
commit f436093
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 13 deletions.
diff --git a/apps/widget-builder/src/components/image-select/ImageSelect.tsx b/apps/widget-builder/src/components/image-select/ImageSelect.tsx
@@ -66,7 +66,12 @@ const ImageSelect: FC<ImageSelectProps> = ({
           />
         </Box>
       ) : (
-        <Button fullWidth sx={{ p: 0, m: 0 }} onClick={triggerFileUpload}>
+        <Button
+          data-testid="file-upload-button"
+          fullWidth
+          sx={{ p: 0, m: 0 }}
+          onClick={triggerFileUpload}
+        >
           <input
             data-testid="file-upload-field"
             hidden

diff --git a/apps/widget-builder/src/hooks/useDemoMode.ts b/apps/widget-builder/src/hooks/useDemoMode.ts
@@ -21,6 +21,17 @@ const defaultProductDetails: ProductDetails = {
 
 const demoPaymentDetails: WidgetProps["paymentDetails"] = {
   paymentOptions: [
+    {
+      receiverAddress: "0xf26ce9749f29e61c25d0333bce2301cb2dfd3a22", // rebounder
+      chainId: supportedNetwork.optimismSepolia.id,
+      superToken: {
+        address: "0x0043d7c85c8b96a49a72a92c0b48cdc4720437d7", // ETHx
+      },
+      flowRate: {
+        amountEther: "1",
+        period: "month",
+      },
+    } as const,
     {
       receiverAddress: "0xf26ce9749f29e61c25d0333bce2301cb2dfd3a22", // rebounder
       chainId: supportedNetwork.optimismSepolia.id,

diff --git a/tests/pageObjects/basePage.ts b/tests/pageObjects/basePage.ts
@@ -97,6 +97,15 @@ export const demoOptions: PaymentOption[] = [
     timeUnit: "month",
     userDefinedRate: true,
   },
+  {
+    network: "Optimism Sepolia",
+    superToken: "ETHx",
+    superTokenName: "ETHx",
+    chainId: "11155420",
+    flowRate: "1",
+    receiver: "0xF26Ce9749f29E61c25d0333bCE2301CB2DFd3a22",
+    timeUnit: "month",
+  },
 ];
 
 export class BasePage {

diff --git a/tests/pageObjects/builderPage.ts b/tests/pageObjects/builderPage.ts
@@ -120,6 +120,7 @@ export class BuilderPage extends BasePage {
   readonly editorErrorMessage: Locator;
   readonly editorHoverErrorMessage: Locator;
   readonly gatingTabSwitch: Locator;
+  readonly uploadImageButton: Locator;
 
   paymentOptionDuringTest: PaymentOption | PartialPaymentOption | undefined;
   paymentFormFieldWordMap: Map<string, Locator>;
@@ -177,6 +178,7 @@ export class BuilderPage extends BasePage {
     this.summaryEditButtons = page.getByTestId("edit-payment-option-button");
     this.summaryCopyButtons = page.getByTestId("clone-payment-option-button");
     this.uploadImageField = page.getByTestId("file-upload-field");
+    this.uploadImageButton = page.getByTestId("file-upload-button");
     this.darkModeSwitch = page.getByLabel("Dark mode: off");
     this.containerBorderSlider = page.getByTestId("container-radius-slider");
     this.containerBorderSliderValue = page.getByTestId(
@@ -1396,7 +1398,7 @@ export class BuilderPage extends BasePage {
         await this.contractOwnerInputField.fill(nftDetails.owner);
       }
       if (nftDetails.image) {
-        await this.uploadImageField.scrollIntoViewIfNeeded();
+        await this.uploadImageButton.scrollIntoViewIfNeeded();
         await this.uploadImageField.setInputFiles(nftDetails.image);
       }
       if (nftDetails.networks) {

diff --git a/tests/pageObjects/widgetPage.ts b/tests/pageObjects/widgetPage.ts
@@ -279,7 +279,8 @@ export class WidgetPage extends BasePage {
 
   async clickContinueButton() {
     await test.step(`Clicking on the continue button`, async () => {
-      await this.continueButton.click();
+      await this.continueButton.scrollIntoViewIfNeeded();
+      await this.continueButton.click({ timeout: 30000 });
     });
   }
 

diff --git a/...lderProductsTab.spec.ts-snapshots/-data-invalidImageUploaded-chromium-linux.png b/...lderProductsTab.spec.ts-snapshots/-data-invalidImageUploaded-chromium-linux.png
diff --git a/tests/specs/widgetConfigurationTests.spec.ts b/tests/specs/widgetConfigurationTests.spec.ts
@@ -23,7 +23,7 @@ test.describe("Widget configuration test cases", () => {
     metamask: MetaMask;
   }) => {
     let widgetPage = new WidgetPage(page);
-    await widgetPage.selectPaymentNetwork("11155420");
+    await widgetPage.selectPaymentNetwork("Optimism Sepolia");
     await widgetPage.selectPaymentToken("fUSDCx");
     await widgetPage.connectWallet(metamask);
     await widgetPage.validateThatWrapAmountInputIs("3");

diff --git a/tests/specs/widgetMetamaskStreamTransactions.spec.ts b/tests/specs/widgetMetamaskStreamTransactions.spec.ts
@@ -28,7 +28,7 @@ test.describe("Transactional test cases", () => {
     await builderPage.openPaymentTab();
     await builderPage.clickOnWandButton();
     await widgetPage.selectPaymentNetwork("Optimism Sepolia");
-    await widgetPage.selectPaymentToken("fDAIx");
+    await widgetPage.selectPaymentToken("ETHx");
     await widgetPage.connectWallet(metamask);
     await widgetPage.skipWrapStep();
     await widgetPage.validateAndSaveSenderAndReceiverAddresses(
@@ -57,7 +57,7 @@ test.describe("Transactional test cases", () => {
   }) => {
     let widgetPage = new WidgetPage(page);
     await widgetPage.selectPaymentNetwork("Optimism Sepolia");
-    await widgetPage.selectPaymentToken("fUSDCx");
+    await widgetPage.selectPaymentToken("fDAIx");
     await widgetPage.connectWallet(metamask);
     await widgetPage.setWrapAmount("0");
     await widgetPage.clickContinueButton();

diff --git a/tests/specs/widgetMetamaskTokenTransactions.spec.ts b/tests/specs/widgetMetamaskTokenTransactions.spec.ts
@@ -25,11 +25,11 @@ test.describe("Token transfer and approval test cases", () => {
   }) => {
     let widgetPage = new WidgetPage(page);
     await widgetPage.selectPaymentNetwork("Optimism Sepolia");
-    await widgetPage.selectPaymentToken("fUSDCx");
+    await widgetPage.selectPaymentToken("fDAIx");
     await widgetPage.connectWallet(metamask);
     await widgetPage.validateAndSaveWrapPageBalances(
       "Optimism Sepolia",
-      "fUSDCx",
+      "fDAIx",
     );
     await widgetPage.setWrapAmount("1");
     await widgetPage.clickContinueButton();
@@ -85,7 +85,7 @@ test.describe("Token transfer and approval test cases", () => {
     await builderPage.clickOnJsonEditorButton();
     await builderPage.editJsonEditorTo("randomUpfrontPaymentReceiver");
     await widgetPage.selectPaymentNetwork("Optimism Sepolia");
-    await widgetPage.selectPaymentToken("fTUSD");
+    await widgetPage.selectPaymentToken("fTUSDx");
     await widgetPage.connectWallet(metamask);
     await widgetPage.validateThatWrapAmountInputIs("4"); //1 upfront payment + 1 x 3 flow rate
     await widgetPage.skipWrapStep();

diff --git a/tests/specs/widgetMetamaskValidationErrors.spec.ts b/tests/specs/widgetMetamaskValidationErrors.spec.ts
@@ -63,8 +63,8 @@ test.describe("Error state test cases", () => {
     let builderPage = new BuilderPage(page);
     paymentOptions.testOption.flowRate = "99999999";
     await builderPage.addPaymentOption(paymentOptions.testOption);
-    await widgetPage.selectPaymentNetwork("Optimism Sepolia");
-    await widgetPage.selectPaymentToken("fUSDCx");
+    await widgetPage.selectPaymentNetwork(paymentOptions.testOption.network);
+    await widgetPage.selectPaymentToken(paymentOptions.testOption.superToken);
     await widgetPage.connectWallet(metamask);
     await widgetPage.setWrapAmount("0");
     await widgetPage.clickContinueButton();
@@ -82,7 +82,7 @@ test.describe("Error state test cases", () => {
   }) => {
     let widgetPage = new WidgetPage(page);
     let builderPage = new BuilderPage(page);
-    paymentOptions.testOption.flowRate = "1";
+    paymentOptions.testOption.flowRate = "3000";
     paymentOptions.testOption.timeUnit = "day";
     await builderPage.addPaymentOption(paymentOptions.testOption);
     await widgetPage.selectPaymentNetwork("Optimism Sepolia");

diff --git a/tests/wallet-setup/basic.setup.ts b/tests/wallet-setup/basic.setup.ts
@@ -26,7 +26,7 @@ await ethHelper.revokeAllowanceIfNeccesary(
 
 //Delete flow before tests, otherwise the widget might not pick it up
 await ethHelper.deleteFlowIfNeccesary(
-  "fDAIx",
+  "ETHx",
   process.env.WIDGET_WALLET_PUBLIC_KEY!,
   rebounderAddresses["optimism-sepolia"],
 );