Skip to content

Commit 45281d0

Browse files
DevAlePMDevAlePM
authored
Merge pull request #576 from ProcessMaker/fix_savedSearchPage
Fix saved search page
2 parents 9e86334 + 1298b83 commit 45281d0

File tree

4 files changed

+28
-27
lines changed

4 files changed

+28
-27
lines changed

‎pages/admin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,7 @@ export class Admin {
15761576
* @return nothing returns
15771577
*/
15781578
enableRandomlyGenerated(){
1579-
cy.xpath('(//label[@class="custom-control-label"])[1]').should('be.visible').click();
1579+
cy.xpath('(//label[@class="custom-control-label"])[1]').should('be.visible').click();
15801580
}
15811581

15821582
/**

‎pages/execution.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3370,14 +3370,14 @@ export class Execution {
33703370
cy.get('h5').eq(0).should('have.text','Active Columns');
33713371
cy.get('h5').eq(1).should('have.text','Available Columns');
33723372
//verify active column
3373-
cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',9);
3373+
cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',10);
33743374
//verify available column
33753375
cy.get('div[class="border bg-muted px-3 draggable-list draggable-available"] > div').should('have.length',4);
33763376
//move element
33773377
cy.get(':nth-child(2) > .border > :nth-child(1) > .column-card > .d-flex').drag('div[class="border bg-muted px-3 draggable-list draggable-current"]');
33783378
cy.get(':nth-child(2) > .border > :nth-child(1) > .column-card > .d-flex').drag('div[class="border bg-muted px-3 draggable-list draggable-current"]');
33793379
//verify active column
3380-
cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',11);
3380+
cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',12);
33813381
//verify available column
33823382
cy.get('div[class="border bg-muted px-3 draggable-list draggable-available"] > div').should('have.length',2);
33833383
cy.get('.mt-3 > .d-flex > .btn-secondary')
@@ -3400,9 +3400,9 @@ export class Execution {
34003400
cy.wait(5000);
34013401
cy.xpath('//div[@class="border bg-muted px-3 draggable-list draggable-available"]//div/span[text()="Line 1"]').should('have.text','Line 1');
34023402
//verify active column
3403-
cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',9);
3403+
cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',10);
34043404
//verify available column
3405-
cy.get('div[class="border bg-muted px-3 draggable-list draggable-available"] > div').should('have.length',3);
3405+
cy.get('div[class="border bg-muted px-3 draggable-list draggable-available"] > div').should('have.length',4);
34063406
cy.get('.mt-3 > .d-flex > .btn-secondary').click();
34073407
cy.get('.mt-3 > .d-flex > .btn-outline-secondary').click();
34083408
}
@@ -6459,7 +6459,7 @@ export class Execution {
64596459
cy.get("div [class='border bg-muted px-3 draggable-list draggable-available'] :nth-child(11) > .column-card").drag(".mr-3 > .border");
64606460
cy.get("div [class='border bg-muted px-3 draggable-list draggable-available'] :nth-child(11) > .column-card").drag(".mr-3 > .border");
64616461
cy.get("div [class='border bg-muted px-3 draggable-list draggable-available'] :nth-child(11) > .column-card").drag(".mr-3 > .border");
6462-
cy.get("div [class='border bg-muted px-3 draggable-list draggable-available'] :nth-child(11) > .column-card").drag(".mr-3 > .border");
6462+
//cy.get("div [class='border bg-muted px-3 draggable-list draggable-available'] :nth-child(11) > .column-card").drag(".mr-3 > .border");
64636463
cy.xpath('//*[@id="nav-columns"]//button[2]').click({ force: true });
64646464
}
64656465
waitUntilcardBodyIsVisible(selectorXPath,maxAttempts=10, attempts=0){

‎pages/saveSearch.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ export class SaveSearchs {
121121
.should('be.visible')
122122
.click();
123123

124-
cy.get(':nth-child(3) > .btn')
125-
.first()
126-
.should('be.visible')
127-
.click();
124+
// cy.get(':nth-child(3) > .btn')
125+
// .first()
126+
// .should('be.visible')
127+
// .click();
128128
}
129129
//Configurations
130130
configurationsSaveSearch() {
@@ -139,7 +139,7 @@ export class SaveSearchs {
139139
.click();
140140
}
141141

142-
/**
142+
/**
143143
This method creates a Save Search from Request > Save Search
144144
* @param name: Assign a name for the Save Search
145145
* @param iconName: the correct name must be assigned. E.g. iconName: clipboard because the class="fas fa-fw fa-clipboard"
@@ -148,13 +148,13 @@ export class SaveSearchs {
148148
* @param completeUserName: this name is needed because the user will be selected in the User list
149149
* @return: nothing value
150150
*/
151-
createSaveSearch(name,iconName, userName="", groupName="", completeUserName=""){
151+
createSaveSearch(name, iconName, userName="", groupName="", completeUserName="", buttonName = "Save"){
152152
cy.get('button[title="Save Search"]').should('be.visible');
153153
cy.get('button[title="Save Search"]').click();
154154
cy.get('[aria-label="Close"]')
155155
.first()
156156
.click();
157-
cy.get('button[title="Save Search"]').click();
157+
cy.get('button[title="Save Search"]').click();
158158
cy.xpath('//legend[text()="Share With Users"]/parent::fieldset//div[@class="multiselect__spinner"]').should('not.be.visible');
159159
cy.xpath('//legend[text()="Share With Groups"]/parent::fieldset//div[@class="multiselect__spinner"]').should('not.be.visible');
160160
cy.xpath("//label[contains(text(),'Name')]/parent::div//input").should('be.visible');
@@ -174,7 +174,7 @@ export class SaveSearchs {
174174
cy.xpath('//legend[text()="Share With Groups"]//following-sibling::div//div[@class="multiselect__content-wrapper"]/ul/li/span/span').should('have.text',groupName);
175175
cy.xpath('//legend[text()="Share With Groups"]//following-sibling::div//div[@class="multiselect__content-wrapper"]/ul/li/span/span').click();
176176
}
177-
cy.xpath('//footer[@id="save-search-modal___BV_modal_footer_"]/button[text()="Save"]').click();
177+
cy.xpath('//footer[@id="save-search-modal___BV_modal_footer_"]/button[text()="'+buttonName+'"]').click();
178178
}
179179

180180
enableNotification(){
@@ -275,16 +275,16 @@ export class SaveSearchs {
275275
cy.xpath(selectors.clickOnSourceOptn).click();
276276
cy.xpath(selectors.clickOnSeriesDrpDwn).should('be.visible');
277277
cy.xpath(selectors.clickOnSeriesDrpDwn).click();
278-
cy.xpath(selectors.clickOnSeriesInptBx).type(series,{delay:100});
279-
cy.xpath(selectors.clickOnSeriesValue.replace('name',series))
280-
.should('be.visible')
281-
.click();
278+
cy.xpath(selectors.clickOnSeriesInptBx).type(series + "{enter}",{delay:100});
279+
// cy.xpath(selectors.clickOnSeriesValue.replace('name',series))
280+
// .should('be.visible')
281+
// .click();
282282
cy.wait(2000);
283283
cy.xpath(selectors.clickOnMetricDrpDwn).click();
284-
cy.xpath(selectors.clickOnMetricInptBx).type(metric,{delay:100});
285-
cy.xpath(selectors.clickOnMetricValue.replace('name',metric))
286-
.should('be.visible')
287-
.click();
284+
cy.xpath(selectors.clickOnMetricInptBx).type(metric + "{enter}",{delay:100});
285+
// cy.xpath(selectors.clickOnMetricValue.replace('name',metric))
286+
// .should('be.visible')
287+
// .click();
288288
cy.wait(2000);
289289
cy.xpath(selectors.clickOnSumBtn).click();
290290
switch(metric_type){

‎pages/screens.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -497,16 +497,17 @@ export class Screens {
497497
cy.log(el.text());
498498
//if (el.text().includes("No Data Available")) { //This message doesn't display anymore
499499
cy.get('table tbody').then($tbody => {
500-
if ($tbody.is(':empty')) {
501-
cy.get(Selectors.searchInputBox).first().clear().type(screenName, { delay: 1}).type(" ",{ delay: 600}).type("{backspace}").type(" ").type("{backspace}").should('have.value', screenName);
502-
}else{
500+
if ($tbody.is(':empty')) {
501+
cy.get(Selectors.searchInputBox).first().clear().type(screenName, { delay: 1}).type(" ",{ delay: 600}).type("{backspace}").type(" ").type("{backspace}").should('have.value', screenName);
502+
}else{
503503
cy.get('[data-cy="screens-table-td-0-0"] span').then((row)=>{
504504
if(!(row.text()===screenName)){
505505
cy.get(Selectors.searchInputBox).first().clear().type(screenName, { delay: 1}).type(" ",{ delay: 600}).type("{backspace}").type(" ").type("{backspace}").should('have.value', screenName);
506506
}
507-
})
508-
}
507+
})
508+
}
509509
});
510+
});
510511
}
511512

512513
clickOnEditScreen(screenName) {

0 commit comments

Comments
 (0)