From 67e44e41356c98394508b8951a20e0bae2d24a82 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Thu, 13 Jul 2023 23:14:50 +0530 Subject: [PATCH 1/4] [28241] Added docker build in push_trigger.yml file --- .github/workflows/push_trigger.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml index d2922305..3dc16eaf 100644 --- a/.github/workflows/push_trigger.yml +++ b/.github/workflows/push_trigger.yml @@ -47,7 +47,8 @@ jobs: - name: Build image run: | cd "./${{env.SERVICE_LOCATION}}" - docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }} + # docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }} + docker build . --build-arg SOURCE=mosip --build-arg COMMIT_HASH=$(git rev-parse HEAD) --build-arg COMMIT_ID=$(git rev-parse --short HEAD) --build-arg BUILD_TIME=${{steps.date.outputs.date}} --file Dockerfile --tag ${{ env.SERVICE_NAME }} - name: Log into registry run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin From 41f9ba7ac4c56afbbd158d4b2389155d089039b8 Mon Sep 17 00:00:00 2001 From: Aravindhan Alagesan Date: Mon, 24 Jul 2023 16:44:28 +0530 Subject: [PATCH 2/4] Firefox zoom option related issue fixes --- .../src/app/shared/header/header.component.ts | 43 ++++++++++++------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/resident-ui/src/app/shared/header/header.component.ts b/resident-ui/src/app/shared/header/header.component.ts index b355dea3..114526c8 100644 --- a/resident-ui/src/app/shared/header/header.component.ts +++ b/resident-ui/src/app/shared/header/header.component.ts @@ -29,7 +29,7 @@ export class HeaderComponent implements OnInit, OnDestroy { defaultJsonValue: any; selectedLanguage: any; supportedLanguages: Array; - selectLanguagesArr: any = []; + selectLanguagesArr: any; zoomLevel:any = [{"fontSize":"12", "label":"Small"},{"fontSize":"14", "label":"Normal"},{"fontSize":"16", "label":"Large"},{"fontSize":"18", "label":"Huge"}]; fullName: string; lastLogin: string; @@ -41,7 +41,6 @@ export class HeaderComponent implements OnInit, OnDestroy { page = 1; selector: string = "#notificationMenu"; clickEventSubscription: Subscription; - sitealignment:string = localStorage.getItem('direction'); constructor( private router: Router, @@ -87,6 +86,8 @@ export class HeaderComponent implements OnInit, OnDestroy { async ngOnInit() { this.defaultJsonValue = defaultJson; + this.supportedLanguages = []; + this.selectLanguagesArr = []; let self = this; setTimeout(()=>{ if(!localStorage.getItem("langCode")){ @@ -100,16 +101,21 @@ export class HeaderComponent implements OnInit, OnDestroy { }); } - let supportedLanguages = this.appConfigService.getConfig()['supportedLanguages'].split(','); + let supportedLanguages = this.appConfigService.getConfig()['supportedLanguages'].split(','); if(supportedLanguages.length > 1){ + this.selectLanguagesArr = []; supportedLanguages.map((language) => { - this.selectLanguagesArr.push({ - code: language.trim(), - value: defaultJson.languages[language.trim()].nativeName, - }); + if (defaultJson.languages && defaultJson.languages[language.trim()]) { + if(language === "eng"){ + this.selectLanguagesArr.push({ + code: language.trim(), + value: defaultJson.languages[language.trim()].name, + }); + } + } }); } - console.log(this.selectLanguagesArr) + self.translateService.use(localStorage.getItem("langCode")); self.textDir = localStorage.getItem("dir"); }, 1000); @@ -215,14 +221,21 @@ export class HeaderComponent implements OnInit, OnDestroy { zoom(item:any) { if(item.fontSize === "12"){ - document.body.style["zoom"] = "90%"; + //document.body.style["zoom"]= "90%"; + document.body.style["transform"] = "scale(1, .9)"; + document.body.style["margin-top"] = "-2.5%"; }else if(item.fontSize === "14"){ - document.body.style["zoom"]= "100%"; - + //document.body.style["zoom"]= "100%"; + document.body.style["transform"] = "scale(1, 1.0)"; + document.body.style["margin-top"] = "0%"; }else if(item.fontSize === "16"){ - document.body.style["zoom"]= "110%"; + //document.body.style["zoom"]= "110%"; + document.body.style["transform"] = "scale(1, 1.1)"; + document.body.style["margin-top"] = "2.1%"; }else if(item.fontSize === "18"){ - document.body.style["zoom"]= "120%"; + //document.body.style["zoom"]= "120%"; + document.body.style["transform"] = "scale(1, 1.2)"; + document.body.style["margin-top"] = "4.5%"; } } @@ -263,9 +276,7 @@ export class HeaderComponent implements OnInit, OnDestroy { clickYesToProceed: this.popupMessages.genericmessage.clickYesToProceed, yesBtnFor:"logOutBtn", btnTxt: this.popupMessages.genericmessage.yesButton, - isYes:"Yes", - btnTxtNo: this.popupMessages.genericmessage.noButton, - isNo:"No" + btnTxtNo: this.popupMessages.genericmessage.noButton } }); return dialogRef; From dcc514e7539f49d92a4aa2b22c969ba071c99067 Mon Sep 17 00:00:00 2001 From: Anup Nehe Date: Tue, 25 Jul 2023 09:34:46 +0530 Subject: [PATCH 3/4] MOSIP-28546 --- .../residentTest/testcase/GetInformation.java | 2 +- .../testcase/GetPersonalisedCard.java | 46 +++++--- .../test/residentTest/testcase/LoginTest.java | 100 +++++++++--------- .../residentTest/testcase/ManageMyVid.java | 5 +- .../residentTest/testcase/SecureMyId.java | 12 ++- .../residentTest/testcase/UpdateMyData.java | 13 ++- .../test/residentTest/utility/TestRunner.java | 2 +- 7 files changed, 107 insertions(+), 73 deletions(-) diff --git a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/GetInformation.java b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/GetInformation.java index e510fe0d..b0127b38 100644 --- a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/GetInformation.java +++ b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/GetInformation.java @@ -24,7 +24,7 @@ public void getInformation() throws Exception { test=extent.createTest("GetInformation test", "verify Login"); Commons.click(test,driver, By.id("dashboardCard2")); - Commons.click(test,driver, By.id("downloadAcknowledgementbtn")); +// Commons.click(test,driver, By.id("downloadAcknowledgementbtn")); Commons.click(test,driver, By.id("mat-tab-label-0-0")); //Commons.dropdown(driver, By.id("mat-select-0")); diff --git a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/GetPersonalisedCard.java b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/GetPersonalisedCard.java index c1987d79..f66eaac5 100644 --- a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/GetPersonalisedCard.java +++ b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/GetPersonalisedCard.java @@ -14,7 +14,7 @@ public class GetPersonalisedCard extends BaseClass { public void GetPersonalisedCard() throws Exception { LoginTest.loginTest(); test=extent.createTest("Get Personalised Card", "verify Login"); - Commons.click(test,driver, By.xpath("(//mat-card[@class='mini-card mat-card'])[5]")); + Commons.click(test,driver, By.id("uinservices/personalisedcard")); Commons.click(test,driver, By.xpath("//span[text()='Name']")); Commons.click(test,driver, By.xpath("//span[text()='DOB']")); @@ -23,9 +23,11 @@ public void GetPersonalisedCard() throws Exception { Commons.click(test,driver, By.id("downloadFileBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); test.log(Status.INFO, "Click on download"); + Commons.click(test,driver, By.id("uinservices/personalisedcard")); Commons.click(test,driver, By.xpath("//span[text()='Name']")); Commons.click(test,driver, By.xpath("//span[text()='DOB']")); + Commons.click(test,driver, By.xpath("//span[text()='UIN']")); Commons.click(test,driver, By.xpath("//span[text()='Perpetual VID']")); Commons.click(test,driver, By.xpath("//span[text()='Phone Number']")); @@ -35,20 +37,29 @@ public void GetPersonalisedCard() throws Exception { Commons.click(test,driver, By.id("downloadFileBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); + test.log(Status.INFO, "Submit with any three checkbox with masked "); +// Commons.click(test,driver, By.id("uinservices/personalisedcard")); +// Commons.click(test,driver, By.xpath("//span[text()='Name']")); +// Commons.click(test,driver, By.xpath("//span[text()='DOB']")); +// +// Commons.click(test,driver, By.id("downloadFileBtn")); +// Commons.click(test,driver, By.id("confirmmessagepopup")); +// Thread.sleep(3000); +// +// Commons.click(test,driver, By.id("Mask It2")); +// Commons.click(test,driver, By.id("Mask It3")); +// Commons.click(test,driver, By.id("Mask It4")); +// Commons.click(test,driver, By.id("downloadFileBtn")); +// Commons.click(test,driver, By.id("confirmmessagepopup")); + + + Commons.click(test,driver, By.id("uinservices/personalisedcard")); Commons.click(test,driver, By.xpath("//span[text()='Name']")); Commons.click(test,driver, By.xpath("//span[text()='DOB']")); - - Commons.click(test,driver, By.id("downloadFileBtn")); - Commons.click(test,driver, By.id("confirmmessagepopup")); - Thread.sleep(3000); - - Commons.click(test,driver, By.id("Mask It2")); - Commons.click(test,driver, By.id("Mask It3")); - Commons.click(test,driver, By.id("Mask It4")); - Commons.click(test,driver, By.id("downloadFileBtn")); - Commons.click(test,driver, By.id("confirmmessagepopup")); - + Commons.click(test,driver, By.xpath("//span[text()='UIN']")); + Commons.click(test,driver, By.xpath("//span[text()='Perpetual VID']")); + Commons.click(test,driver, By.xpath("//span[text()='Phone Number']")); Commons.click(test,driver, By.xpath("//span[text()='Email ID']")); Commons.click(test,driver, By.xpath("//span[text()='Address']")); Commons.click(test,driver, By.xpath("//span[text()='Gender']")); @@ -56,6 +67,17 @@ public void GetPersonalisedCard() throws Exception { Commons.click(test,driver, By.id("downloadFileBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); test.log(Status.INFO, "Select all check box"); + + Commons.click(test,driver, By.id("uinservices/personalisedcard")); + Commons.click(test,driver, By.xpath("//span[text()='Name']")); + Commons.click(test,driver, By.xpath("//span[text()='DOB']")); + Commons.click(test,driver, By.xpath("//span[text()='UIN']")); + Commons.click(test,driver, By.xpath("//span[text()='Perpetual VID']")); + Commons.click(test,driver, By.xpath("//span[text()='Phone Number']")); + Commons.click(test,driver, By.xpath("//span[text()='Email ID']")); + Commons.click(test,driver, By.xpath("//span[text()='Address']")); + Commons.click(test,driver, By.xpath("//span[text()='Gender']")); + Commons.click(test,driver, By.xpath("//span[text()='Image']")); Commons.click(test,driver, By.id("Mask It2")); Commons.click(test,driver, By.id("Mask It3")); Commons.click(test,driver, By.id("Mask It4")); diff --git a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/LoginTest.java b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/LoginTest.java index e3a28c78..0b194b0b 100644 --- a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/LoginTest.java +++ b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/LoginTest.java @@ -37,10 +37,10 @@ import io.mosip.test.residentTest.utility.TestRunner; - @Test(priority = 0) +// @Test(priority = 0) public class LoginTest extends BaseClass{ // - // @Test(priority = 0) + @Test(priority = 0) public static void loginTest() throws Exception { //WebDriver driver = BaseClass.driver; String envPath = System.getProperty("path"); @@ -88,7 +88,7 @@ public static void loginTest() throws Exception { // // // - @Test(priority = 0) + // @Test(priority = 0) public static void loginTestWithTempraryVID() throws Exception { //WebDriver driver = BaseClass.driver; String envPath = System.getProperty("path"); @@ -131,7 +131,7 @@ public static void loginTestWithTempraryVID() throws Exception { } - @Test + // @Test public static void loginTestWithOneTimeVID() throws Exception { //WebDriver driver = BaseClass.driver; String envPath = System.getProperty("path"); @@ -177,52 +177,52 @@ public static void loginTestWithOneTimeVID() throws Exception { - @Test(priority = 0) - public static void loginTestWithUINRevokeVID() throws Exception { - //WebDriver driver = BaseClass.driver; - String envPath = System.getProperty("path"); - String vid = System.getProperty("vid"); - String otp = "00000"; - String externalemail=JsonUtil.JsonObjParsing(Commons.getTestData(),"externalemail"); -// String UIN=JsonUtil.JsonObjParsing(Commons.getTestData(),"UIN"); - driver.get(envPath); - driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS); - test=extent.createTest("Login Test with valid UIN to RevokeVid", "verify Login"); - Thread.sleep(60000); - Commons.click(test,driver,By.xpath("//div[@id='dashboardCard1']")); - Commons.click(test,driver,By.id("here_tab_id")); - Commons.click(test,driver,By.id("more_ways_to_sign_in")); - Commons.click(test,driver,By.id("login_with_otp")); - Thread.sleep(30000); - Commons.enter(test,driver, By.id("Otp_mosip-vid"), TestRunner.uin); - Commons.click(test,driver, By.xpath("//button[text()='Get OTP']")); - otp = MockSMTPListener.getOtp(10, externalemail); - System.out.println(otp); - for(int i=0;i<=otp.length()-1;i++) { - Commons.enter(test,driver, By.xpath("//*[@class=\"pincode-input-text\"]["+(i+1)+"]"), Character.toString(otp.charAt(i)));} - test.log(Status.INFO, "Extracted OTP"); - Thread.sleep(4000); - Commons.click(test,driver, By.xpath("//button[text()='Verify']")); - List checkboxes = driver.findElements(By.xpath("//input[@type='checkbox']")); - List ids =new ArrayList<>(); - for(WebElement checkbox: checkboxes) { - String id = checkbox.getAttribute("id"); - ids.add(id); - } - System.out.println(ids); - for(String id :ids) { - WebElement checkbox= driver.findElement(By.id(id)); - js.executeScript("arguments[0].click();", checkbox); - } - test.log(Status.INFO, "ALL Checkboxes are selected"); - Commons.click(test,driver, By.xpath("//button[text()='Allow']")); - Commons.click(test,driver, By.id("confirmmessagepopup")); - Commons.click(test,driver, By.xpath("(//mat-card[@class='mini-card mat-card'])[2]")); - Commons.click(test,driver, By.xpath("(//mat-icon[@id='delete0'])[1]")); - Commons.click(test,driver, By.id("confirmmessagepopup")); - - Commons.click(test,driver, By.id("confirmmessagepopup")); - } +// @Test(priority = 0) +// public static void loginTestWithUINRevokeVID() throws Exception { +// //WebDriver driver = BaseClass.driver; +// String envPath = System.getProperty("path"); +// String vid = System.getProperty("vid"); +// String otp = "00000"; +// String externalemail=JsonUtil.JsonObjParsing(Commons.getTestData(),"externalemail"); +//// String UIN=JsonUtil.JsonObjParsing(Commons.getTestData(),"UIN"); +// driver.get(envPath); +// driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS); +// test=extent.createTest("Login Test with valid UIN to RevokeVid", "verify Login"); +// Thread.sleep(60000); +// Commons.click(test,driver,By.xpath("//div[@id='dashboardCard1']")); +// Commons.click(test,driver,By.id("here_tab_id")); +// Commons.click(test,driver,By.id("more_ways_to_sign_in")); +// Commons.click(test,driver,By.id("login_with_otp")); +// Thread.sleep(30000); +// Commons.enter(test,driver, By.id("Otp_mosip-vid"), TestRunner.uin); +// Commons.click(test,driver, By.xpath("//button[text()='Get OTP']")); +// otp = MockSMTPListener.getOtp(10, externalemail); +// System.out.println(otp); +// for(int i=0;i<=otp.length()-1;i++) { +// Commons.enter(test,driver, By.xpath("//*[@class=\"pincode-input-text\"]["+(i+1)+"]"), Character.toString(otp.charAt(i)));} +// test.log(Status.INFO, "Extracted OTP"); +// Thread.sleep(4000); +// Commons.click(test,driver, By.xpath("//button[text()='Verify']")); +// List checkboxes = driver.findElements(By.xpath("//input[@type='checkbox']")); +// List ids =new ArrayList<>(); +// for(WebElement checkbox: checkboxes) { +// String id = checkbox.getAttribute("id"); +// ids.add(id); +// } +// System.out.println(ids); +// for(String id :ids) { +// WebElement checkbox= driver.findElement(By.id(id)); +// js.executeScript("arguments[0].click();", checkbox); +// } +// test.log(Status.INFO, "ALL Checkboxes are selected"); +// Commons.click(test,driver, By.xpath("//button[text()='Allow']")); +// Commons.click(test,driver, By.id("confirmmessagepopup")); +// Commons.click(test,driver, By.xpath("(//mat-card[@class='mini-card mat-card'])[2]")); +// Commons.click(test,driver, By.xpath("(//mat-icon[@id='delete0'])[1]")); +// Commons.click(test,driver, By.id("confirmmessagepopup")); +// +// Commons.click(test,driver, By.id("confirmmessagepopup")); +// } // //// // @Test(priority = 0) diff --git a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/ManageMyVid.java b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/ManageMyVid.java index 5dc6831c..1b24b05f 100644 --- a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/ManageMyVid.java +++ b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/ManageMyVid.java @@ -18,7 +18,7 @@ public void manageMyVid() throws Exception { LoginTest.loginTest(); test=extent.createTest(" Test ManageMyVid", "verify Login"); - Commons.click(test,driver, By.xpath("(//mat-card[@class='mini-card mat-card'])[2]")); + Commons.click(test,driver, By.id("uinservices/managemyvid")); Commons.click(test,driver, By.id("Perpetual")); test.log(Status.INFO, "Click on Perpetual"); Commons.click(test,driver, By.id("confirmmessagepopup")); @@ -29,7 +29,7 @@ public void manageMyVid() throws Exception { Commons.click(test,driver, By.id("confirmmessagepopup")); - + // Commons.click(test,driver, By.id("uinservices/managemyvid")); Commons.click(test,driver, By.id("Temporary")); test.log(Status.INFO, "Click on Temporary"); Commons.click(test,driver, By.id("confirmmessagepopup")); @@ -44,6 +44,7 @@ public void manageMyVid() throws Exception { Commons.click(test,driver, By.id("confirmmessagepopup")); Thread.sleep(3000); + // Commons.click(test,driver, By.id("uinservices/managemyvid")); Commons.click(test,driver, By.id("OneTimeUse")); test.log(Status.INFO, "Click on OneTimeUse"); Commons.click(test,driver, By.id("confirmmessagepopup")); diff --git a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/SecureMyId.java b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/SecureMyId.java index 2866294a..c86780b7 100644 --- a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/SecureMyId.java +++ b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/SecureMyId.java @@ -17,26 +17,28 @@ public void SecureMyId() throws Exception { LoginTest.loginTest(); test=extent.createTest("Test SecureMyId", "verify SecureMyId"); - Commons.click(test,driver, By.xpath("(//mat-card[@class='mini-card mat-card'])[3]")); + Commons.click(test,driver, By.id("uinservices/lockunlockauth")); Commons.click(test,driver, By.id("setAuthlockStatus1")); Commons.click(test,driver, By.id("updateAuthlockStatusBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); Commons.click(test,driver, By.id("confirmmessagepopup")); test.log(Status.INFO, "Click on Mobile OTP Authentication locked"); + Commons.click(test,driver, By.id("uinservices/lockunlockauth")); Commons.click(test,driver, By.id("setAuthlockStatus1")); Commons.click(test,driver, By.id("updateAuthlockStatusBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); Commons.click(test,driver, By.id("confirmmessagepopup")); test.log(Status.INFO, "Click on Mobile OTP Authentication UNlocked"); - + Commons.click(test,driver, By.id("uinservices/lockunlockauth")); Commons.click(test,driver, By.id("setAuthlockStatus2")); Commons.click(test,driver, By.id("updateAuthlockStatusBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); Commons.click(test,driver, By.id("confirmmessagepopup")); test.log(Status.INFO, "Click on Demographic Authentication locked"); + Commons.click(test,driver, By.id("uinservices/lockunlockauth")); Commons.click(test,driver, By.id("setAuthlockStatus2")); Commons.click(test,driver, By.id("updateAuthlockStatusBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); @@ -44,6 +46,7 @@ public void SecureMyId() throws Exception { test.log(Status.INFO, "Click on Demographic Authentication Unlocked"); + Commons.click(test,driver, By.id("uinservices/lockunlockauth")); Commons.click(test,driver, By.id("setAuthlockStatus3")); Commons.click(test,driver, By.id("updateAuthlockStatusBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); @@ -51,30 +54,35 @@ public void SecureMyId() throws Exception { test.log(Status.INFO, "Click on Fingerprint Authentication locked"); + Commons.click(test,driver, By.id("uinservices/lockunlockauth")); Commons.click(test,driver, By.id("setAuthlockStatus3")); Commons.click(test,driver, By.id("updateAuthlockStatusBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); Commons.click(test,driver, By.id("confirmmessagepopup")); test.log(Status.INFO, "Click on Fingerprint Authentication Unlocked"); + Commons.click(test,driver, By.id("uinservices/lockunlockauth")); Commons.click(test,driver, By.id("setAuthlockStatus4")); Commons.click(test,driver, By.id("updateAuthlockStatusBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); Commons.click(test,driver, By.id("confirmmessagepopup")); test.log(Status.INFO, "Click on Iris Authentication locked"); + Commons.click(test,driver, By.id("uinservices/lockunlockauth")); Commons.click(test,driver, By.id("setAuthlockStatus4")); Commons.click(test,driver, By.id("updateAuthlockStatusBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); Commons.click(test,driver, By.id("confirmmessagepopup")); test.log(Status.INFO, "Click on Iris Authentication Unlocked"); + Commons.click(test,driver, By.id("uinservices/lockunlockauth")); Commons.click(test,driver, By.id("setAuthlockStatus5")); Commons.click(test,driver, By.id("updateAuthlockStatusBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); Commons.click(test,driver, By.id("confirmmessagepopup")); test.log(Status.INFO, "Click on Face Authentication locked"); + Commons.click(test,driver, By.id("uinservices/lockunlockauth")); Commons.click(test,driver, By.id("setAuthlockStatus5")); Commons.click(test,driver, By.id("updateAuthlockStatusBtn")); Commons.click(test,driver, By.id("confirmmessagepopup")); diff --git a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/UpdateMyData.java b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/UpdateMyData.java index 53cd79c5..5525e35b 100644 --- a/residenttest/src/main/java/io/mosip/test/residentTest/testcase/UpdateMyData.java +++ b/residenttest/src/main/java/io/mosip/test/residentTest/testcase/UpdateMyData.java @@ -9,14 +9,14 @@ import io.mosip.test.residentTest.utility.Commons; import io.mosip.test.residentTest.utility.JsonUtil; import io.mosip.test.residentTest.utility.MockSMTPListener; - @Test(groups = "UMD") +@Test(groups = "UMD") public class UpdateMyData extends BaseClass { public void updateMyData() throws Exception { String tempemail1=JsonUtil.JsonObjParsing(Commons.getTestData(),"tempemail1"); LoginTest.loginTest(); test=extent.createTest("updateMyData Test ", "verify Login"); - Commons.click(test,driver, By.xpath("(//mat-card[@class='mini-card mat-card'])[7]")); + Commons.click(test,driver, By.id("uinservices/updatedemographic")); Commons.enter(test,driver, By.id("fullName"), data); Commons.dropdown(test,driver, By.id("gender")); test.log(Status.INFO, "Click on gender"); @@ -34,7 +34,8 @@ public void updateMyData() throws Exception { Thread.sleep(3000); test.log(Status.INFO, "Update Address"); - Commons.click(test,driver, By.xpath("//span[text()='Demographic Data']")); + Commons.click(test,driver, By.id("uinservices/updatedemographic")); + //Commons.click(test,driver, By.xpath("//span[text()='Demographic Data']")); Commons.click(test,driver, By.xpath("//div[text()='Address']")); Commons.enter(test,driver, By.id("addressLine1"), data); Commons.dropdown(test,driver, By.id("Region")); @@ -56,7 +57,8 @@ public void updateMyData() throws Exception { test.log(Status.INFO, "Update Email"); - Commons.click(test,driver, By.xpath("//span[text()='Demographic Data']")); + Commons.click(test,driver, By.id("uinservices/updatedemographic")); + //Commons.click(test,driver, By.xpath("//span[text()='Demographic Data']")); Commons.click(test,driver, By.xpath("//div[text()='Contact']")); Commons.enter(test,driver, By.id("email"), tempemail1); @@ -73,7 +75,8 @@ public void updateMyData() throws Exception { //Lang prefrence test.log(Status.INFO, "Select Language Preference"); - Commons.click(test,driver, By.xpath("//span[text()='Demographic Data']")); + Commons.click(test,driver, By.id("uinservices/updatedemographic")); + // Commons.click(test,driver, By.xpath("//span[text()='Demographic Data']")); Commons.click(test,driver, By.xpath("//div[text()='Language Preference']")); Commons.dropdown(test,driver, By.id("preferredLang")); Commons.click(test,driver, By.id("submit")); diff --git a/residenttest/src/main/java/io/mosip/test/residentTest/utility/TestRunner.java b/residenttest/src/main/java/io/mosip/test/residentTest/utility/TestRunner.java index cd1cf3c7..850dc48c 100644 --- a/residenttest/src/main/java/io/mosip/test/residentTest/utility/TestRunner.java +++ b/residenttest/src/main/java/io/mosip/test/residentTest/utility/TestRunner.java @@ -68,7 +68,7 @@ public static void main(String[] args) throws Exception { public static String getGlobalResourcePath() { if (checkRunType().equalsIgnoreCase("JAR")) { - return new File(jarUrl).getParentFile().getAbsolutePath() + "/MosipTestResource".toString(); + return new File(jarUrl).getParentFile().getAbsolutePath()+"/MosipTestResource".toString(); } else if (checkRunType().equalsIgnoreCase("IDE")) { String path = new File(TestRunner.class.getClassLoader().getResource("").getPath()).getAbsolutePath() .toString(); From 1cdb5abe7a6b6bbcdaf82471cc88d2bfdabb0e42 Mon Sep 17 00:00:00 2001 From: Aravindhan Alagesan Date: Mon, 31 Jul 2023 17:42:51 +0530 Subject: [PATCH 4/4] Sending the language code to esignet and removed update demographic url from UI --- resident-ui/src/app/core/services/loginredirect.service.ts | 2 +- resident-ui/src/assets/i18n/ara.json | 7 ------- resident-ui/src/assets/i18n/eng.json | 7 ------- resident-ui/src/assets/i18n/fra.json | 7 ------- resident-ui/src/assets/i18n/hin.json | 7 ------- resident-ui/src/assets/i18n/kan.json | 7 ------- resident-ui/src/assets/i18n/spa.json | 7 ------- resident-ui/src/assets/i18n/tam.json | 7 ------- 8 files changed, 1 insertion(+), 50 deletions(-) diff --git a/resident-ui/src/app/core/services/loginredirect.service.ts b/resident-ui/src/app/core/services/loginredirect.service.ts index 731e7ce1..17774c04 100644 --- a/resident-ui/src/app/core/services/loginredirect.service.ts +++ b/resident-ui/src/app/core/services/loginredirect.service.ts @@ -13,7 +13,7 @@ export class LoginRedirectService { if(url.split("#")[1] === "/dashboard"){ constructurl = url.replace("/dashboard", "/uinservices/dashboard"); } - window.location.href = `${this.appService.getConfig().baseUrl}${this.appService.getConfig().login}` + btoa(constructurl)+"?state="+stateParam; + window.location.href = `${this.appService.getConfig().baseUrl}${this.appService.getConfig().login}` + btoa(constructurl)+"?state="+stateParam+"&ui_locales="+localStorage.getItem("langCode"); localStorage.setItem("redirectURL", constructurl) } diff --git a/resident-ui/src/assets/i18n/ara.json b/resident-ui/src/assets/i18n/ara.json index 707b13fe..fd3bf3d3 100644 --- a/resident-ui/src/assets/i18n/ara.json +++ b/resident-ui/src/assets/i18n/ara.json @@ -52,13 +52,6 @@ "route": "uinservices/sharewithpartner", "description": "يمكن للمقيمين اختيار البيانات المراد مشاركتها مع أي من الشركاء المسجلين للاستفادة من مختلف الخدمات من الطرف الثالث.", "auditEventId": "ADM-004" - }, - { - "displayName": "تحديث بياناتي", - "icon": "assets/images/updatedemographic.png", - "route": "uinservices/updatedemographic", - "description": "يمكن للمقيمين تحديث البيانات الموجودة بالفعل المرتبطة بمعرّف UIN/VID الخاص بهم. يمكن تحديث البيانات التي يمكن تحديثها بما في ذلك الاسم والجنس وتاريخ الميلاد والعنوان والوثائق المرفوعة ورقم الهاتف وعنوان البريد الإلكتروني واللغة المفضلة ، إلخ.", - "auditEventId": "ADM-004" } ] }, diff --git a/resident-ui/src/assets/i18n/eng.json b/resident-ui/src/assets/i18n/eng.json index 9403920e..e16b4a9f 100644 --- a/resident-ui/src/assets/i18n/eng.json +++ b/resident-ui/src/assets/i18n/eng.json @@ -52,13 +52,6 @@ "route": "uinservices/sharewithpartner", "description": " Residents can choose the data to be shared with any of the registered partners to avail various third party services.", "auditEventId": "ADM-004" - }, - { - "displayName": "Update My Data", - "icon": "assets/images/updatedemographic.png", - "route": "uinservices/updatedemographic", - "description": "Residents can update the already existing data associated with their UIN/ VID. The data that can be updated includes name, gender, DOB, address, documents uploaded, phone number, email ID, preferred language, etc.", - "auditEventId": "ADM-004" } ] }, diff --git a/resident-ui/src/assets/i18n/fra.json b/resident-ui/src/assets/i18n/fra.json index 678780db..7904f85e 100644 --- a/resident-ui/src/assets/i18n/fra.json +++ b/resident-ui/src/assets/i18n/fra.json @@ -52,13 +52,6 @@ "route": "uinservices/sharewithpartner", "description": "Les résidents peuvent choisir les données à partager avec l'un des partenaires enregistrés pour bénéficier de divers services tiers.", "auditEventId": "ADM-004" - }, - { - "displayName": "Mettre à jour mes données", - "icon": "assets/images/updatedemographic.png", - "route": "uinservices/updatedemographic", - "description": "Les résidents peuvent mettre à jour les données déjà existantes associées à leur UIN/ VID. Les données pouvant être mises à jour incluent le nom, le genre, la date de naissance, l'adresse, les documents téléchargés, le numéro de téléphone, l'adresse e-mail, la langue préférée, etc.", - "auditEventId": "ADM-004" } ] }, diff --git a/resident-ui/src/assets/i18n/hin.json b/resident-ui/src/assets/i18n/hin.json index 37c94558..c2eb3739 100644 --- a/resident-ui/src/assets/i18n/hin.json +++ b/resident-ui/src/assets/i18n/hin.json @@ -52,13 +52,6 @@ "route": "uinservices/sharewithpartner", "description": "निवासी विभिन्न तृतीय पक्ष सेवाओं का लाभ उठाने के लिए किसी भी पंजीकृत भागीदार के साथ साझा किए जाने वाले डेटा का चयन कर सकते हैं।", "auditEventId": "ADM-004" - }, - { - "displayName": "मेरा डेटा अपडेट करें", - "icon": "assets/images/updatedemographic.png", - "route": "uinservices/updatedemographic", - "description": "निवासी अपने यूआईएन/वीआईडी ​​से जुड़े पहले से मौजूद डेटा को अपडेट कर सकते हैं। जिन डेटा को अपडेट किया जा सकता है उनमें नाम, लिंग, जन्मतिथि, पता, अपलोड किए गए दस्तावेज़, फ़ोन नंबर, ईमेल आईडी, पसंदीदा भाषा आदि शामिल हैं।", - "auditEventId": "ADM-004" } ] }, diff --git a/resident-ui/src/assets/i18n/kan.json b/resident-ui/src/assets/i18n/kan.json index 16917e61..b911c23b 100644 --- a/resident-ui/src/assets/i18n/kan.json +++ b/resident-ui/src/assets/i18n/kan.json @@ -52,13 +52,6 @@ "route": "uinservices/sharewithpartner", "description": "ವಿವಿಧ ಮೂರನೇ ವ್ಯಕ್ತಿಯ ಸೇವೆಗಳನ್ನು ಪಡೆಯಲು ಯಾವುದೇ ನೋಂದಾಯಿತ ಪಾಲುದಾರರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಲು ನಿವಾಸಿಗಳು ಡೇಟಾವನ್ನು ಆಯ್ಕೆ ಮಾಡಬಹುದು.", "auditEventId": "ADM-004" - }, - { - "displayName": "ನನ್ನ ಡೇಟಾವನ್ನು ನವೀಕರಿಸಿ", - "icon": "assets/images/updatedemographic.png", - "route": "uinservices/updatedemographic", - "description": "ನಿವಾಸಿಗಳು ತಮ್ಮ UIN/VID ಯೊಂದಿಗೆ ಸಂಯೋಜಿತವಾಗಿರುವ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ನವೀಕರಿಸಬಹುದು. ಅಪ್‌ಡೇಟ್ ಮಾಡಬಹುದಾದ ಡೇಟಾವು ಹೆಸರು, ಲಿಂಗ, DOB, ವಿಳಾಸ, ಅಪ್‌ಲೋಡ್ ಮಾಡಿದ ದಾಖಲೆಗಳು, ಫೋನ್ ಸಂಖ್ಯೆ, ಇಮೇಲ್ ಐಡಿ, ಆದ್ಯತೆಯ ಭಾಷೆ ಇತ್ಯಾದಿಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ.", - "auditEventId": "ADM-004" } ] }, diff --git a/resident-ui/src/assets/i18n/spa.json b/resident-ui/src/assets/i18n/spa.json index cbf1e53b..a07f1ad6 100644 --- a/resident-ui/src/assets/i18n/spa.json +++ b/resident-ui/src/assets/i18n/spa.json @@ -52,13 +52,6 @@ "route": "uinservices/sharewithpartner", "description": " Los residentes pueden elegir los datos que se compartirán con cualquiera de los socios registrados para aprovechar varios servicios de terceros.", "auditEventId": "ADM-004" - }, - { - "displayName": "Actualizar mis datos", - "icon": "assets/images/updatedemographic.png", - "route": "uinservices/updatedemographic", - "description": "Los residentes pueden actualizar los datos ya existentes asociados a su UIN/VID. Los datos que se pueden actualizar incluyen nombre, sexo, fecha de nacimiento, dirección, documentos cargados, número de teléfono, ID de correo electrónico, idioma preferido, etc.", - "auditEventId": "ADM-004" } ] }, diff --git a/resident-ui/src/assets/i18n/tam.json b/resident-ui/src/assets/i18n/tam.json index d66d12ac..ec782f3e 100644 --- a/resident-ui/src/assets/i18n/tam.json +++ b/resident-ui/src/assets/i18n/tam.json @@ -52,13 +52,6 @@ "route": "uinservices/sharewithpartner", "description": "பல்வேறு மூன்றாம் தரப்பு சேவைகளைப் பெற, பதிவுசெய்யப்பட்ட கூட்டாளர்களில் எவருடனும் பகிர வேண்டிய தரவை குடியிருப்பாளர்கள் தேர்வு செய்யலாம்.", "auditEventId": "ADM-004" - }, - { - "displayName": "எனது தரவைப் புதுப்பிக்கவும்", - "icon": "assets/images/updatedemographic.png", - "route": "uinservices/updatedemographic", - "description": "குடியிருப்பாளர்கள் தங்கள் UIN/VID உடன் ஏற்கனவே உள்ள தரவை புதுப்பிக்கலாம். புதுப்பிக்கப்படக்கூடிய தரவுகளில் பெயர், பாலினம், DOB, முகவரி, பதிவேற்றப்பட்ட ஆவணங்கள், தொலைபேசி எண், மின்னஞ்சல் ஐடி, விருப்பமான மொழி போன்றவை அடங்கும்.", - "auditEventId": "ADM-004" } ] },