reslove conflicts

Signed-off-by: Anup Nehe <[email protected]>
mosip · Sep 18, 2024 · a82024d · a82024d
1 parent 728d671
commit a82024d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/ui-test/src/main/java/pages/HomePage.java b/ui-test/src/main/java/pages/HomePage.java
@@ -261,9 +261,7 @@ public void ClickonQRUploadButton() {
 
 	public void enterIssuersInSearchBox(String string) {
 		enterText(driver, By.xpath("//input[@type='text']"), string);
-//		if(isElementIsVisible(driver, By.xpath("//p[@data-testid='IntroBox-SubText']"))) {
-//			clickOnElement(driver, By.xpath("//p[@data-testid='IntroBox-SubText']"));
-//		}
+
 	}
 
 	public void clickOnDownloadMosipCredentials() {
@@ -330,7 +328,6 @@ public  void openNewTab(){
 		if (allWindowHandles.size() >= 2) {
 			String secondWindowHandle = allWindowHandles.toArray(new String[0])[1];
 			String firstWindowHandle = allWindowHandles.toArray(new String[0])[0];
-			// Switch to the second window
 			driver.switchTo().window(secondWindowHandle);
 		}
 	}
@@ -352,7 +349,6 @@ public  void SwitchToVerifyTab(){
 		if (allWindowHandles.size() >= 2) {
 			String secondWindowHandle = allWindowHandles.toArray(new String[0])[1];
 			String firstWindowHandle = allWindowHandles.toArray(new String[0])[0];
-			// Switch to the second window
 			driver.switchTo().window(firstWindowHandle);
 		}
 	}
@@ -375,7 +371,6 @@ public void selectDateOfBirth() {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-//      System.out.println(driver.getPageSource());
 		System.out.println(driver.getWindowHandles());
 
 		JavascriptExecutor js = (JavascriptExecutor) driver;

diff --git a/ui-test/src/test/java/stepdefinitions/StepDef.java b/ui-test/src/test/java/stepdefinitions/StepDef.java
@@ -527,12 +527,10 @@ public void user_search_the_issuers_with(String string) {
 		} catch (InterruptedException e) {
 			throw new RuntimeException(e);
 		}
-//		homePage.enterIssuersInSearchBox("National");
 		homePage.enterIssuersInSearchBox(string);
 	}
 	@When("User click on veridonia credentials button")
 	public void user_click_on_download_veridonia_button() {
-//		homePage.scrollDownByPage(baseTest.getDriver());
 		homePage.clickOnDownloadMosipCredentials();
 	}
 
@@ -544,16 +542,6 @@ public void user_verify_mosip_national_id_by_e_signet_displayed() {
 	public void user_click_on_health_insurance_id_by_e_signet_button() {
 		homePage.clickOnMosipNationalId();
 	}
-	@When("User verify login page lables")
-	public void user_verify_login_page_lables() {
-		// Write code here that turns the phrase above into concrete actions
-		throw new io.cucumber.java.PendingException();
-	}
-	@When("User verify vid input box header")
-	public void user_verify_vid_input_box_header() {
-		// Write code here that turns the phrase above into concrete actions
-		throw new io.cucumber.java.PendingException();
-	}
 	@When("User enter the  {string}")
 	public void user_enter_the(String string) {
 		homePage.enterVid(string);

diff --git a/ui-test/src/test/resources/featurefiles/UploadQRCodepage.feature b/ui-test/src/test/resources/featurefiles/UploadQRCodepage.feature
@@ -10,8 +10,6 @@ Feature: Inji Verify upload qr code testing
     And User enter the full name  "<full name>"
     And User enter the date of birth "<date of birth>"
     And User click on login button
-
-
     And User verify pdf is downloaded
     And User verify go back button
     And Open inji verify in new tab