cherrypicked 0040595 (#1418)

Signed-off-by: Anup Nehe <[email protected]>
mosip · May 7, 2024 · 20a231a · 20a231a
1 parent 1456a4a
commit 20a231a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/injitest/src/main/java/inji/pages/MoreOptionsPage.java b/injitest/src/main/java/inji/pages/MoreOptionsPage.java
@@ -1,5 +1,6 @@
 package inji.pages;
 
+import inji.utils.IosUtil;
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.pagefactory.AndroidFindBy;
 import io.appium.java_client.pagefactory.iOSXCUITFindBy;
@@ -11,15 +12,15 @@ public class MoreOptionsPage extends BasePage {
 //    @iOSXCUITFindBy(accessibility = "removeFromWallet")
 //    private WebElement removeFromWalletButton;
 
-    @AndroidFindBy(uiAutomator = "new UiScrollable(new UiSelector().scrollable(true).instance(0)).scrollIntoView(new UiSelector().description(\"outlined-delete-icon\"))")
+    @AndroidFindBy(uiAutomator = "new UiScrollable(new UiSelector().scrollable(true).instance(0)).scrollIntoView(new UiSelector().description(\"removeFromWallet\"))")
     @iOSXCUITFindBy(accessibility = "removeFromWallet")
     private WebElement removeFromWalletButton;
 
     @AndroidFindBy(accessibility = "kebabTitle")
     @iOSXCUITFindBy(accessibility = "kebabTitle")
     private WebElement moreOptionsText;
 
-    @AndroidFindBy(accessibility = "outlined-schedule-icon")
+    @AndroidFindBy(accessibility = "viewActivityLog")
     @iOSXCUITFindBy(accessibility = "viewActivityLog")
     private WebElement viewActivityLogButton;
 
@@ -65,6 +66,7 @@ public void clickOnPinOrUnPinCard() {
     }
 
     public HistoryPage clickOnViewActivityLog() {
+        IosUtil.scrollToElement(driver, 171, 2149, 625, 1944);
         clickOnElement(viewActivityLogButton);
         return new HistoryPage(driver);
     }
@@ -88,6 +90,6 @@ public boolean isSomethingIsWrongPopupVisible() {
     }
 
     public boolean isVcActivatedDisplayed() {
-        return this.isElementDisplayed(activated);
+        return this.isElementDisplayed(activatedForOnlineLoginButton);
     }
 }
diff --git a/injitest/src/main/java/inji/pages/OtpVerificationPage.java b/injitest/src/main/java/inji/pages/OtpVerificationPage.java
@@ -125,6 +125,7 @@ public void clickOnResendButton() {
             throw new RuntimeException(e);
         }
         if(isElementEnabled(resendCodeButton,30)) {
+//            ((HidesKeyboard) driver).hideKeyboard();
             clickOnElement(resendCode);
         }
     }

diff --git a/injitest/src/main/java/inji/utils/TestDataReader.java b/injitest/src/main/java/inji/utils/TestDataReader.java
@@ -27,7 +27,7 @@ private static String getValueForKey(String key) {
             case "newaid":
                 return "10001112180007620240217011225";
             case "invalidaid":
-                return "10001100050003220231220202335";
+                return "10004101950000920240314061837";
             case "invalidpasscode":
                 return "123456";
             case "invaliduin":

diff --git a/injitest/src/test/java/androidTestCases/ActivateVcTest.java b/injitest/src/test/java/androidTestCases/ActivateVcTest.java
@@ -224,6 +224,7 @@ public void verifyActiveVcAndWaitForOtpTimeOut() throws InterruptedException {
         otpVerification.WatingTimeForVerificationTimerComplete();
         assertTrue(otpVerification.verifyResendCodeButtonDisplayedEnabled(), "Verify if resend code is enabled");
         otpVerification.clickOnResendButton();
+        otpVerification.clickOnResendButton();
         assertTrue(otpVerification.verifyOtpVerificationTimerDisplayedAfterClickOnResend(), "verify is You can resend the code displayed again after click on resend button ");
     }