MAGETWO-67352: Terms & Conditions validation not working in case of two entries

Author: omiroshnichenko

app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js

@@ -20,13 +20,21 @@ define([
          * @returns {Boolean}
          */
         validate: function () {
+            var isValid = true;
+
             if (!agreementsConfig.isEnabled || $(agreementsInputPath).length === 0) {
                 return true;
             }
 
-            return $.validator.validateSingleElement(agreementsInputPath, {
-                errorElement: 'div'
+            $(agreementsInputPath).each(function (index, element) {
+                if (!$.validator.validateSingleElement(element, {
+                    errorElement: 'div'
+                })) {
+                    isValid = false;
+                }
             });
+
+            return isValid;
         }
     };
 });

dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/agreement-validator.test.js

@@ -0,0 +1,72 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define(['squire', 'jquery'], function (Squire, $) {
+    'use strict';
+
+    var injector = new Squire(),
+        agreementsBlockSelector = '.payment-method._active div.checkout-agreements',
+        agreementsBlock = $('<div class="payment-method _active"><div class="checkout-agreements"></div></div>'),
+        obj,
+
+        /**
+         * @param {Boolean} isChecked
+         * @return {Object}
+         */
+        getCheckboxMock = function (isChecked) {
+            return $('<input type="checkbox" class="required-entry" name="some"/>').prop('checked', isChecked);
+        };
+
+    beforeEach(function (done) {
+        window.checkoutConfig = {
+            checkoutAgreements: {
+                isEnabled: true
+            }
+        };
+
+        $('body').append(agreementsBlock);
+
+        injector.require(['Magento_CheckoutAgreements/js/model/agreement-validator'], function (Validator) {
+            obj = Validator;
+            done();
+        });
+    });
+
+    afterEach(function () {
+        $('.payment-method._active').remove();
+    });
+
+    describe('Magento_CheckoutAgreements/js/model/agreement-validator', function () {
+        describe('"validate" method', function () {
+            it('Check with non existing checkboxes', function () {
+                expect(obj.validate()).toBe(true);
+            });
+
+            it('Check with unchecked checkboxes', function () {
+                $(agreementsBlockSelector).html(getCheckboxMock(false));
+                expect(obj.validate()).toBe(false);
+            });
+
+            it('Check with checked checkboxes', function () {
+                $(agreementsBlockSelector).html(getCheckboxMock(true));
+                expect(obj.validate()).toBe(true);
+            });
+
+            it('Check with several checkboxes', function () {
+                $(agreementsBlockSelector).html(getCheckboxMock(true));
+                $(agreementsBlockSelector).append(getCheckboxMock(false));
+                expect(obj.validate()).toBe(false);
+
+                $(agreementsBlockSelector).html(getCheckboxMock(false));
+                $(agreementsBlockSelector).append(getCheckboxMock(false));
+                expect(obj.validate()).toBe(false);
+
+                $(agreementsBlockSelector).html(getCheckboxMock(true));
+                $(agreementsBlockSelector).append(getCheckboxMock(true));
+                expect(obj.validate()).toBe(true);
+            });
+        });
+    });
+});