Skip to content

Commit a8ef56d

Browse files
can-anguncan-angun
committed
Fixed rating consent fails
1 parent f19284f commit a8ef56d

File tree

5 files changed

+148
-13
lines changed

5 files changed

+148
-13
lines changed

‎plugins/star-rating/frontend/public/templates/drawer.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
</div>
5353
<div v-if="drawerScope.editedObject.consent" class="ratings-drawer__consent">
5454
<label>
55-
<input type="checkbox"
55+
<input data-test-id="ratings-drawer-ratingspopup-consent-checkbox" type="checkbox"
5656
value="consent" checked
5757
>
58-
<span v-html="finalTxt(drawerScope.editedObject.links)"></span>
58+
<span v-html="finalTxt(drawerScope.editedObject.links)" data-test-id="ratings-drawer-ratingspopup-consent-text"></span>
5959
</label>
6060
</div>
6161
<div class="ratings-drawer__rp-action-area">

‎ui-tests/cypress/e2e/dashboard/feedback/ratings/widgets.cy.js‎

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ const { RATING_SYMBOLS } = require('../../../../support/constants');
1010
const helper = require('../../../../support/helper');
1111

1212
describe('Create New Widget', () => {
13-
beforeEach(function() {
13+
beforeEach(function () {
1414
navigationHelpers.goToLoginPage();
1515
loginHelpers.login(user.username, user.password);
1616
navigationHelpers.goToFeedbackRatingsWidgetsPage();
1717
});
1818

19-
it('Verify default values of page and create a widget with that values and then update the widget data', function() {
19+
it('Verify default values of page and create a widget with that values and then update the widget data', function () {
2020
widgetsHelpers.clickAddNewWidgetButton();
2121
widgetsHelpers.verifySettingsPageDefaultElements();
2222
widgetsHelpers.typeWidgetName("My New Widget");
@@ -141,6 +141,7 @@ describe('Create New Widget', () => {
141141
widgetsHelpers.typeAddCommentCheckboxLabelText(widget.addCommentCheckboxLabelText);
142142
widgetsHelpers.clickContactViaCheckbox();
143143
widgetsHelpers.typeContactViaCheckboxLabelText(widget.contactViaCheckboxLabelText);
144+
widgetsHelpers.clickAddUserConsentCheckbox();
144145
widgetsHelpers.typeButtonCallOut(widget.buttonCallOut);
145146
widgetsHelpers.typeThanksMessage(widget.thanksMessage);
146147
widgetsHelpers.clickNextStepButton();
@@ -166,6 +167,8 @@ describe('Create New Widget', () => {
166167
commentCheckboxLabelText: widget.comment,
167168
isCheckedViaContact: true,
168169
viaContactCheckboxLabelText: widget.contactVia,
170+
isCheckedAddConsent: true,
171+
consentText: "I agree to the Terms and Conditions and Privacy Policy.",
169172
submitButtonText: widget.buttonCallOut,
170173
submitButtonColor: widget.mainColor,
171174
submitButtonFontColor: widget.FontColor,
@@ -186,7 +189,7 @@ describe('Create New Widget', () => {
186189

187190
widgetsHelpers.clickNextStepButton(),
188191

189-
widgetsHelpers.clickShowOnlyCheckbox();
192+
widgetsHelpers.clickShowOnlyCheckbox();
190193
widgetsHelpers.typeShowOnlyPages(...['/homepage', '/shopping', '/checkout']);
191194

192195
widgetsHelpers.clickSaveButton();
@@ -270,11 +273,11 @@ describe('Create New Widget', () => {
270273
});
271274
});
272275

273-
it('Create a widget with updated text then stop the widget from details page', function() {
276+
it('Create a widget with updated text then stop the widget from details page', function () {
274277
const widget = generateWidgetFixture();
275278

276279
widgetsHelpers.clickAddNewWidgetButton(),
277-
widgetsHelpers.typeWidgetName(widget.widgetName);
280+
widgetsHelpers.typeWidgetName(widget.widgetName);
278281
widgetsHelpers.typeQuestion(widget.question);
279282
widgetsHelpers.typeEmojiOneText(widget.emojiOneText);
280283
widgetsHelpers.typeEmojiTwoText(widget.emojiTwoText);
@@ -285,6 +288,12 @@ describe('Create New Widget', () => {
285288
widgetsHelpers.typeAddCommentCheckboxLabelText(widget.addCommentCheckboxLabelText);
286289
widgetsHelpers.clickContactViaCheckbox();
287290
widgetsHelpers.typeContactViaCheckboxLabelText(widget.contactViaCheckboxLabelText);
291+
widgetsHelpers.clickAddUserConsentCheckbox();
292+
widgetsHelpers.typeAddUserConsentText(widget.consentText);
293+
widgetsHelpers.typeAddUserConsentLinkText(0, widget.firstConsentLinkText);
294+
widgetsHelpers.typeAddUserConsentLinkUrl(0, widget.firstConsentLinkUrl);
295+
widgetsHelpers.typeAddUserConsentLinkText(1, widget.secondConsentLinkText);
296+
widgetsHelpers.typeAddUserConsentLinkUrl(1, widget.secondConsentLinkUrl);
288297
widgetsHelpers.typeButtonCallOut(widget.buttonCallOut);
289298
widgetsHelpers.typeThanksMessage(widget.thanksMessage);
290299
widgetsHelpers.clickNextStepButton();
@@ -310,6 +319,8 @@ describe('Create New Widget', () => {
310319
commentCheckboxLabelText: widget.comment,
311320
isCheckedViaContact: true,
312321
viaContactCheckboxLabelText: widget.contactVia,
322+
isCheckedAddConsent: true,
323+
consentText: widget.consentText,
313324
submitButtonText: widget.buttonCallOut,
314325
submitButtonColor: widget.mainColor,
315326
submitButtonFontColor: widget.FontColor,
@@ -330,7 +341,7 @@ describe('Create New Widget', () => {
330341

331342
widgetsHelpers.clickNextStepButton(),
332343

333-
widgetsHelpers.clickShowOnlyCheckbox();
344+
widgetsHelpers.clickShowOnlyCheckbox();
334345
widgetsHelpers.typeShowOnlyPages(...['/homepage', '/shopping', '/checkout']);
335346

336347
widgetsHelpers.clickSaveButton();
@@ -363,6 +374,7 @@ describe('Create New Widget', () => {
363374
contactViaCheckboxLabelText: widget.contactViaCheckboxLabelText,
364375
contactEmail: widgetRate.contactEmail,
365376
submitButtonText: widget.submitButtonText,
377+
consentText: widget.consentText,
366378
selectedMainColor: widget.mainColor,
367379
selectedFontColor: widget.FontColor,
368380
hasPoweredByLogo: true,
@@ -400,13 +412,12 @@ describe('Create New Widget', () => {
400412
index: 0,
401413
question: widget.question,
402414
internalName: widget.widgetName,
403-
//There is still an issue TODO
404-
//pages: "/homepage, /shopping, /checkout",
415+
pages: "/homepage, /shopping, /checkout",
405416
isActive: false
406417
});
407418
});
408419

409-
it('Verify next step button activation, the entered data exist when returning to the previous pages and creating a passive widget and deleting the widget', function() {
420+
it('Verify next step button activation, the entered data exist when returning to the previous pages and creating a passive widget and deleting the widget', function () {
410421
const widget = generateWidgetFixture();
411422

412423
widgetsHelpers.clickAddNewWidgetButton();
@@ -429,6 +440,12 @@ describe('Create New Widget', () => {
429440
widgetsHelpers.typeAddCommentCheckboxLabelText(widget.addCommentCheckboxLabelText);
430441
widgetsHelpers.clickContactViaCheckbox();
431442
widgetsHelpers.typeContactViaCheckboxLabelText(widget.contactViaCheckboxLabelText);
443+
widgetsHelpers.clickAddUserConsentCheckbox();
444+
widgetsHelpers.typeAddUserConsentText(widget.consentText);
445+
widgetsHelpers.typeAddUserConsentLinkText(0, widget.firstConsentLinkText);
446+
widgetsHelpers.typeAddUserConsentLinkUrl(0, widget.firstConsentLinkUrl);
447+
widgetsHelpers.typeAddUserConsentLinkText(1, widget.secondConsentLinkText);
448+
widgetsHelpers.typeAddUserConsentLinkUrl(1, widget.secondConsentLinkUrl);
432449
widgetsHelpers.typeButtonCallOut(widget.buttonCallOut);
433450
widgetsHelpers.clickNextStepButton();
434451

@@ -458,6 +475,17 @@ describe('Create New Widget', () => {
458475
addCommentCheckboxLabelText: widget.addCommentCheckboxLabelText,
459476
isCheckedViaContact: true,
460477
contactViaCheckboxLabelText: widget.contactViaCheckboxLabelText,
478+
consentText: widget.consentText,
479+
consentItems: [
480+
{
481+
text: widget.firstConsentLinkText,
482+
link: widget.firstConsentLinkUrl
483+
},
484+
{
485+
text: widget.secondConsentLinkText,
486+
link: widget.secondConsentLinkUrl
487+
}
488+
],
461489
submitButtonText: widget.buttonCallOut,
462490
thanksMessageText: widget.thanksMessage,
463491
});
@@ -505,7 +533,7 @@ describe('Create New Widget', () => {
505533
widgetsHelpers.shouldBeWidgetDeleted(widget.question);
506534
});
507535

508-
it('Verify widget details comment and rating tab data', function() {
536+
it('Verify widget details comment and rating tab data', function () {
509537
widgetsHelpers.clickAddNewWidgetButton();
510538
const widget = generateWidgetFixture();
511539

‎ui-tests/cypress/fixtures/generators/widgets/index.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ const generator = () => {
1010
const emojiFiveText = faker.lorem.words({ min: 1, max: 3 });
1111
const addCommentCheckboxLabelText = faker.lorem.words({ min: 1, max: 3 });
1212
const contactViaCheckboxLabelText = faker.lorem.words({ min: 1, max: 3 });
13+
const firstConsentLinkText = faker.lorem.words({ min: 1, max: 3 });
14+
const firstConsentLinkUrl = faker.internet.url();
15+
const secondConsentLinkText = faker.lorem.words({ min: 1, max: 3 });
16+
const secondConsentLinkUrl = faker.internet.url();
17+
const consentText = faker.lorem.words({ min: 1, max: 3 }) + ' ' + firstConsentLinkText + ' and ' + secondConsentLinkText + ' ' + faker.lorem.words({ min: 1, max: 3 });
1318
const buttonCallOut = faker.lorem.words({ min: 1, max: 3 });
1419
const thanksMessage = faker.lorem.words({ min: 1, max: 3 });
1520
const mainColor = faker.color.rgb({ format: 'hex', casing: 'upper' });
@@ -27,6 +32,11 @@ const generator = () => {
2732
emojiFiveText,
2833
addCommentCheckboxLabelText,
2934
contactViaCheckboxLabelText,
35+
consentText,
36+
firstConsentLinkText,
37+
firstConsentLinkUrl,
38+
secondConsentLinkText,
39+
secondConsentLinkUrl,
3040
buttonCallOut,
3141
thanksMessage,
3242
mainColor,

‎ui-tests/cypress/lib/dashboard/feedback/ratings/widgets.js‎

Lines changed: 83 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {
22
feedbackRatingWidgetsPageElements,
3+
feedbackRatingWidgetAddUserConsentElements,
34
widgetsDataTableElements,
45
feedbackRatingWidgetDetailsPageElements,
56
feedbackRatingWidgetDetailsCommentsDataTableElements,
@@ -65,6 +66,9 @@ const verifySettingsPageElements = ({
6566
commentText,
6667
isCheckedViaContact,
6768
viaContactText,
69+
isCheckedAddConsent,
70+
consentText,
71+
consentItems = [],
6872
submitButtonText,
6973
thanksMessageText
7074
}) => {
@@ -73,7 +77,7 @@ const verifySettingsPageElements = ({
7377

7478
cy.verifyElement({
7579
labelElement: feedbackRatingWidgetsPageElements.WIDGET_NAME_LABEL,
76-
labelText: "surveys.drawer.internal.name",
80+
labelText: "surveys.drawer.internal.name", //TODO: Will be updated after SER-2121 fixed
7781
element: feedbackRatingWidgetsPageElements.WIDGET_NAME_INPUT,
7882
value: widgetName,
7983
elementPlaceHolder: "Widget Name"
@@ -138,6 +142,53 @@ const verifySettingsPageElements = ({
138142
value: viaContactText,
139143
});
140144
}
145+
146+
cy.verifyElement({
147+
labelElement: feedbackRatingWidgetAddUserConsentElements().ADD_USER_CONSENT_LABEL,
148+
labelText: "surveys.drawer.consent", //TODO:Updated after SER-2121 fixed
149+
element: feedbackRatingWidgetAddUserConsentElements().ADD_USER_CONSENT_CHECKBOX,
150+
isChecked: isCheckedAddConsent
151+
});
152+
153+
if (isCheckedAddConsent) {
154+
cy.verifyElement({
155+
labelElement: feedbackRatingWidgetAddUserConsentElements().ADD_USER_CONSENT_TEXT_LABEL,
156+
labelText: "Text",
157+
});
158+
159+
cy.verifyElement({
160+
element: feedbackRatingWidgetAddUserConsentElements().ADD_USER_CONSENT_TEXT_INPUT,
161+
value: consentText,
162+
});
163+
164+
cy.verifyElement({
165+
labelElement: feedbackRatingWidgetAddUserConsentElements().ADD_USER_CONSENT_LINK_LABEL,
166+
labelText: "Link(s)",
167+
tooltipElement: feedbackRatingWidgetAddUserConsentElements().ADD_USER_CONSENT_LINK_TOOLTIP,
168+
tooltipText: "Matching link texts inside the consent text are modified to be links",
169+
});
170+
171+
cy.verifyElement({
172+
element: feedbackRatingWidgetAddUserConsentElements().ADD_USER_CONSENT_CONSENT_ADD_LINK_BUTTON,
173+
});
174+
175+
consentItems.forEach((consent, index) => {
176+
const consentLinkElements = feedbackRatingWidgetAddUserConsentElements(index);
177+
178+
cy.verifyElement({
179+
element: consentLinkElements.ADD_USER_CONSENT_CONSENT_LINKS_TEXT_INPUT,
180+
value: consent.text,
181+
});
182+
183+
cy.verifyElement({
184+
element: consentLinkElements.ADD_USER_CONSENT_CONSENT_LINKS_URL_INPUT,
185+
value: consent.link,
186+
});
187+
});
188+
}
189+
190+
cy.scrollPageToBottom('.cly-vue-drawer__steps-container.is-multi-step');
191+
141192
cy.verifyElement({
142193
labelElement: feedbackRatingWidgetsPageElements.BUTTON_CALLOUT_LABEL,
143194
labelText: "Button Callout",
@@ -449,6 +500,22 @@ const typeContactViaCheckboxLabelText = (email) => {
449500
cy.typeInput(feedbackRatingWidgetsPageElements.CONTACT_VIA_INPUT, email);
450501
};
451502

503+
const clickAddUserConsentCheckbox = () => {
504+
cy.clickElement(feedbackRatingWidgetAddUserConsentElements().ADD_USER_CONSENT_CHECKBOX);
505+
};
506+
507+
const typeAddUserConsentText = (text) => {
508+
cy.typeInput(feedbackRatingWidgetAddUserConsentElements().ADD_USER_CONSENT_TEXT_INPUT, text);
509+
};
510+
511+
const typeAddUserConsentLinkText = (index, text) => {
512+
cy.typeInput(feedbackRatingWidgetAddUserConsentElements(index).ADD_USER_CONSENT_CONSENT_LINKS_TEXT_INPUT, text);
513+
};
514+
515+
const typeAddUserConsentLinkUrl = (index, link) => {
516+
cy.typeInput(feedbackRatingWidgetAddUserConsentElements(index).ADD_USER_CONSENT_CONSENT_LINKS_URL_INPUT, link);
517+
};
518+
452519
const typeButtonCallOut = (buttonText) => {
453520
cy.typeInput(feedbackRatingWidgetsPageElements.BUTTON_CALLOUT_INPUT, buttonText);
454521
};
@@ -681,6 +748,8 @@ const verifyPreviewRatingsPopUpElements = ({
681748
commentCheckboxLabelText,
682749
isCheckedViaContact,
683750
viaContactCheckboxLabelText,
751+
isCheckedAddConsent = false,
752+
consentText,
684753
submitButtonText,
685754
submitButtonColor,
686755
submitButtonFontColor,
@@ -733,6 +802,15 @@ const verifyPreviewRatingsPopUpElements = ({
733802
isChecked: isCheckedViaContact
734803
});
735804

805+
if (isCheckedAddConsent) {
806+
cy.verifyElement({
807+
labelElement: feedbackRatingWidgetsPageElements.RATINGS_POPUP_CONSENT_LABEL,
808+
labelText: consentText,
809+
element: feedbackRatingWidgetsPageElements.RATINGS_POPUP_CONSENT_CHECKBOX,
810+
isChecked: isCheckedAddConsent
811+
});
812+
}
813+
736814
cy.verifyElement({
737815
element: feedbackRatingWidgetsPageElements.RATINGS_POPUP_SUBMIT_BUTTON,
738816
elementText: submitButtonText,
@@ -1125,6 +1203,10 @@ module.exports = {
11251203
typeAddCommentCheckboxLabelText,
11261204
clickContactViaCheckbox,
11271205
typeContactViaCheckboxLabelText,
1206+
clickAddUserConsentCheckbox,
1207+
typeAddUserConsentText,
1208+
typeAddUserConsentLinkText,
1209+
typeAddUserConsentLinkUrl,
11281210
typeButtonCallOut,
11291211
typeThanksMessage,
11301212
selectRatingSymbol,

‎ui-tests/cypress/support/elements/dashboard/feedback/ratings/widgets.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ export const feedbackRatingWidgetsPageElements = {
112112
RATINGS_POPUP_ADD_COMMENT_LABEL: 'ratings-drawer-ratingspopup-comment-label',
113113
RATINGS_POPUP_CONTACT_VIA_CHECKBOX: 'ratings-drawer-ratingspopup-contact-checkbox-el-checkbox-input',
114114
RATINGS_POPUP_CONTACT_VIA_LABEL: 'ratings-drawer-ratingspopup-contact-label',
115+
RATINGS_POPUP_CONSENT_TEXT: 'ratings-drawer-ratingspopup-consent-text',
115116
RATINGS_POPUP_SUBMIT_BUTTON: 'ratings-drawer-ratingspopup-submit-button',
116117
RATINGS_POPUP_POWEREDBY_LOGO: 'ratings-drawer-ratingspopup-poweredby-label',
117118

@@ -128,6 +129,19 @@ export const feedbackRatingWidgetsPageElements = {
128129
RATINGS_POPUP_TRIGGER_BUTTON: 'ratings-drawer-trigger-button'
129130
};
130131

132+
const feedbackRatingWidgetAddUserConsentElements = (index = 0) => ({
133+
ADD_USER_CONSENT_LABEL: 'ratings-drawer-settings-add-user-consent-el-checkbox-label',
134+
ADD_USER_CONSENT_CHECKBOX: 'ratings-drawer-settings-add-user-consent-el-checkbox-input',
135+
ADD_USER_CONSENT_TEXT_LABEL: 'ratings-drawer-settings-add-user-consent-text-label',
136+
ADD_USER_CONSENT_TEXT_INPUT: 'ratings-drawer-settings-add-user-consent-text-input',
137+
ADD_USER_CONSENT_LINK_LABEL: 'ratings-drawer-settings-add-user-consent-links-label',
138+
ADD_USER_CONSENT_LINK_TOOLTIP: 'ratings-drawer-settings-add-user-consent-links-tooltip',
139+
ADD_USER_CONSENT_CONSENT_LINKS_TEXT_INPUT: 'ratings-drawer-settings-add-user-consent-links-text-input-' + index,
140+
ADD_USER_CONSENT_CONSENT_LINKS_URL_INPUT: 'ratings-drawer-settings-add-user-consent-links-link-input-' + index,
141+
ADD_USER_CONSENT_CONSENT_LINKS_DELETE_ICON: 'ratings-drawer-settings-add-user-consent-delete-link-' + index,
142+
ADD_USER_CONSENT_CONSENT_ADD_LINK_BUTTON: 'ratings-drawer-settings-add-user-consent-add-link-button',
143+
});
144+
131145
const widgetsDataTableElements = (index = 0) => ({
132146
TABLE_ROWS: '.el-table__row',
133147
EDIT_COLUMNS_BUTTON: 'ratings-widgets-data-table-edit-columns-button',
@@ -269,6 +283,7 @@ const feedbackRatingWidgetDetailsRatingsDataTableElements = (index = 0) => ({
269283

270284
module.exports = {
271285
feedbackRatingWidgetsPageElements,
286+
feedbackRatingWidgetAddUserConsentElements,
272287
feedbackRatingWidgetDetailsPageElements,
273288
widgetsDataTableElements,
274289
feedbackRatingWidgetDetailsCommentsDataTableElements,

0 commit comments

Comments
 (0)