ENGCOM-6996: Fix #25243 #25359

app/code/Magento/Ui/view/frontend/web/js/model/messages.js

@@ -48,6 +48,10 @@ define([
             message = messageObj.message.replace(expr, function (varName) {
                 varName = varName.substr(1);
 
+                if (!isNaN(varName)) {
+                    varName--;
+                }
+
                 if (messageObj.parameters.hasOwnProperty(varName)) {
                     return messageObj.parameters[varName];
                 }

dev/tests/js/jasmine/tests/app/code/Magento/Ui/frontend/js/model/messages.test.js

@@ -0,0 +1,109 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'uiRegistry',
+    'Magento_Ui/js/model/messages'
+], function (registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/model/messages', function () {
+
+        var obj,
+            errorMessageText,
+            successMessageText,
+            messageObj;
+
+        beforeEach(function () {
+            obj = new Constr(
+                {
+                    provider: 'provName',
+                    name: '',
+                    index: ''
+                });
+            errorMessageText = 'Error message test';
+            successMessageText = 'Success message test';
+
+            registry.set('provName', {
+                /** Stub */
+                on: function () {
+                },
+
+                /** Stub */
+                get: function () {
+                },
+
+                /** Stub */
+                set: function () {
+                }
+            });
+        });
+
+        it('adds massage without parameters', function () {
+            var type = [];
+
+            messageObj = {
+                message: 'Message test'
+            };
+            expect(obj.add(messageObj, type)).toEqual(true);
+            expect(type).toEqual([messageObj.message]);
+        });
+
+        it('add message with parameters', function () {
+            var returnedObj,
+                type = [];
+
+            messageObj = {
+                message: 'Message test case %1, case %2 and case %3',
+                parameters: [
+                    'one',
+                    'two',
+                    'three'
+                ]
+            };
+            returnedObj = ['Message test case ' + messageObj.parameters[0] + ', case ' +
+                messageObj.parameters[1] + ' and case ' + messageObj.parameters[2]];
+
+            expect(obj.add(messageObj, type)).toEqual(true);
+            expect(type).toEqual(returnedObj);
+        });
+
+        it('add error message, get error message, verify has error message', function () {
+            messageObj = {
+                message: errorMessageText
+            };
+
+            expect(obj.hasMessages()).toEqual(false);
+            expect(obj.addErrorMessage(messageObj)).toEqual(true);
+            expect(obj.getErrorMessages()()).toEqual([errorMessageText]);
+            expect(obj.hasMessages()).toEqual(true);
+        });
+
+        it('add success message, get success message, verify has success message', function () {
+            messageObj = {
+                message: successMessageText
+            };
+
+            expect(obj.addSuccessMessage(messageObj)).toEqual(true);
+            expect(obj.getSuccessMessages()()).toEqual([successMessageText]);
+            expect(obj.hasMessages()).toEqual(true);
+        });
+
+        it('cleaning messages', function () {
+            messageObj = {
+                message: 'Message test case %1, case %2 and case %3',
+                parameters: [
+                    'one',
+                    'two',
+                    'three'
+                ]
+            };
+            expect(obj.addErrorMessage(messageObj)).toEqual(true);
+            obj.clear();
+            expect(obj.getErrorMessages()()).toEqual([]);
+            expect(obj.hasMessages()).toEqual(false);
+        });
+    });
+});