Merge branch 'MAGETWO-64413' into MPI-bugfixes

Author: YevSent

app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js

@@ -19,7 +19,7 @@
     } else {
         factory(jQuery);
     }
-}(function ($, cvvValidator, creditCardNumberValidator, expirationDateValidator, monthValidator, creditCardData) {
+}(function ($, cvvValidator, creditCardNumberValidator, yearValidator, monthValidator, creditCardData) {
     'use strict';
 
     $.each({
@@ -49,6 +49,7 @@
 
             /**
              * Validate credit card number based on mod 10
+             *
              * @param {*} number - credit card number
              * @return {Boolean}
              */
@@ -60,8 +61,9 @@
         'validate-card-date': [
 
             /**
-             * Validate credit card number based on mod 10
-             * @param {*} date - month
+             * Validate credit card expiration month
+             *
+             * @param {String} date - month
              * @return {Boolean}
              */
             function (date) {
@@ -72,8 +74,9 @@
         'validate-card-cvv': [
 
             /**
-             * Validate credit card number based on mod 10
-             * @param {*} cvv - month
+             * Validate cvv
+             *
+             * @param {String} cvv - card verification value
              * @return {Boolean}
              */
             function (cvv) {
@@ -86,12 +89,13 @@
         'validate-card-year': [
 
             /**
-             * Validate credit card number based on mod 10
-             * @param {*} date - month
+             * Validate credit card expiration year
+             *
+             * @param {String} date - year
              * @return {Boolean}
              */
             function (date) {
-                return monthValidator(date).isValid;
+                return yearValidator(date).isValid;
             },
             $.mage.__('Incorrect credit card expiration year.')
         ]

dev/tests/js/jasmine/tests/app/code/Magento/Payment/base/js/model/credit-card-validation/validator.test.js

@@ -0,0 +1,24 @@
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'jquery/validate',
+    'Magento_Payment/js/model/credit-card-validation/validator'
+], function ($) {
+    'use strict';
+
+    describe('Magento_Payment/js/model/credit-card-validation/validator', function () {
+
+        it('Check credit card expiration year validator.', function () {
+            var year = new Date().getFullYear();
+
+            expect($.validator.methods['validate-card-year']('1234')).toBeFalsy();
+            expect($.validator.methods['validate-card-year']('')).toBeFalsy();
+            expect($.validator.methods['validate-card-year']((year - 1).toString())).toBeFalsy();
+            expect($.validator.methods['validate-card-year']((year + 1).toString())).toBeTruthy();
+        });
+    });
+});