text
-
- */
- var translateInlineVde = jQuery('[data-translate]').translateInlineVde();
- assertTrue(translateInlineVde.is(':mage-translateInlineVde'));
- translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testCreate = function() {
- /*:DOC += text
-
- */
- assertEquals(0, jQuery('[data-translate] > img').size());
- var translateInlineVde = jQuery('[data-translate]').translateInlineVde();
- assertEquals(1, jQuery('[data-translate] > img').size());
- translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testHideAndShow = function() {
- /*:DOC += text
-
- */
- var translateInlineVde = jQuery('[data-translate]').translateInlineVde(),
- iconImg = jQuery('[data-translate] > img');
- assertFalse(iconImg.is('.hidden'));
-
- translateInlineVde.translateInlineVde('hide');
- assertTrue(iconImg.is('.hidden') );
-
- translateInlineVde.translateInlineVde('show');
- assertFalse(iconImg.is('.hidden') );
- assertFalse(jQuery('[data-translate]').is(':hidden') );
-
- translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testReplaceTextNormal = function() {
- /*:DOC += text
-
- */
- var translateInlineVde = jQuery('[data-translate]').translateInlineVde();
- var newValue = 'New value';
-
- jQuery('[data-translate]').translateInlineVde('replaceText', 0, newValue);
-
- var translateData = jQuery('#translateElem').data('translate');
- assertEquals(newValue, translateData[0]['shown']);
- assertEquals(newValue, translateData[0]['translated']);
-
- translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testReplaceTextNullOrBlank = function() {
- /*:DOC += text
-
- */
- var translateInlineVde = jQuery('[data-translate]').translateInlineVde();
- var newValue = null;
-
- jQuery('[data-translate]').translateInlineVde('replaceText', 0, newValue);
-
- var translateData = jQuery('#translateElem').data('translate');
- assertEquals(' ', translateData[0]['shown']);
- assertEquals(' ', translateData[0]['translated']);
-
- newValue = 'Some value';
- jQuery('[data-translate]').translateInlineVde('replaceText', 0, newValue);
-
- translateData = jQuery('#translateElem').data('translate');
- assertEquals(newValue, translateData[0]['shown']);
- assertEquals(newValue, translateData[0]['translated']);
-
- newValue = '';
- jQuery('[data-translate]').translateInlineVde('replaceText', 0, newValue);
-
- translateData = jQuery('#translateElem').data('translate');
- assertEquals(' ', translateData[0]['shown']);
- assertEquals(' ', translateData[0]['translated']);
-
- translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testClick = function() {
- /*:DOC += text
-
- */
- var counter = 0;
- var callback = function() {
- counter++;
- };
- var translateInlineVde = jQuery('[data-translate]').translateInlineVde({
- onClick: callback
- }),
- iconImg = jQuery('[data-translate] > img');
-
- iconImg.trigger('click');
- assertEquals(1, counter);
- assertTrue(jQuery('#translateElem').hasClass('invisible'));
-
- translateInlineVde.translateInlineVde('destroy');
-};
-TranslateInlineVdeTest.prototype.testDblClick = function() {
- /*:DOC += text
-
- */
- var counter = 0;
- var callback = function() {
- counter++;
- };
- var translateInlineVde = jQuery('[data-translate]').translateInlineVde({
- onClick: callback
- }),
- iconImg = jQuery('[data-translate] > img');
-
- assertEquals(1, jQuery('#translateElem').find('img').size());
-
- translateInlineVde.trigger('dblclick');
- assertEquals(1, counter);
-
- assertEquals(0, jQuery('#translateElem').find('img').size());
- assertTrue(jQuery('#translateElem').hasClass('invisible'));
-
- translateInlineVde.translateInlineVde('destroy');
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/validation/index.html b/dev/tests/js/JsTestDriver/testsuite/mage/validation/index.html
deleted file mode 100644
index 00661de6d8153..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/validation/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js b/dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js
deleted file mode 100644
index 602ba4b8d3e60..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js
+++ /dev/null
@@ -1,611 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-test( "testValidateNoHtmlTags", function() {
- expect(4);
- equal($.validator.methods['validate-no-html-tags'].call(this, ""),true);
- equal($.validator.methods['validate-no-html-tags'].call(this, null),true);
- equal($.validator.methods['validate-no-html-tags'].call(this, "abc"),true);
- equal($.validator.methods['validate-no-html-tags'].call(this, "abc
"),false);
-
-});
-
-test( "testAllowContainerClassName", function() {
- expect(4);
- var radio = $('');
- radio.appendTo("#qunit-fixture");
- equal($.validator.methods['allow-container-className'].call(this, radio[0]),true);
- var checkbox = $('');
- equal($.validator.methods['allow-container-className'].call(this, checkbox[0]),true);
- var radio2 = $('');
- equal($.validator.methods['allow-container-className'].call(this, radio2[0]),false);
- var checkbox2 = $('');
- equal($.validator.methods['allow-container-className'].call(this, checkbox2[0]),false);
-});
-
-test( "testValidateSelect", function() {
- expect(5);
- equal($.validator.methods['validate-select'].call(this, ""),false);
- equal($.validator.methods['validate-select'].call(this, "none"),false);
- equal($.validator.methods['validate-select'].call(this, null),false);
- equal($.validator.methods['validate-select'].call(this, undefined),false);
- equal($.validator.methods['validate-select'].call(this, "abc"),true);
-});
-
-test( "testValidateNotEmpty", function() {
- expect(5);
- ok(!$.validator.methods['validate-no-empty'].call(this, ""));
- ok(!$.validator.methods['validate-no-empty'].call(this, null));
- ok(!$.validator.methods['validate-no-empty'].call(this, undefined));
- ok(!$.validator.methods['validate-no-empty'].call(this, " "));
- ok($.validator.methods['validate-no-empty'].call(this, "test"));
-});
-
-test( "testValidateStreet", function() {
- expect(9);
- equal($.validator.methods['validate-alphanum-with-spaces'].call(this, ""),true);
- equal($.validator.methods['validate-alphanum-with-spaces'].call(this, null),true);
- equal($.validator.methods['validate-alphanum-with-spaces'].call(this, undefined),true);
- equal($.validator.methods['validate-alphanum-with-spaces'].call(this, " "),true);
- equal($.validator.methods['validate-alphanum-with-spaces'].call(this, "abc "),true);
- equal($.validator.methods['validate-alphanum-with-spaces'].call(this, " 123 "),true);
- equal($.validator.methods['validate-alphanum-with-spaces'].call(this, " abc123 "),true);
- equal($.validator.methods['validate-alphanum-with-spaces'].call(this, " !@# "),false);
- equal($.validator.methods['validate-alphanum-with-spaces'].call(this, " abc.123 "),false);
-});
-
-test( "testValidatePhoneStrict", function() {
- expect(9);
- equal($.validator.methods['validate-phoneStrict'].call(this, ""),true);
- equal($.validator.methods['validate-phoneStrict'].call(this, null),true);
- equal($.validator.methods['validate-phoneStrict'].call(this, undefined),true);
- equal($.validator.methods['validate-phoneStrict'].call(this, " "),false);
- equal($.validator.methods['validate-phoneStrict'].call(this, "5121231234"),false);
- equal($.validator.methods['validate-phoneStrict'].call(this, "512.123.1234"),false);
- equal($.validator.methods['validate-phoneStrict'].call(this, "512-123-1234"),true);
- equal($.validator.methods['validate-phoneStrict'].call(this, "(512)123-1234"),true);
- equal($.validator.methods['validate-phoneStrict'].call(this, "(512) 123-1234"),true);
-});
-
-test( "testValidatePhoneLax", function() {
- expect(11);
- equal($.validator.methods['validate-phoneLax'].call(this, ""),true);
- equal($.validator.methods['validate-phoneLax'].call(this, null),true);
- equal($.validator.methods['validate-phoneLax'].call(this, undefined),true);
- equal($.validator.methods['validate-phoneLax'].call(this, " "),false);
- equal($.validator.methods['validate-phoneLax'].call(this, "5121231234"),true);
- equal($.validator.methods['validate-phoneLax'].call(this, "512.123.1234"),true);
- equal($.validator.methods['validate-phoneLax'].call(this, "512-123-1234"),true);
- equal($.validator.methods['validate-phoneLax'].call(this, "(512)123-1234"),true);
- equal($.validator.methods['validate-phoneLax'].call(this, "(512) 123-1234"),true);
- equal($.validator.methods['validate-phoneLax'].call(this, "(512)1231234"),true);
- equal($.validator.methods['validate-phoneLax'].call(this, "(512)_123_1234"),false);
-});
-
-test( "testValidateFax", function() {
- expect(9);
- equal($.validator.methods['validate-fax'].call(this, ""),true);
- equal($.validator.methods['validate-fax'].call(this, null),true);
- equal($.validator.methods['validate-fax'].call(this, undefined),true);
- equal($.validator.methods['validate-fax'].call(this, " "),false);
- equal($.validator.methods['validate-fax'].call(this, "5121231234"),false);
- equal($.validator.methods['validate-fax'].call(this, "512.123.1234"),false);
- equal($.validator.methods['validate-fax'].call(this, "512-123-1234"),true);
- equal($.validator.methods['validate-fax'].call(this, "(512)123-1234"),true);
- equal($.validator.methods['validate-fax'].call(this, "(512) 123-1234"),true);
-});
-
-test( "testValidateEmail", function() {
- expect(11);
- equal($.validator.methods['validate-email'].call(this, ""),true);
- equal($.validator.methods['validate-email'].call(this, null),true);
- equal($.validator.methods['validate-email'].call(this, undefined),true);
- equal($.validator.methods['validate-email'].call(this, " "),false);
- equal($.validator.methods['validate-email'].call(this, "123@123.com"),true);
- equal($.validator.methods['validate-email'].call(this, "abc@124.en"),true);
- equal($.validator.methods['validate-email'].call(this, "abc@abc.commmmm"),true);
- equal($.validator.methods['validate-email'].call(this, "abc.abc.abc@abc.commmmm"),true);
- equal($.validator.methods['validate-email'].call(this, "abc.abc-abc@abc.commmmm"),true);
- equal($.validator.methods['validate-email'].call(this, "abc.abc_abc@abc.commmmm"),true);
- equal($.validator.methods['validate-email'].call(this, "abc.abc_abc@abc"),false);
-});
-
-test( "testValidateEmailSender", function() {
- expect(10);
- equal($.validator.methods['validate-emailSender'].call(this, ""),true);
- equal($.validator.methods['validate-emailSender'].call(null),true);
- equal($.validator.methods['validate-emailSender'].call(undefined),true);
- equal($.validator.methods['validate-emailSender'].call(" "),true);
- equal($.validator.methods['validate-emailSender'].call("123@123.com"),true);
- equal($.validator.methods['validate-emailSender'].call("abc@124.en"),true);
- equal($.validator.methods['validate-emailSender'].call("abc@abc.commmmm"),true);
- equal($.validator.methods['validate-emailSender'].call("abc.abc.abc@abc.commmmm"),true);
- equal($.validator.methods['validate-emailSender'].call("abc.abc-abc@abc.commmmm"),true);
- equal($.validator.methods['validate-emailSender'].call("abc.abc_abc@abc.commmmm"),true);
-});
-
-test( "testValidatePassword", function() {
- expect(9);
- equal($.validator.methods['validate-password'].call(this, ""),true);
- equal($.validator.methods['validate-password'].call(this, null),false);
- equal($.validator.methods['validate-password'].call(this, undefined),false);
- equal($.validator.methods['validate-password'].call(this, " "),true);
- equal($.validator.methods['validate-password'].call(this, "123@123.com"),true);
- equal($.validator.methods['validate-password'].call(this, "abc"),false);
- equal($.validator.methods['validate-password'].call(this, "abc "),false);
- equal($.validator.methods['validate-password'].call(this, " abc "),false);
- equal($.validator.methods['validate-password'].call(this, "dddd"),false);
-});
-
-test( "testValidateAdminPassword", function() {
- expect(9);
- equal(true, $.validator.methods['validate-admin-password'].call(this, ""));
- equal(false, $.validator.methods['validate-admin-password'].call(this, null));
- equal(false, $.validator.methods['validate-admin-password'].call(this, undefined));
- equal(true, $.validator.methods['validate-admin-password'].call(this, " "));
- equal(true, $.validator.methods['validate-admin-password'].call(this, "123@123.com"));
- equal(false, $.validator.methods['validate-admin-password'].call(this, "abc"));
- equal(false, $.validator.methods['validate-admin-password'].call(this, "abc "));
- equal(false, $.validator.methods['validate-admin-password'].call(this, " abc "));
- equal(false, $.validator.methods['validate-admin-password'].call(this, "dddd"));
-});
-
-test( "testValidateUrl", function() {
- expect(8);
- equal(true, $.validator.methods['validate-url'].call(this, ""));
- equal(true, $.validator.methods['validate-url'].call(this, null));
- equal(true, $.validator.methods['validate-url'].call(this, undefined));
- equal(false, $.validator.methods['validate-url'].call(this, " "));
- equal(true, $.validator.methods['validate-url'].call(this, "http://www.google.com"));
- equal(true, $.validator.methods['validate-url'].call(this, "http://127.0.0.1:8080/index.php"));
- equal(true, $.validator.methods['validate-url'].call(this, "http://app-spot.com/index.php"));
- equal(true, $.validator.methods['validate-url'].call(this, "http://app-spot_space.com/index.php"));
-});
-
-test( "testValidateCleanUrl", function() {
- expect(8);
- equal(true, $.validator.methods['validate-clean-url'].call(this, ""));
- equal(true, $.validator.methods['validate-clean-url'].call(this, null));
- equal(true, $.validator.methods['validate-clean-url'].call(this, undefined));
- equal(false, $.validator.methods['validate-clean-url'].call(this, " "));
- equal(true, $.validator.methods['validate-clean-url'].call(this, "http://www.google.com"));
- equal(false, $.validator.methods['validate-clean-url'].call(this, "http://127.0.0.1:8080/index.php"));
- equal(false, $.validator.methods['validate-clean-url'].call(this, "http://127.0.0.1:8080"));
- equal(false, $.validator.methods['validate-clean-url'].call(this, "http://127.0.0.1"));
-});
-
-test( "testValidateXmlIdentifier", function() {
- expect(8);
- equal(true, $.validator.methods['validate-xml-identifier'].call(this, ""));
- equal(true, $.validator.methods['validate-xml-identifier'].call(this, null));
- equal(true, $.validator.methods['validate-xml-identifier'].call(this, undefined));
- equal(false, $.validator.methods['validate-xml-identifier'].call(this, " "));
- equal(true, $.validator.methods['validate-xml-identifier'].call(this, "abc"));
- equal(true, $.validator.methods['validate-xml-identifier'].call(this, "abc_123"));
- equal(true, $.validator.methods['validate-xml-identifier'].call(this, "abc-123"));
- equal(false, $.validator.methods['validate-xml-identifier'].call(this, "123-abc"));
-});
-
-test( "testValidateSsn", function() {
- expect(8);
- equal(true, $.validator.methods['validate-ssn'].call(this, ""));
- equal(true, $.validator.methods['validate-ssn'].call(this, null));
- equal(true, $.validator.methods['validate-ssn'].call(this, undefined));
- equal(false, $.validator.methods['validate-ssn'].call(this, " "));
- equal(false, $.validator.methods['validate-ssn'].call(this, "abc"));
- equal(true, $.validator.methods['validate-ssn'].call(this, "123-13-1234"));
- equal(true, $.validator.methods['validate-ssn'].call(this, "012-12-1234"));
- equal(false, $.validator.methods['validate-ssn'].call(this, "23-12-1234"));
-});
-
-test( "testValidateZip", function() {
- expect(8);
- equal(true, $.validator.methods['validate-zip-us'].call(this, ""));
- equal(true, $.validator.methods['validate-zip-us'].call(this, null));
- equal(true, $.validator.methods['validate-zip-us'].call(this, undefined));
- equal(false, $.validator.methods['validate-zip-us'].call(this, " "));
- equal(true, $.validator.methods['validate-zip-us'].call(this, "12345-1234"));
- equal(true, $.validator.methods['validate-zip-us'].call(this, "02345"));
- equal(false, $.validator.methods['validate-zip-us'].call(this, "1234"));
- equal(false, $.validator.methods['validate-zip-us'].call(this, "1234-1234"));
-});
-
-test( "testValidateDateAu", function() {
- expect(8);
- equal(true, $.validator.methods['validate-date-au'].call(this, ""));
- equal(true, $.validator.methods['validate-date-au'].call(this, null));
- equal(true, $.validator.methods['validate-date-au'].call(this, undefined));
- equal(false, $.validator.methods['validate-date-au'].call(this, " "));
- equal(true, $.validator.methods['validate-date-au'].call(this, "01/01/2012"));
- equal(true, $.validator.methods['validate-date-au'].call(this, "30/01/2012"));
- equal(false, $.validator.methods['validate-date-au'].call(this, "01/30/2012"));
- equal(false, $.validator.methods['validate-date-au'].call(this, "1/1/2012"));
-});
-
-test( "testValidateCurrencyDollar", function() {
- expect(8);
- equal(true, $.validator.methods['validate-currency-dollar'].call(this, ""));
- equal(true, $.validator.methods['validate-currency-dollar'].call(this, null));
- equal(true, $.validator.methods['validate-currency-dollar'].call(this, undefined));
- equal(false, $.validator.methods['validate-currency-dollar'].call(this, " "));
- equal(true, $.validator.methods['validate-currency-dollar'].call(this, "$123"));
- equal(true, $.validator.methods['validate-currency-dollar'].call(this, "$1,123.00"));
- equal(true, $.validator.methods['validate-currency-dollar'].call(this, "$1234"));
- equal(false, $.validator.methods['validate-currency-dollar'].call(this, "$1234.1234"));
-});
-
-test( "testValidateNotNegativeNumber", function() {
- expect(11);
- equal(true, $.validator.methods['validate-not-negative-number'].call(this, ""));
- equal(true, $.validator.methods['validate-not-negative-number'].call(this, null));
- equal(true, $.validator.methods['validate-not-negative-number'].call(this, undefined));
- equal(false, $.validator.methods['validate-not-negative-number'].call(this, " "));
- equal(true, $.validator.methods['validate-not-negative-number'].call(this, "0"));
- equal(true, $.validator.methods['validate-not-negative-number'].call(this, "1"));
- equal(true, $.validator.methods['validate-not-negative-number'].call(this, "1234"));
- equal(true, $.validator.methods['validate-not-negative-number'].call(this, "1,234.1234"));
- equal(false, $.validator.methods['validate-not-negative-number'].call(this, "-1"));
- equal(false, $.validator.methods['validate-not-negative-number'].call(this, "-1e"));
- equal(false, $.validator.methods['validate-not-negative-number'].call(this, "-1,234.1234"));
-});
-
-test( "testValidateGreaterThanZero", function() {
- expect(11);
- equal(true, $.validator.methods['validate-greater-than-zero'].call(this, ""));
- equal(true, $.validator.methods['validate-greater-than-zero'].call(this, null));
- equal(true, $.validator.methods['validate-greater-than-zero'].call(this, undefined));
- equal(false, $.validator.methods['validate-greater-than-zero'].call(this, " "));
- equal(false, $.validator.methods['validate-greater-than-zero'].call(this, "0"));
- equal(true, $.validator.methods['validate-greater-than-zero'].call(this, "1"));
- equal(true, $.validator.methods['validate-greater-than-zero'].call(this, "1234"));
- equal(true, $.validator.methods['validate-greater-than-zero'].call(this, "1,234.1234"));
- equal(false, $.validator.methods['validate-greater-than-zero'].call(this, "-1"));
- equal(false, $.validator.methods['validate-greater-than-zero'].call(this, "-1e"));
- equal(false, $.validator.methods['validate-greater-than-zero'].call(this, "-1,234.1234"));
-});
-
-test( "testValidateCssLength", function() {
- expect(11);
- equal(true, $.validator.methods['validate-css-length'].call(this, ""));
- equal(true, $.validator.methods['validate-css-length'].call(this, null));
- equal(true, $.validator.methods['validate-css-length'].call(this, undefined));
- equal(false, $.validator.methods['validate-css-length'].call(this, " "));
- equal(false, $.validator.methods['validate-css-length'].call(this, "0"));
- equal(true, $.validator.methods['validate-css-length'].call(this, "1"));
- equal(true, $.validator.methods['validate-css-length'].call(this, "1234"));
- equal(true, $.validator.methods['validate-css-length'].call(this, "1,234.1234"));
- equal(false, $.validator.methods['validate-css-length'].call(this, "-1"));
- equal(false, $.validator.methods['validate-css-length'].call(this, "-1e"));
- equal(false, $.validator.methods['validate-css-length'].call(this, "-1,234.1234"));
-});
-
-test( "testValidateData", function() {
- expect(9);
- equal(true, $.validator.methods['validate-data'].call(this, ""));
- equal(true, $.validator.methods['validate-data'].call(this, null));
- equal(true, $.validator.methods['validate-data'].call(this, undefined));
- equal(false, $.validator.methods['validate-data'].call(this, " "));
- equal(false, $.validator.methods['validate-data'].call(this, "123abc"));
- equal(true, $.validator.methods['validate-data'].call(this, "abc"));
- equal(false, $.validator.methods['validate-data'].call(this, " abc"));
- equal(true, $.validator.methods['validate-data'].call(this, "abc123"));
- equal(false, $.validator.methods['validate-data'].call(this, "abc-123"));
-});
-
-
-test( "testValidateOneRequiredByName", function() {
- expect(4);
- var radio = $('');
- radio.appendTo("#qunit-fixture");
- ok(!$.validator.methods['validate-one-required-by-name'].call(this,
- null, radio[0]));
- var radio2 = $('');
- radio2.appendTo("#qunit-fixture");
- ok($.validator.methods['validate-one-required-by-name'].call(this,
- null, radio2[0]));
-
- var checkbox = $('');
- checkbox.appendTo("#qunit-fixture");
- ok(!$.validator.methods['validate-one-required-by-name'].call(this,
- null, checkbox[0]));
- var checkbox2 = $('');
- checkbox2.appendTo("#qunit-fixture");
- ok($.validator.methods['validate-one-required-by-name'].call(this,
- null, checkbox2[0]));
-});
-
-test( "testLessThanEqualsTo", function() {
- expect(5);
- var elm1 = $('');
- var elm2 = $('');
- ok(!$.validator.methods['less-than-equals-to'].call(this, elm1[0].value,
- elm1, elm2));
- elm1[0].value = 4;
- ok($.validator.methods['less-than-equals-to'].call(this, elm1[0].value,
- elm1, elm2));
-
- var elm3 = $('');
- var elm4= $('');
- ok($.validator.methods['less-than-equals-to'].call(this, elm3[0].value,
- elm3, elm4));
-
- var elm5 = $('');
- var elm6= $('');
- ok($.validator.methods['less-than-equals-to'].call(this, elm5[0].value,
- elm5, elm6));
-
- var elm7 = $('');
- var elm8= $('');
- ok($.validator.methods['less-than-equals-to'].call(this, elm7[0].value,
- elm7, elm8));
-});
-
-test( "testGreaterThanEqualsTo", function() {
- expect(5);
-
- var elm1 = $('');
- var elm2 = $('');
- ok(!$.validator.methods['greater-than-equals-to'].call(this, elm1[0].value,
- elm1, elm2));
- elm1[0].value = 9;
- ok($.validator.methods['greater-than-equals-to'].call(this, elm1[0].value,
- elm1, elm2));
-
- var elm3 = $('');
- var elm4= $('');
- ok($.validator.methods['greater-than-equals-to'].call(this, elm3[0].value,
- elm3, elm4));
-
- var elm5 = $('');
- var elm6= $('');
- ok($.validator.methods['greater-than-equals-to'].call(this, elm5[0].value,
- elm5, elm6));
-
- var elm7 = $('');
- var elm8= $('');
- ok($.validator.methods['greater-than-equals-to'].call(this, elm7[0].value,
- elm7, elm8));
-});
-
-test( "testValidateGroupedQty", function() {
- expect(5);
- var div1 = $('');
- $('').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
- .appendTo(div1);
- $('').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
- .appendTo(div1);
- $('').appendTo(div1);
-
- ok(!$.validator.methods['validate-grouped-qty'].call(this, null, null, div1[0]));
-
- var div2 = $('');
- $('').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
- .appendTo(div2);
- $('').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
- .appendTo(div2);
- $('').appendTo(div2);
- ok(!$.validator.methods['validate-grouped-qty'].call(this, null, null, div2[0]));
-
- var div3 = $('');
- $('').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
- .appendTo(div3);
- $('').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
- .appendTo(div3);
- $('').appendTo(div3);
- ok(!$.validator.methods['validate-grouped-qty'].call(this, null, null, div3[0]));
-
- var div4 = $('');
- $('').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
- .appendTo(div4);
- $('').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
- .appendTo(div4);
- $('').appendTo(div4);
- ok($.validator.methods['validate-grouped-qty'].call(this, null, null, div4[0]));
-
- var div5 = $('');
- $('').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
- .appendTo(div5);
- $('').attr("data-validate","{'validate-grouped-qty':'#super-product-table'}")
- .appendTo(div5);
- $('').appendTo(div5);
- ok($.validator.methods['validate-grouped-qty'].call(this, null, null, div5[0]));
-
-});
-
-test( "testValidateCCTypeSelect", function() {
- expect(14);
- var visaValid = $('');
- var visaInvalid = $('');
- var mcValid = $('');
- var mcInvalid = $('');
- var aeValid = $('');
- var aeInvalid = $('');
-
- var diValid = $('');
- var diInvalid = $('');
- var dnValid = $('');
- var dnInvalid = $('');
- var jcbValid = $('');
- var jcbInvalid = $('');
- var upValid = $('');
- var upInvalid = $('');
-
- ok($.validator.methods['validate-cc-type-select'].call(this, 'VI', null, visaValid));
- ok(!$.validator.methods['validate-cc-type-select'].call(this, 'VI', null, visaInvalid));
- ok($.validator.methods['validate-cc-type-select'].call(this, 'MC', null, mcValid));
- ok(!$.validator.methods['validate-cc-type-select'].call(this, 'MC', null, mcInvalid));
- ok($.validator.methods['validate-cc-type-select'].call(this, 'AE', null, aeValid));
- ok(!$.validator.methods['validate-cc-type-select'].call(this, 'AE', null, aeInvalid));
- ok($.validator.methods['validate-cc-type-select'].call(this, 'DI', null, diValid));
- ok(!$.validator.methods['validate-cc-type-select'].call(this, 'DI', null, diInvalid));
- ok($.validator.methods['validate-cc-type-select'].call(this, 'DN', null, dnValid));
- ok(!$.validator.methods['validate-cc-type-select'].call(this, 'DN', null, dnInvalid));
- ok($.validator.methods['validate-cc-type-select'].call(this, 'JCB', null, jcbValid));
- ok(!$.validator.methods['validate-cc-type-select'].call(this, 'JCB', null, jcbInvalid));
- ok($.validator.methods['validate-cc-type-select'].call(this, 'UP', null, upValid));
- ok(!$.validator.methods['validate-cc-type-select'].call(this, 'UP', null, upInvalid));
-});
-
-test( "testValidateCCNumber", function() {
- expect(37);
- ok($.validator.methods['validate-cc-number'].call(this, '4916835098995909', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '5265071363284878', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '6011120623356953', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '371293266574617', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '4916835098995901', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '5265071363284870', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '6011120623356951', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '371293266574619', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '2221220000000003', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '2721220000000008', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '601109020000000003', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '6011111144444444', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '6011222233334444', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '6011522233334447', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '601174455555553', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '6011745555555550', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '601177455555556', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '601182455555556', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '601187999555558', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '601287999555556', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '6444444444444443', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '6644444444444441', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '3044444444444444', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '3064444444444449', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '3095444444444442', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '3096444444444441', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '3696444444444445', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '3796444444444444', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '3896444444444443', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '3528444444444449', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '3529444444444448', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '6221262244444440', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '6229981111111111', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '6249981111111117', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '6279981111111110', null, null));
- ok($.validator.methods['validate-cc-number'].call(this, '6282981111111115', null, null));
- ok(!$.validator.methods['validate-cc-number'].call(this, '6289981111111118', null, null));
-});
-
-test( "testValidateCCType", function() {
- expect(14);
- var select = $('');
-
- select.val('VI');
- ok($.validator.methods['validate-cc-type'].call(this, '4916835098995909', null, select));
- ok(!$.validator.methods['validate-cc-type'].call(this, '5265071363284878', null, select));
- select.val('MC');
- ok($.validator.methods['validate-cc-type'].call(this, '5265071363284878', null, select));
- ok(!$.validator.methods['validate-cc-type'].call(this, '4916835098995909', null, select));
- select.val('AE');
- ok($.validator.methods['validate-cc-type'].call(this, '371293266574617', null, select));
- ok(!$.validator.methods['validate-cc-type'].call(this, '5265071363284878', null, select));
- select.val('DI');
- ok($.validator.methods['validate-cc-type'].call(this, '6011050000000009', null, select));
- ok(!$.validator.methods['validate-cc-type'].call(this, '371293266574617', null, select));
- select.val('DN');
- ok($.validator.methods['validate-cc-type'].call(this, '3095434000000001', null, select));
- ok(!$.validator.methods['validate-cc-type'].call(this, '6011050000000009', null, select));
- select.val('JCB');
- ok($.validator.methods['validate-cc-type'].call(this, '3528000000000007', null, select));
- ok(!$.validator.methods['validate-cc-type'].call(this, '3095434000000001', null, select));
- select.val('UP');
- ok($.validator.methods['validate-cc-type'].call(this, '6221260000000000', null, select));
- ok(!$.validator.methods['validate-cc-type'].call(this, '3528000000000007', null, select));
-});
-
-test( "testValidateCCExp", function() {
- expect(3);
- var year = $(''),
- currentTime = new Date(),
- currentMonth = currentTime.getMonth() + 1,
- currentYear = currentTime.getFullYear();
- year.val(currentYear);
- if (currentMonth > 1) {
- ok(!$.validator.methods['validate-cc-exp'].call(this, currentMonth - 1, null, year));
- }
- ok($.validator.methods['validate-cc-exp'].call(this, currentMonth, null, year));
- year.val(currentYear + 1);
- ok($.validator.methods['validate-cc-exp'].call(this, currentMonth, null, year));
-
-});
-
-test( "testValidateCCCvn", function() {
- expect(8);
- var ccType = $('');
-
- ccType.val('VI');
- ok($.validator.methods['validate-cc-cvn'].call(this, '123', null, ccType));
- ok(!$.validator.methods['validate-cc-cvn'].call(this, '1234', null, ccType));
- ccType.val('MC');
- ok($.validator.methods['validate-cc-cvn'].call(this, '123', null, ccType));
- ok(!$.validator.methods['validate-cc-cvn'].call(this, '1234', null, ccType));
- ccType.val('AE');
- ok($.validator.methods['validate-cc-cvn'].call(this, '1234', null, ccType));
- ok(!$.validator.methods['validate-cc-cvn'].call(this, '123', null, ccType));
- ccType.val('DI');
- ok($.validator.methods['validate-cc-cvn'].call(this, '123', null, ccType));
- ok(!$.validator.methods['validate-cc-cvn'].call(this, '1234', null, ccType));
-});
-
-test( "testValidateNumberRange", function() {
- expect(14);
- ok($.validator.methods['validate-number-range'].call(this, '-1', null, null));
- ok($.validator.methods['validate-number-range'].call(this, '1', null, null));
- ok($.validator.methods['validate-number-range'].call(this, '', null, null));
- ok($.validator.methods['validate-number-range'].call(this, null, null, null));
- ok($.validator.methods['validate-number-range'].call(this, '0', null, null));
- ok(!$.validator.methods['validate-number-range'].call(this, 'asds', null, null));
-
- ok($.validator.methods['validate-number-range'].call(this, '10', null, '10-20.06'));
- ok($.validator.methods['validate-number-range'].call(this, '15', null, '10-20.06'));
- ok(!$.validator.methods['validate-number-range'].call(this, '1', null, '10-20.06'));
- ok(!$.validator.methods['validate-number-range'].call(this, '30', null, '10-20.06'));
-
- var el1 = $('').get(0);
- ok($.validator.methods['validate-number-range'].call(this, '10', el1, null));
- ok($.validator.methods['validate-number-range'].call(this, '15', el1, null));
- ok(!$.validator.methods['validate-number-range'].call(this, '1', el1, null));
- ok($.validator.methods['validate-number-range'].call(this, '30', el1, null));
-});
-
-
-
-test( "testValidateDigitsRange", function() {
- expect(15);
- ok($.validator.methods['validate-digits-range'].call(this, '-1', null, null));
- ok($.validator.methods['validate-digits-range'].call(this, '1', null, null));
- ok($.validator.methods['validate-digits-range'].call(this, '', null, null));
- ok($.validator.methods['validate-digits-range'].call(this, null, null, null));
- ok($.validator.methods['validate-digits-range'].call(this, '0', null, null));
- ok(!$.validator.methods['validate-digits-range'].call(this, 'asds', null, null));
-
- ok($.validator.methods['validate-digits-range'].call(this, '10', null, '10-20'));
- ok($.validator.methods['validate-digits-range'].call(this, '15', null, '10-20'));
- ok(!$.validator.methods['validate-digits-range'].call(this, '1', null, '10-20'));
- ok(!$.validator.methods['validate-digits-range'].call(this, '30', null, '10-20'));
- ok($.validator.methods['validate-digits-range'].call(this, '30', null, '10-20.06'));
-
- var el1 = $('').get(0);
- ok($.validator.methods['validate-digits-range'].call(this, '10', el1, null));
- ok($.validator.methods['validate-digits-range'].call(this, '15', el1, null));
- ok(!$.validator.methods['validate-digits-range'].call(this, '1', el1, null));
- ok(!$.validator.methods['validate-digits-range'].call(this, '30', el1, null));
-});
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/webapi-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/webapi-test.js
deleted file mode 100644
index b03b3bc3d889a..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/webapi-test.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-WebapiTest = TestCase('WebapiTest');
-
-WebapiTest.prototype.testConstructorSuccess = function() {
- var successCallback = function(){};
- new $.mage.Webapi('baseUrl', {'timeout': 100, 'success': successCallback});
-};
-
-WebapiTest.prototype.testConstructorSuccessEmptyArgs = function() {
- new $.mage.Webapi('baseUrl');
-};
-
-WebapiTest.prototype.testConstructorInvalidBaseUrl = function() {
- expectAsserts(1);
- try {
- var invalidBaseUrl = 1;
- new $.mage.Webapi(invalidBaseUrl);
- } catch (e) {
- var expectedException = "String baseUrl parameter required";
- assertEquals("Invalid exception was thrown.", expectedException, e);
- }
-};
-
-WebapiTest.prototype.testCallInvalidMethod = function() {
- var Webapi = new $.mage.Webapi('baseUrl');
- expectAsserts(1);
- try {
- Webapi.call('resourceUri', 'INVALID_HTTP_METHOD');
- } catch (e) {
- var expectedException = "Method name is not valid: INVALID_HTTP_METHOD";
- assertEquals("Invalid exception was thrown.", expectedException, e);
- }
-};
-
-WebapiTest.prototype.testCallSuccessCallback = function() {
- // ensure that custom successCallback was executed
- expectAsserts(1);
- var successCallback = function(response) {
- assertObject("Response is expected to be an object", response);
- };
- var Webapi = new $.mage.Webapi('baseUrl', {'success': successCallback});
- $.ajax = function(settings) {
- settings.success({});
- };
- Webapi.call('products', 'GET');
-};
-
-WebapiTest.prototype.testCallErrorCallback = function() {
- // ensure that custom successCallback was executed
- expectAsserts(1);
- var errorCallback = function(response) {
- assertObject("Response is expected to be an object", response);
- };
- var Webapi = new $.mage.Webapi('baseUrl', {'error': errorCallback});
- $.ajax = function(settings) {
- settings.error({});
- };
- Webapi.call('products', 'GET');
-};
-
-WebapiTest.prototype.testCallProductGet = function() {
- var baseUri = 'baseUrl';
- var Webapi = new $.mage.Webapi(baseUri);
- var httpMethod = Webapi.method.get;
- var idObj = {id: 1};
- var productResourceUri = '/products/';
- var resourceVersion = 'v1';
- var expectedUri = baseUri + '/webapi/rest/' + resourceVersion + productResourceUri + '1';
- // ensure that $.ajax() was executed
- expectAsserts(3);
- $.ajax = function(settings) {
- assertEquals("URI for API call does not match with expected one.", expectedUri, settings.url);
- assertEquals("HTTP method for API call does not match with expected one.", httpMethod, settings.type);
- assertEquals("Data for API call does not match with expected one.", '1', settings.data);
- };
- Webapi.Product(resourceVersion).get(idObj);
-};
-
-WebapiTest.prototype.testCallProductCreate = function() {
- var baseUri = 'baseUrl';
- var Webapi = new $.mage.Webapi(baseUri);
- var httpMethod = Webapi.method.create;
- var productResourceUri = '/products/';
- var resourceVersion = 'v1';
- var expectedUri = baseUri + '/webapi/rest/' + resourceVersion + productResourceUri;
- productData = {
- "type_id": "simple",
- "attribute_set_id": 4,
- "sku": "1234567890",
- "weight": 1,
- "status": 1,
- "visibility": 4,
- "name": "Simple Product",
- "description": "Simple Description",
- "price": 99.95,
- "tax_class_id": 0
- };
- // ensure that $.ajax() was executed
- expectAsserts(3);
- $.ajax = function(settings) {
- assertEquals("URI for API call does not match with expected one.", expectedUri, settings.url);
- assertEquals("HTTP method for API call does not match with expected one.", httpMethod, settings.type);
- assertEquals("Data for API call does not match with expected one.", productData, settings.data);
- };
- Webapi.Product(resourceVersion).create(productData);
-};
-
-WebapiTest.prototype.testCallProductCreateInvalidVersion = function() {
- expectAsserts(1);
- var invalidVersion = 'invalidVersion';
- try {
- var Webapi = new $.mage.Webapi('BaseUrl');
- Webapi.Product(invalidVersion);
- } catch (e) {
- var expectedException = "Incorrect version format: " + invalidVersion;
- assertEquals("Invalid exception was thrown.", expectedException, e);
- }
-};
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/zoom/zoom-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/zoom/zoom-test.js
deleted file mode 100644
index a9dc0fd239a28..0000000000000
--- a/dev/tests/js/JsTestDriver/testsuite/mage/zoom/zoom-test.js
+++ /dev/null
@@ -1,337 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-ZoomTest = TestCase('ZoomTest');
-ZoomTest.prototype.setUp = function() {
- /*:DOC +=
-
-
-
-
-
-
- ![]()
-
- */
- this.zoomElement = jQuery('[data-role=zoom-test]');
-};
-ZoomTest.prototype.tearDown = function() {
- this.zoomDestroy();
-};
-ZoomTest.prototype.zoomDestroy = function() {
- if(this.zoomElement.data('zoom')) {
- this.zoomElement.zoom('destroy');
- }
-};
-ZoomTest.prototype.zoomCreate = function(options, element) {
- return (element || this.zoomElement).zoom(options || {} ).data('zoom');
-};
-ZoomTest.prototype.testInit = function() {
- this.zoomElement.zoom();
- assertTrue(this.zoomElement.is(':mage-zoom'));
-};
-ZoomTest.prototype.testCreate = function() {
- var zoomInstance = this.zoomCreate(),
- _setZoomData = jsunit.stub(zoomInstance, '_setZoomData'),
- _render = jsunit.stub(zoomInstance, '_render'),
- _bind = jsunit.stub(zoomInstance, '_bind'),
- _hide = jsunit.stub(zoomInstance, '_hide'),
- _largeImageLoaded = jsunit.stub(zoomInstance, '_largeImageLoaded');
-
- zoomInstance.largeImage = [{
- complete: false
- }];
-
- zoomInstance._create();
- assertTrue(_setZoomData.callCount === 1);
- assertTrue(_render.callCount === 1);
- assertTrue(_bind.callCount === 1);
- assertNull(_largeImageLoaded.callCount);
- assertTrue(_hide.callCount === 2);
- _setZoomData.reset();
- _render.reset();
- _bind.reset();
- _hide.reset();
-
- zoomInstance.largeImage[0].complete = true;
- zoomInstance._create();
- assertTrue(_setZoomData.callCount === 1);
- assertTrue(_render.callCount === 1);
- assertTrue(_bind.callCount === 1);
- assertTrue(_largeImageLoaded.callCount === 1);
- assertTrue(_hide.callCount === 2);
-};
-ZoomTest.prototype.testRender = function() {
- var zoomInstance = this.zoomCreate(),
- _renderControl = jsunit.stub(zoomInstance, '_renderControl'),
- _renderLargeImage = jsunit.stub(zoomInstance, '_renderLargeImage');
- _renderControl.returnCallback = function(control) {
- return jQuery('', {'data-control': control});
- };
-
- zoomInstance._render();
- assertTrue(_renderControl.callCount === 4);
- assertTrue(zoomInstance.element.find('[data-control=track]').length > 0);
- assertTrue(zoomInstance.element.find('[data-control=lens]').length > 0);
- assertTrue(zoomInstance.element.find('[data-control=display]').length > 0);
- assertTrue(zoomInstance.element.find('[data-control=notice]').length > 0);
- assertTrue(_renderLargeImage.callCount === 1);
-};
-ZoomTest.prototype.testToggleNotice = function() {
- var zoomInstance = this.zoomCreate(),
- getZoomRatio = jsunit.stub(zoomInstance, 'getZoomRatio');
-
- zoomInstance.noticeOriginal = 'notice original';
- zoomInstance.options.controls.notice = {
- text: 'test text'
- };
-
- zoomInstance.notice.text('');
- zoomInstance.largeImageSrc = 'image.large.jpg';
- zoomInstance.activated = false;
- getZoomRatio.returnValue = 2;
- zoomInstance._toggleNotice();
- assertEquals(zoomInstance.notice.text(), zoomInstance.options.controls.notice.text);
- assertTrue(getZoomRatio.callCount === 1);
-
- zoomInstance.notice.text('');
- zoomInstance.largeImageSrc = null;
- zoomInstance.activated = false;
- getZoomRatio.returnValue = 2;
- zoomInstance._toggleNotice();
- assertEquals(zoomInstance.notice.text(), zoomInstance.noticeOriginal);
-
- zoomInstance.notice.text('');
- zoomInstance.largeImageSrc = 'image.large.jpg';
- zoomInstance.activated = true;
- getZoomRatio.returnValue = 2;
- zoomInstance._toggleNotice();
- assertEquals(zoomInstance.notice.text(), zoomInstance.noticeOriginal);
-
- zoomInstance.notice.text('');
- zoomInstance.largeImageSrc = 'image.large.jpg';
- zoomInstance.activated = false;
- getZoomRatio.returnValue = 0;
- zoomInstance._toggleNotice();
- assertEquals(zoomInstance.notice.text(), zoomInstance.noticeOriginal);
-};
-
-ZoomTest.prototype.testRefresh = function() {
- var zoomInstance = this.zoomCreate(),
- _refreshControl = jsunit.stub(zoomInstance, '_refreshControl');
-
- zoomInstance._refresh();
- assertTrue(_refreshControl.callCount === 3);
- assertTrue(_refreshControl.callArgsStack[0][0] === 'display');
- assertTrue(_refreshControl.callArgsStack[1][0] === 'track');
- assertTrue(_refreshControl.callArgsStack[2][0] === 'lens');
-};
-
-ZoomTest.prototype.testBind = function() {
- var zoomInstance = this.zoomCreate(),
- _on = jsunit.stub(zoomInstance, '_on'),
- events = {};
-
- zoomInstance.largeImage = jQuery('');
- zoomInstance._bind();
- assertTrue(_on.callCount > 0);
- assertTrue(
- _on.callArgsStack[0][0][
- zoomInstance.options.startZoomEvent +
- ' ' +
- zoomInstance.options.selectors.image
- ] === 'show'
- );
- assertTrue(
- jQuery.type(_on.callArgsStack[0][0][
- zoomInstance.options.stopZoomEvent +
- ' ' +
- zoomInstance.options.selectors.track
- ]) === 'function'
- );
- assertTrue(_on.callArgsStack[0][0]['mousemove ' + zoomInstance.options.selectors.track] === '_move');
- assertTrue(_on.callArgsStack[0][0].imageupdated === '_onImageUpdated');
- assertTrue(_on.callArgsStack[1][0].is(zoomInstance.largeImage));
- assertTrue(_on.callArgsStack[1][1].load === '_largeImageLoaded');
-};
-ZoomTest.prototype.testEnable = function() {
- var zoomInstance = this.zoomCreate(),
- _onImageUpdated = jsunit.stub(zoomInstance, '_onImageUpdated');
-
- zoomInstance.enable();
- assertTrue(_onImageUpdated.callCount === 1);
-};
-ZoomTest.prototype.testDisable = function() {
- var zoomInstance = this.zoomCreate();
-
- zoomInstance.noticeOriginal = 'original notice';
- zoomInstance.notice.text('');
- zoomInstance.disable();
- assertEquals(zoomInstance.noticeOriginal, zoomInstance.notice.text());
-};
-ZoomTest.prototype.testShow = function() {
- var zoomInstance = this.zoomCreate(),
- e = {
- preventDefault: jsunit.stub(),
- stopImmediatePropagation: jsunit.stub()
- },
- getZoomRatio = jsunit.stub(zoomInstance, 'getZoomRatio'),
- _show = jsunit.stub(zoomInstance, '_show'),
- _refresh = jsunit.stub(zoomInstance, '_refresh'),
- _toggleNotice = jsunit.stub(zoomInstance, '_toggleNotice'),
- _trigger = jsunit.stub(zoomInstance, '_trigger');
-
- getZoomRatio.returnValue = 0;
- zoomInstance.show(e);
- assertTrue(e.preventDefault.callCount === 1);
-
- e.preventDefault.reset();
- getZoomRatio.reset();
- getZoomRatio.returnValue = 2;
- zoomInstance.largeImageSrc = 'image.large.jpg';
- zoomInstance.show(e);
- assertTrue(e.preventDefault.callCount === 1);
- assertTrue(e.stopImmediatePropagation.callCount === 1);
- assertTrue(zoomInstance.activated);
- assertTrue(_show.callCount > 0);
- assertTrue(_refresh.callCount === 1);
- assertTrue(_toggleNotice.callCount === 1);
- assertTrue(_trigger.callCount === 1);
- assertTrue(_trigger.lastCallArgs[0] === 'show');
-};
-ZoomTest.prototype.testHide = function() {
- var zoomInstance = this.zoomCreate(),
- _hide = jsunit.stub(zoomInstance, '_hide'),
- _toggleNotice = jsunit.stub(zoomInstance, '_toggleNotice'),
- _trigger = jsunit.stub(zoomInstance, '_trigger');
-
- zoomInstance.hide();
- assertTrue(_hide.callCount > 0);
- assertTrue(_toggleNotice.callCount === 1);
- assertTrue(_trigger.callCount === 1);
- assertTrue(_trigger.lastCallArgs[0] === 'hide');
-};
-ZoomTest.prototype.testOnImageUpdated = function() {
- var zoomInstance = this.zoomCreate(),
- _setZoomData = jsunit.stub(zoomInstance, '_setZoomData'),
- _refreshLargeImage = jsunit.stub(zoomInstance, '_refreshLargeImage'),
- _refresh = jsunit.stub(zoomInstance, '_refresh'),
- hide = jsunit.stub(zoomInstance, 'hide'),
- testImage = jQuery('');
-
- zoomInstance.options.selectors.image = "[data-role=test-image]";
- zoomInstance.element.append(testImage);
- zoomInstance.image = testImage;
- zoomInstance._onImageUpdated();
- assertNull(_setZoomData.callCount);
- assertNull(_refreshLargeImage.callCount);
- assertNull(_refresh.callCount);
- assertNull(hide.callCount);
-
- zoomInstance.image = jQuery('');
- zoomInstance.largeImageSrc = null;
- zoomInstance._onImageUpdated();
- assertTrue(_setZoomData.callCount === 1);
- assertNull(_refreshLargeImage.callCount);
- assertNull(_refresh.callCount);
- assertTrue(hide.callCount === 1);
-
- _setZoomData.reset();
- hide.reset();
- zoomInstance.largeImageSrc = 'image.large.jpg';
- zoomInstance._onImageUpdated();
- assertTrue(_setZoomData.callCount === 1);
- assertTrue(_refreshLargeImage.callCount === 1);
- assertTrue(_refresh.callCount === 1);
- assertNull(hide.callCount);
-};
-ZoomTest.prototype.testLargeImageLoaded = function() {
- var zoomInstance = this.zoomCreate(),
- _toggleNotice = jsunit.stub(zoomInstance, '_toggleNotice'),
- _getAspectRatio = jsunit.stub(zoomInstance, '_getAspectRatio'),
- _getWhiteBordersOffset = jsunit.stub(zoomInstance, '_getWhiteBordersOffset'),
- processStopTriggered = false,
- image = jQuery('');
-
- _getWhiteBordersOffset.returnValue = 1;
- zoomInstance.element.append(image);
- zoomInstance.options.selectors.image = '[data-role=test-image]';
- zoomInstance.image = image;
- _getAspectRatio.returnCallback = function(image) {
- if (image.is(zoomInstance.image)) {
- return 0;
- } else {
- return 1;
- }
- };
-
- jQuery(zoomInstance.options.selectors.image).on('processStop', function() {
- processStopTriggered = true;
- });
- zoomInstance.ratio = 1;
-
- zoomInstance._largeImageLoaded();
- assertNull(zoomInstance.ratio);
- assertTrue(_toggleNotice.callCount === 1);
- assertTrue(processStopTriggered);
- assertTrue(_getAspectRatio.callCount > 0);
- assertTrue(_getWhiteBordersOffset.callCount === 1);
- assertEquals(zoomInstance.whiteBordersOffset, _getWhiteBordersOffset.returnValue);
-};
-ZoomTest.prototype.testRefreshLargeImage = function() {
- var zoomInstance = this.zoomCreate(),
- css = {top: 0, left: 0};
- zoomInstance.largeImage = jQuery('
+
\ No newline at end of file
diff --git a/dev/tests/js/jasmine/assets/lib/web/mage/translate-inline.html b/dev/tests/js/jasmine/assets/lib/web/mage/translate-inline.html
new file mode 100644
index 0000000000000..5e48598a081a2
--- /dev/null
+++ b/dev/tests/js/jasmine/assets/lib/web/mage/translate-inline.html
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
index d71f517b5e7f9..52739eec2782b 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
@@ -27,7 +27,7 @@ define([
),
'Magento_Braintree/js/view/payment/adapter': jasmine.createSpyObj(
'adapter',
- ['setup', 'setConfig']
+ ['setup', 'setConfig', 'showError']
)
},
braintreeCcForm;
@@ -43,14 +43,17 @@ define([
};
injector.mock(mocks);
injector.require(['Magento_Braintree/js/view/payment/method-renderer/cc-form'], function (Constr) {
- braintreeCcForm = new Constr({
- provider: 'provName',
- name: 'test',
- index: 'test'
- });
-
- done();
+ braintreeCcForm = new Constr({
+ provider: 'provName',
+ name: 'test',
+ index: 'test',
+ item: {
+ title: 'Braintree'
+ }
});
+
+ done();
+ });
});
it('Check if payment code and message container are restored after onActiveChange call.', function () {
@@ -65,5 +68,21 @@ define([
expect(braintreeCcForm.getCode()).toEqual(expectedCode);
expect(braintreeCcForm.messageContainer).toEqual(expectedMessageContainer);
});
+
+ it('Check if form validation fails when "Place Order" button should be active.', function () {
+ var errorMessage = 'Something went wrong.',
+
+ /**
+ * Anonymous wrapper
+ */
+ func = function () {
+ braintreeCcForm.clientConfig.onError({
+ 'message': errorMessage
+ });
+ };
+
+ expect(func).toThrow(errorMessage);
+ expect(braintreeCcForm.isPlaceOrderActionAllowed()).toBeTruthy();
+ });
});
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js
new file mode 100644
index 0000000000000..545daf0a330c9
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'squire'
+], function (Squire) {
+ 'use strict';
+
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Checkout/js/action/place-order': jasmine.createSpy('placeOrderAction'),
+ 'Magento_CheckoutAgreements/js/model/agreements-assigner': jasmine.createSpy('agreementsAssigner')
+ },
+ defaultContext = require.s.contexts._,
+ mixin,
+ placeOrderAction;
+
+ beforeEach(function (done) {
+ window.checkoutConfig = {
+ checkoutAgreements: {
+ isEnabled: true
+ }
+ };
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_CheckoutAgreements/js/model/place-order-mixin',
+ 'Magento_Checkout/js/action/place-order'
+ ], function (Mixin, placeOrder) {
+ mixin = Mixin;
+ placeOrderAction = placeOrder;
+ done();
+ });
+ });
+
+ describe('Magento_CheckoutAgreements/js/model/place-order-mixin', function () {
+ it('mixin is applied to Magento_Checkout/js/action/place-order', function () {
+ var placeOrderMixins = defaultContext.config.config.mixins['Magento_Checkout/js/action/place-order'];
+
+ expect(placeOrderMixins['Magento_CheckoutAgreements/js/model/place-order-mixin']).toBe(true);
+ });
+
+ it('Magento_CheckoutAgreements/js/model/agreements-assigner is called', function () {
+ var messageContainer = jasmine.createSpy('messageContainer'),
+ paymentData = {};
+
+ mixin(placeOrderAction)(paymentData, messageContainer);
+ expect(mocks['Magento_CheckoutAgreements/js/model/agreements-assigner'])
+ .toHaveBeenCalledWith(paymentData);
+ expect(mocks['Magento_Checkout/js/action/place-order'])
+ .toHaveBeenCalledWith(paymentData, messageContainer);
+ });
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js
new file mode 100644
index 0000000000000..ed525bfd96a6c
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js
@@ -0,0 +1,56 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'squire'
+], function (Squire) {
+ 'use strict';
+
+ var injector = new Squire(),
+ mocks = {
+ 'Magento_Checkout/js/action/set-payment-information': jasmine.createSpy('placeOrderAction'),
+ 'Magento_CheckoutAgreements/js/model/agreements-assigner': jasmine.createSpy('agreementsAssigner')
+ },
+ defaultContext = require.s.contexts._,
+ mixin,
+ placeOrderAction;
+
+ beforeEach(function (done) {
+ window.checkoutConfig = {
+ checkoutAgreements: {
+ isEnabled: true
+ }
+ };
+ injector.mock(mocks);
+ injector.require([
+ 'Magento_CheckoutAgreements/js/model/set-payment-information-mixin',
+ 'Magento_Checkout/js/action/set-payment-information'
+ ], function (Mixin, setPaymentInformation) {
+ mixin = Mixin;
+ placeOrderAction = setPaymentInformation;
+ done();
+ });
+ });
+
+ describe('Magento_CheckoutAgreements/js/model/set-payment-information-mixin', function () {
+ it('mixin is applied to Magento_Checkout/js/action/set-payment-information', function () {
+ var placeOrderMixins = defaultContext
+ .config.config.mixins['Magento_Checkout/js/action/set-payment-information'];
+
+ expect(placeOrderMixins['Magento_CheckoutAgreements/js/model/set-payment-information-mixin']).toBe(true);
+ });
+
+ it('Magento_CheckoutAgreements/js/model/agreements-assigner is called', function () {
+ var messageContainer = jasmine.createSpy('messageContainer'),
+ paymentData = {};
+
+ mixin(placeOrderAction)(messageContainer, paymentData);
+ expect(mocks['Magento_CheckoutAgreements/js/model/agreements-assigner'])
+ .toHaveBeenCalledWith(paymentData);
+ expect(mocks['Magento_Checkout/js/action/set-payment-information'])
+ .toHaveBeenCalledWith(messageContainer, paymentData);
+ });
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
index dc520c5238568..47e3507ea1321 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
@@ -16,6 +16,13 @@ define([
describe('paypal/js/view/payment/method-renderer/paypal-express-abstract', function () {
var injector = new Squire(),
+ successPromise = jasmine.createSpyObj('successPromise', ['done']),
+ setPaymentMock = jasmine.createSpy('set-payment-information', function () {
+ return successPromise;
+ }).and.callThrough(),
+ validateMock = jasmine.createSpy('validate', function () {
+ return true;
+ }).and.callThrough(),
mocks = {
'Magento_Checkout/js/model/quote': {
billingAddress: ko.observable(),
@@ -23,6 +30,10 @@ define([
paymentMethod: ko.observable(),
totals: ko.observable({})
+ },
+ 'Magento_Checkout/js/action/set-payment-information': setPaymentMock,
+ 'Magento_Checkout/js/model/payment/additional-validators': {
+ validate: validateMock
}
},
paypalExpressAbstract,
@@ -85,6 +96,23 @@ define([
}, 500);
});
+ it('setPaymentMethodAction is called before redirect to paypal', function () {
+ spyOn(paypalExpressAbstract, 'selectPaymentMethod');
+ paypalExpressAbstract.continueToPayPal();
+ expect(paypalExpressAbstract.selectPaymentMethod).toHaveBeenCalled();
+ expect(validateMock).toHaveBeenCalled();
+ expect(validateMock.calls.mostRecent()).toEqual(jasmine.objectContaining({
+ object: mocks['Magento_Checkout/js/model/payment/additional-validators'],
+ args: [],
+ returnValue: true
+ }));
+ expect(setPaymentMock).toHaveBeenCalled();
+ expect(setPaymentMock.calls.mostRecent()).toEqual(jasmine.objectContaining({
+ returnValue: successPromise
+ }));
+ expect(successPromise.done).toHaveBeenCalledWith(jasmine.any(Function));
+ });
+
afterAll(function (done) {
tplElement.remove();
done();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
index ca2509c4ea707..de3387e31af88 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
@@ -43,8 +43,8 @@ define([
});
expect(multiSelect.allSelected()).toBeFalsy();
- expect(multiSelect.excluded()).toEqual([]);
- expect(multiSelect.selected()).toEqual([]);
+ expect(multiSelect.excluded().toString()).toEqual('');
+ expect(multiSelect.selected().toString()).toEqual('');
});
it('Select specific several rows on several pages', function () {
@@ -52,8 +52,8 @@ define([
multiSelect.selected.push(5);
expect(multiSelect.allSelected()).toBeFalsy();
- expect(multiSelect.excluded()).toEqual([]);
- expect(multiSelect.selected()).toEqual([4, 5]);
+ expect(multiSelect.excluded().toString()).toEqual('');
+ expect(multiSelect.selected().toString()).toEqual('4,5');
});
it('Select all rows on several pages', function () {
@@ -71,8 +71,8 @@ define([
multiSelect.selectPage();
expect(multiSelect.allSelected()).toBeFalsy();
- expect(multiSelect.excluded()).toEqual([]);
- expect(multiSelect.selected()).toEqual([1, 2, 3, 4]);
+ expect(multiSelect.excluded().toString()).toEqual('');
+ expect(multiSelect.selected().toString()).toEqual('1,2,3,4');
});
it('Select all rows on current page with some specific rows on another page', function () {
@@ -94,8 +94,8 @@ define([
}]);
multiSelect.selected.push(6);
expect(multiSelect.allSelected()).toBeFalsy();
- expect(multiSelect.excluded()).toEqual([5]);
- expect(multiSelect.selected()).toEqual([3, 4, 6]);
+ expect(multiSelect.excluded().toString()).toEqual('5');
+ expect(multiSelect.selected().toString()).toEqual('3,4,6');
});
it('Select all rows on several pages without some specific rows', function () {
@@ -113,8 +113,8 @@ define([
multiSelect.selected.remove(4); // remove second
expect(multiSelect.allSelected()).toBeFalsy();
- expect(multiSelect.excluded()).toEqual([4]);
- expect(multiSelect.selected()).toEqual([3]);
+ expect(multiSelect.excluded().toString()).toEqual('4');
+ expect(multiSelect.selected().toString()).toEqual('3');
});
it('Select all rows all over the Grid', function () {
@@ -131,8 +131,8 @@ define([
}]);
expect(multiSelect.allSelected()).toBeFalsy();
- expect(multiSelect.excluded()).toEqual([]);
- expect(multiSelect.selected()).toEqual([3, 4, 1, 2]);
+ expect(multiSelect.excluded().toString()).toEqual('');
+ expect(multiSelect.selected().toString()).toEqual('3,4,1,2');
});
it('Select all rows all over the Grid without all rows on current page but with specific rows on another page',
@@ -156,8 +156,8 @@ define([
}]);
expect(multiSelect.allSelected()).toBeFalsy();
- expect(multiSelect.excluded()).toEqual([3, 4]);
- expect(multiSelect.selected()).toEqual([5, 6]);
+ expect(multiSelect.excluded().toString()).toEqual('3,4');
+ expect(multiSelect.selected().toString()).toEqual('5,6');
});
});
});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/accordion.test.js b/dev/tests/js/jasmine/tests/lib/mage/accordion.test.js
new file mode 100644
index 0000000000000..19a54d95cf704
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/accordion.test.js
@@ -0,0 +1,80 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+ 'jquery',
+ 'mage/accordion'
+], function ($) {
+ 'use strict';
+
+ describe('Test for mage/accordion jQuery plugin', function () {
+ it('check if accordion can be initialized', function () {
+ var accordion = $('');
+
+ accordion.accordion();
+ expect(accordion.is(':mage-accordion')).toBeTruthy();
+
+ accordion.accordion('destroy');
+ expect(accordion.is(':mage-accordion')).toBeFalsy();
+ });
+ it('check one-collapsible element accordion', function () {
+ var accordion = $(''),
+ title1 = $('').appendTo(accordion),
+ content1 = $('').appendTo(accordion),
+ title2 = $('').appendTo(accordion),
+ content2 = $('').appendTo(accordion);
+
+ accordion.appendTo('body');
+
+ accordion.accordion();
+
+ expect(accordion.is(':mage-accordion')).toBeTruthy();
+
+ expect(content1.is(':visible')).toBeTruthy();
+ expect(content2.is(':hidden')).toBeTruthy();
+
+ title2.trigger('click');
+
+ expect(content1.is(':hidden')).toBeTruthy();
+ expect(content2.is(':visible')).toBeTruthy();
+
+ title1.trigger('click');
+
+ expect(content1.is(':visible')).toBeTruthy();
+ expect(content2.is(':hidden')).toBeTruthy();
+
+ accordion.accordion('destroy');
+
+ expect(accordion.is(':mage-accordion')).toBeFalsy();
+ });
+ it('check multi-collapsible element accordion', function () {
+ var accordion = $(''),
+ title1 = $('').appendTo(accordion),
+ content1 = $('').appendTo(accordion),
+ title2 = $('').appendTo(accordion),
+ content2 = $('').appendTo(accordion);
+
+ accordion.appendTo('body');
+
+ accordion.accordion({
+ multipleCollapsible: true
+ });
+
+ expect(accordion.is(':mage-accordion')).toBeTruthy();
+ expect(content1.is(':visible')).toBeTruthy();
+ expect(content2.is(':hidden')).toBeTruthy();
+
+ $(title1).trigger('click');
+ expect(content1.is(':visible')).toBeTruthy();
+ expect(content2.is(':hidden')).toBeTruthy();
+
+ $(title2).trigger('click');
+ expect(content1.is(':visible')).toBeTruthy();
+ expect(content2.is(':visible')).toBeTruthy();
+
+ accordion.accordion('destroy');
+ expect(accordion.is(':mage-accordion')).toBeFalsy();
+ });
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js b/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js
index 538c7e60b60fd..834a6df75843f 100644
--- a/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js
+++ b/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js
@@ -20,14 +20,19 @@ define([
});
});
describe('"sendPostponeRequest" method', function () {
- it('should insert "Error" notification if request failed', function () {
+ it('should insert "Error" notification if request failed', function (done) {
jQuery('').appendTo('body');
jQuery('body').notification();
jQuery.ajax().abort();
- expect(jQuery('.message-error').length).toBe(1);
- expect(jQuery('body:contains("A technical problem with the server created an error")').length).toBe(1);
+ setTimeout(function () {
+ expect(jQuery('.message-error').length).toBe(1);
+ expect(
+ jQuery('body:contains("A technical problem with the server created an error")').length
+ ).toBe(1);
+ done();
+ }, 1);
});
});
});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js b/dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js
new file mode 100644
index 0000000000000..84880e6af72c5
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js
@@ -0,0 +1,524 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+ 'jquery',
+ 'mage/backend/suggest'
+], function ($) {
+ 'use strict';
+
+ describe('mage/backend/suggest', function () {
+ var suggestSelector = '#suggest';
+
+ beforeEach(function () {
+ var $suggest = $('');
+
+ $('body').append($suggest);
+ $('body').append('');
+ });
+
+ afterEach(function () {
+ $(suggestSelector).remove();
+ $('#test-template').remove();
+ $(suggestSelector).suggest('destroy');
+ });
+
+ it('Check that suggest inited', function () {
+ var $suggest = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ });
+
+ expect($suggest.is(':mage-suggest')).toBe(true);
+ });
+
+ it('Check suggest create', function () {
+ var options = {
+ template: '#test-template',
+ choiceTemplate: '',
+ controls: {
+ selector: '.test',
+ eventsMap: {
+ focus: ['testfocus'],
+ blur: ['testblur'],
+ select: ['testselect']
+ }
+ },
+ showRecent: true,
+ storageKey: 'test-suggest-recent',
+ multiselect: true
+ },
+ recentItems = [{
+ id: '1',
+ label: 'TestLabel1'
+ },
+ {
+ id: '2',
+ label: 'TestLabel2'
+ }
+ ],
+ nonSelectedItem = {
+ id: '',
+ label: ''
+ },
+ suggestInstance;
+
+ if (window.localStorage) {
+ localStorage.setItem(options.storageKey, JSON.stringify(recentItems));
+ }
+
+ suggestInstance = $(suggestSelector).suggest(options).data('mage-suggest');
+
+ expect(suggestInstance._term).toBe(null);
+ expect(suggestInstance._nonSelectedItem).toEqual(nonSelectedItem);
+ expect(suggestInstance._renderedContext).toBe(null);
+ expect(suggestInstance._selectedItem).toEqual(nonSelectedItem);
+ expect(suggestInstance._control).toEqual(suggestInstance.options.controls);
+ expect(suggestInstance._recentItems).toEqual(window.localStorage ? recentItems : []);
+ expect(suggestInstance.valueField.is(':hidden')).toBe(true);
+
+ if (window.localStorage) {
+ localStorage.removeItem(options.storageKey);
+ }
+ });
+
+ it('Check suggest render', function () {
+ var options = {
+ template: '#test-template',
+ choiceTemplate: '',
+ dropdownWrapper: '',
+ className: 'test-suggest',
+ inputWrapper: ''
+ },
+ suggestInstance = $(suggestSelector).suggest(options).data('mage-suggest');
+
+ suggestInstance._render();
+
+ expect(suggestInstance.dropdown.hasClass('wrapper-test')).toBe(true);
+ expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+ expect(suggestInstance.element.closest('.test-input-wrapper').size()).toBeGreaterThan(0);
+ expect(suggestInstance.element.closest('.' + options.className).size()).toBeGreaterThan(0);
+ expect(suggestInstance.element.attr('autocomplete')).toBe('off');
+
+ options.appendMethod = 'before';
+ $(suggestSelector).suggest('destroy');
+ suggestInstance = $(suggestSelector).suggest(options).data('mage-suggest');
+ suggestInstance._render();
+ expect(suggestInstance.element.prev().is(suggestInstance.dropdown)).toBe(true);
+
+ options.appendMethod = 'after';
+ $(suggestSelector).suggest('destroy');
+ suggestInstance = $(suggestSelector).suggest(options).data('mage-suggest');
+ suggestInstance._render();
+ expect(suggestInstance.element.next().is(suggestInstance.dropdown)).toBe(true);
+ });
+
+ it('Check suggest createValueField', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest'),
+ valueField = suggestInstance._createValueField();
+
+ expect(valueField.is('input')).toBe(true);
+ expect(valueField.is(':hidden')).toBe(true);
+
+ $(suggestSelector).suggest('destroy');
+ suggestInstance = $(suggestSelector).suggest({
+ multiselect: true,
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest');
+ valueField = suggestInstance._createValueField();
+
+ expect(valueField.is('select')).toBe(true);
+ expect(valueField.is(':hidden')).toBe(true);
+ expect(valueField.attr('multiple')).toBe('multiple');
+ });
+
+ it('Check suggest prepareValueField', function () {
+ var $suggest = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }),
+ suggestInstance = $suggest.data('mage-suggest'),
+ suggestName = $suggest.attr('name');
+
+ suggestInstance._prepareValueField();
+
+ expect(suggestInstance.valueField).not.toBe(true);
+ expect(suggestInstance.element.prev().is(suggestInstance.valueField)).toBe(true);
+ expect(suggestInstance.element.attr('name')).toBe(undefined);
+ expect(suggestInstance.valueField.attr('name')).toBe(suggestName);
+ });
+
+ it('Check suggest destroy', function () {
+ var options = {
+ template: '#test-template',
+ choiceTemplate: '',
+ inputWrapper: '',
+ valueField: null
+ },
+ $suggest = $(suggestSelector).suggest(options),
+ suggestInstance = $suggest.data('mage-suggest'),
+ suggestName = $suggest.attr('name');
+
+ expect(suggestInstance.dropdown).not.toBe(undefined);
+ expect(suggestInstance.valueField).not.toBe(undefined);
+ expect(suggestName).toBe(undefined);
+
+ $suggest.suggest('destroy');
+
+ expect($suggest.closest('.test-input-wrapper').length).toBe(0);
+ expect($suggest.attr('autocomplete')).toBe(undefined);
+ expect($suggest.attr('name')).toBe(suggestInstance.valueField.attr('name'));
+ expect(suggestInstance.valueField.parents('html').length).not.toBeGreaterThan(0);
+ expect(suggestInstance.dropdown.parents('html').length).not.toBeGreaterThan(0);
+ });
+
+ it('Check suggest value', function () {
+ var value = 'test-value',
+ suggestInstance, suggestDivInstance;
+
+ $(suggestSelector).val(value);
+ $('body').append('
+
+
+
+
+
+' + value + '
');
+
+ suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest');
+ suggestDivInstance = $('#suggest-div').suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest');
+
+ expect(suggestInstance._value()).toBe(value);
+ expect(suggestDivInstance._value()).toBe(value);
+ $('#suggest-div').remove();
+ });
+
+ it('Check suggest bind', function () {
+ var eventIsBinded = false,
+ options = {
+ template: '#test-template',
+ choiceTemplate: '',
+ events: {
+ /** Stub function */
+ click: function () {
+ eventIsBinded = true;
+ }
+ }
+ },
+ $suggest = $(suggestSelector).suggest(options);
+
+ $suggest.trigger('click');
+ expect(eventIsBinded).toBe(true);
+ });
+
+ it('Check suggest focus/blur', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest'),
+ uiHash = {
+ item: {
+ id: 1,
+ label: 'Test Label'
+ }
+ };
+
+ expect(suggestInstance._focused).toBe(undefined);
+ expect(suggestInstance.element.val()).toBe('');
+
+ suggestInstance._focusItem($.Event('focus'), uiHash);
+
+ expect(suggestInstance._focused).toEqual(uiHash.item);
+ expect(suggestInstance.element.val()).toBe(uiHash.item.label);
+
+ suggestInstance._blurItem();
+
+ expect(suggestInstance._focused).toBe(null);
+ expect(suggestInstance.element.val()).toBe('');
+ });
+
+ it('Check suggest select', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest'),
+ uiHash = {
+ item: {
+ id: 1,
+ label: 'Test Label'
+ }
+ };
+
+ suggestInstance._focused = suggestInstance._term = suggestInstance._selectedItem = null;
+ suggestInstance.valueField.val('');
+ suggestInstance._selectItem($.Event('select'));
+
+ expect(suggestInstance._selectedItem).toBe(null);
+ expect(suggestInstance._term).toBe(null);
+ expect(suggestInstance.valueField.val()).toBe('');
+ expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+
+ suggestInstance._focused = uiHash.item;
+ suggestInstance._selectItem($.Event('select'));
+
+ expect(suggestInstance._selectedItem).toEqual(suggestInstance._focused);
+ expect(suggestInstance._term).toBe(suggestInstance._focused.label);
+ expect(suggestInstance.valueField.val()).toBe(suggestInstance._focused.id.toString());
+ expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+ });
+
+ it('Check suggest multiselect', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: '',
+ multiselect: true
+ }).data('mage-suggest'),
+ uiHash = {
+ item: {
+ id: 1,
+ label: 'Test Label'
+ }
+ },
+ event = $.Event('select'),
+ selectedElement = $('');
+
+ event.target = selectedElement[0];
+ suggestInstance._focused = suggestInstance._term = suggestInstance._selectedItem = null;
+ suggestInstance.valueField.val('');
+ suggestInstance._selectItem(event);
+
+ expect(suggestInstance._selectedItem).toBe(null);
+ expect(suggestInstance._term).toBe(null);
+ expect(suggestInstance.valueField.find('option').length).not.toBeGreaterThan(0);
+ expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+
+ suggestInstance._focused = uiHash.item;
+ suggestInstance._selectItem(event);
+
+ expect(suggestInstance._selectedItem).toEqual(suggestInstance._focused);
+ expect(suggestInstance._term).toBe('');
+ expect(suggestInstance._getOption(suggestInstance._focused).length).toBeGreaterThan(0);
+ expect(selectedElement.hasClass(suggestInstance.options.selectedClass)).toBe(true);
+ expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+
+ suggestInstance._selectItem(event);
+ expect(suggestInstance._selectedItem).toEqual(suggestInstance._nonSelectedItem);
+ expect(suggestInstance._term).toBe('');
+ expect(suggestInstance._getOption(suggestInstance._focused).length).not.toBeGreaterThan(0);
+ expect(selectedElement.hasClass(suggestInstance.options.selectedClass)).toBe(false);
+ expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+ });
+
+ it('Check suggest reset value', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest');
+
+ suggestInstance.valueField.val('test');
+ expect(suggestInstance.valueField.val()).toBe('test');
+ suggestInstance._resetSuggestValue();
+ expect(suggestInstance.valueField.val()).toBe(suggestInstance._nonSelectedItem.id);
+ });
+
+ it('Check suggest reset multiselect value', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: '',
+ multiselect: true
+ }).data('mage-suggest'),
+ uiHash = {
+ item: {
+ id: 1,
+ label: 'Test Label'
+ }
+ },
+ event = $.Event('select');
+
+ event.target = $('')[0];
+ suggestInstance._focused = uiHash.item;
+
+ suggestInstance._selectItem(event);
+ suggestInstance._resetSuggestValue();
+
+ expect(suggestInstance.valueField.val() instanceof Array).toBe(true);
+ expect(suggestInstance.valueField.val()[0]).not.toBe(undefined);
+ expect(suggestInstance.valueField.val()[0]).toBe(uiHash.item.id.toString());
+ });
+
+ it('Check suggest read item data', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest'),
+ testElement = $('');
+
+ expect(suggestInstance._readItemData(testElement)).toEqual(suggestInstance._nonSelectedItem);
+ testElement.data('suggestOption', 'test');
+ expect(suggestInstance._readItemData(testElement)).toEqual('test');
+ });
+
+ it('Check suggest template', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '<%= data.test %>
',
+ choiceTemplate: ''
+ }).data('mage-suggest'),
+ tmpl = suggestInstance.templates[suggestInstance.templateName],
+ html = $('').append(tmpl({
+ data: {
+ test: 'test'
+ }
+ })).html();
+
+ expect(html).toEqual('test
');
+ suggestInstance.destroy();
+ $('body').append('');
+
+ suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest');
+ tmpl = suggestInstance.templates[suggestInstance.templateName];
+ html = $('').append(tmpl({
+ data: {
+ test: 'test'
+ }
+ })).html();
+
+ expect(html).toEqual('test
');
+ $('#test-template').remove();
+ });
+
+ it('Check suggest dropdown visibility', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest');
+
+ suggestInstance.dropdown.hide();
+ expect(suggestInstance.isDropdownShown()).toBe(false);
+ expect(suggestInstance.dropdown.is(':hidden')).toBe(true);
+
+ suggestInstance.dropdown.show();
+ expect(suggestInstance.isDropdownShown()).toBe(true);
+ expect(suggestInstance.dropdown.is(':visible')).toBe(true);
+ });
+
+ it('Check suggest create option', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest'),
+ uiHash = {
+ item: {
+ id: 1,
+ label: 'Test Label'
+ }
+ },
+ option = suggestInstance._createOption(uiHash.item);
+
+ expect(option.val()).toBe('1');
+ expect(option.prop('selected')).toBe(true);
+ expect(option.text()).toBe('Test Label');
+ expect(option.data('renderedOption')).not.toBe(undefined);
+ });
+
+ it('Check suggest add option', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest'),
+ uiHash = {
+ item: {
+ id: 1,
+ label: 'Test Label'
+ }
+ },
+ selectTarget = $(''),
+ event = $.Event('add'),
+ option;
+
+ event.target = selectTarget[0];
+ suggestInstance._addOption(event, uiHash.item);
+ option = suggestInstance.valueField.find('option[value=' + uiHash.item.id + ']');
+
+ expect(option.length).toBeGreaterThan(0);
+ expect(option.data('selectTarget').is(selectTarget)).toBe(true);
+ });
+
+ it('Check suggest get option', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: ''
+ }).data('mage-suggest'),
+ uiHash = {
+ item: {
+ id: 1,
+ label: 'Test Label'
+ }
+ },
+ option = $('');
+
+ expect(suggestInstance._getOption(uiHash.item).length).not.toBeGreaterThan(0);
+
+ suggestInstance.valueField.append(option);
+ expect(suggestInstance._getOption(uiHash.item).length).toBeGreaterThan(0);
+ expect(suggestInstance._getOption(option).length).toBeGreaterThan(0);
+ });
+
+ it('Check suggest last added', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: '',
+ multiselect: true
+ }).data('mage-suggest'),
+ uiHash = {
+ item: {
+ id: 1,
+ label: 'Test Label'
+ }
+ };
+
+ suggestInstance._addOption({}, uiHash.item);
+ expect(suggestInstance.valueField.find('option').length).toBeGreaterThan(0);
+ suggestInstance._removeLastAdded();
+ expect(suggestInstance.valueField.find('option').length).not.toBeGreaterThan(0);
+ });
+
+ it('Check suggest remove option', function () {
+ var suggestInstance = $(suggestSelector).suggest({
+ template: '#test-template',
+ choiceTemplate: '',
+ multiselect: true
+ }).data('mage-suggest'),
+ uiHash = {
+ item: {
+ id: 1,
+ label: 'Test Label'
+ }
+ },
+ selectTarget = $(''),
+ event = $.Event('select');
+
+ selectTarget.addClass(suggestInstance.options.selectedClass);
+ event.target = selectTarget[0];
+
+ suggestInstance._addOption(event, uiHash.item);
+ expect(suggestInstance.valueField.find('option').length).toBeGreaterThan(0);
+ suggestInstance.removeOption(event, uiHash.item);
+ expect(suggestInstance.valueField.find('option').length).not.toBeGreaterThan(0);
+ expect(selectTarget.hasClass(suggestInstance.options.selectedClass)).toBe(false);
+ });
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/backend/tree-suggest.test.js b/dev/tests/js/jasmine/tests/lib/mage/backend/tree-suggest.test.js
new file mode 100644
index 0000000000000..b116fc7058808
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/backend/tree-suggest.test.js
@@ -0,0 +1,52 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+ 'jquery',
+ 'mage/backend/tree-suggest'
+], function ($) {
+ 'use strict';
+
+ describe('mage/backend/tree-suggest', function () {
+ var treeSuggestSelector = '#tree-suggest';
+
+ beforeEach(function () {
+ var $treeSuggest = $('');
+
+ $('body').append($treeSuggest);
+ });
+
+ afterEach(function () {
+ $(treeSuggestSelector).remove();
+ $(treeSuggestSelector).treeSuggest('destroy');
+ });
+
+ it('Check that treeSuggest inited', function () {
+ var $treeSuggest = $(treeSuggestSelector).treeSuggest(),
+ treeSuggestInstance = $treeSuggest.data('mage-treeSuggest');
+
+ expect($treeSuggest.is(':mage-treeSuggest')).toBe(true);
+ expect(treeSuggestInstance.widgetEventPrefix).toBe('suggest');
+ });
+
+ it('Check treeSuggest filter', function () {
+ var treeSuggestInstance = $(treeSuggestSelector).treeSuggest().data('mage-treeSuggest'),
+ uiHash = {
+ item: {
+ id: 1,
+ label: 'Test Label'
+ }
+ };
+
+ expect(treeSuggestInstance._filterSelected(
+ [uiHash.item],
+ {
+ _allShown: true
+ }
+ )).toEqual([uiHash.item]);
+ });
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/calendar.test.js b/dev/tests/js/jasmine/tests/lib/mage/calendar.test.js
new file mode 100644
index 0000000000000..b2c6aed2c9fba
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/calendar.test.js
@@ -0,0 +1,173 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+ 'jquery',
+ 'jquery/ui',
+ 'mage/calendar'
+], function ($) {
+ 'use strict';
+
+ describe('mage/calendar', function () {
+ describe('Check calendar', function () {
+ var calendarSelector = '#calendar';
+
+ beforeEach(function () {
+ var $calendar = $('');
+
+ $('body').append($calendar);
+ });
+
+ afterEach(function () {
+ $(calendarSelector).remove();
+ $(calendarSelector).calendar('destroy');
+ });
+
+ it('Check that calendar inited', function () {
+ var $calendar = $(calendarSelector).calendar();
+
+ expect($calendar.is(':mage-calendar')).toBe(true);
+ });
+
+ it('Check configuration merge', function () {
+ var $calendar;
+
+ $.extend(true, $, {
+ calendarConfig: {
+ showOn: 'button',
+ showAnim: '',
+ buttonImageOnly: true,
+ showButtonPanel: true,
+ showWeek: true,
+ timeFormat: '',
+ showTime: false,
+ showHour: false,
+ showMinute: false
+ }
+ });
+
+ $calendar = $(calendarSelector).calendar();
+
+ expect($calendar.calendar('option', 'showOn')).toBe('button');
+ expect($calendar.calendar('option', 'showAnim')).toBe('');
+ expect($calendar.calendar('option', 'buttonImageOnly')).toBe(true);
+ expect($calendar.calendar('option', 'showButtonPanel')).toBe(true);
+ expect($calendar.calendar('option', 'showWeek')).toBe(true);
+ expect($calendar.calendar('option', 'timeFormat')).toBe('');
+ expect($calendar.calendar('option', 'showTime')).toBe(false);
+ expect($calendar.calendar('option', 'showHour')).toBe(false);
+ expect($calendar.calendar('option', 'showMinute')).toBe(false);
+
+ delete $.calendarConfig;
+ });
+
+ it('Specifying AM/PM in timeformat option changes AMPM option to true', function () {
+ var $calendar = $(calendarSelector).calendar({
+ timeFormat: 'hh:mm tt',
+ ampm: false
+ });
+
+ expect($calendar.calendar('option', 'ampm')).toBe(true);
+ });
+
+ it('Omitting AM/PM in timeformat option changes AMPM option to false', function () {
+ var $calendar = $(calendarSelector).calendar({
+ timeFormat: 'hh:mm'
+ });
+
+ expect($calendar.calendar('option', 'ampm')).toBe(null);
+ });
+
+ it('With server timezone offset', function () {
+ var serverTimezoneSeconds = 1346122095,
+ $calendar = $(calendarSelector).calendar({
+ serverTimezoneSeconds: serverTimezoneSeconds
+ }),
+ currentDate = new Date();
+
+ currentDate.setTime((serverTimezoneSeconds + currentDate.getTimezoneOffset() * 60) * 1000);
+
+ expect($calendar.calendar('getTimezoneDate').toString()).toBe(currentDate.toString());
+ });
+
+ it('Without sever timezone offset', function () {
+ var $calendar = $(calendarSelector).calendar(),
+ currentDate = new Date();
+
+ expect($calendar.calendar('getTimezoneDate').toString()).toBe(currentDate.toString());
+ });
+
+ it('Check destroy', function () {
+ var $calendar = $(calendarSelector).calendar();
+
+ expect($calendar.is(':mage-calendar')).toBe(true);
+ $calendar.calendar('destroy');
+ expect($calendar.is(':mage-calendar')).toBe(false);
+ });
+ });
+ describe('Check dateRange', function () {
+ var dateRangeSelector = '#date-range';
+
+ beforeEach(function () {
+ var $dateRange = $('' +
+ '' +
+ '' +
+ '
');
+
+ $('body').append($dateRange);
+ });
+
+ afterEach(function () {
+ $(dateRangeSelector).remove();
+ $(dateRangeSelector).dateRange('destroy');
+ });
+
+ it('Check that dateRange inited', function () {
+ var $dateRange = $(dateRangeSelector).dateRange();
+
+ expect($dateRange.is(':mage-dateRange')).toBe(true);
+ });
+
+ it('Check that dateRange inited with additional options', function () {
+ var $from = $('#from'),
+ $to = $('#to');
+
+ $(dateRangeSelector).dateRange({
+ from: {
+ id: 'from'
+ },
+ to: {
+ id: 'to'
+ }
+ });
+
+ expect($from.hasClass('_has-datepicker')).toBe(true);
+ expect($to.hasClass('_has-datepicker')).toBe(true);
+ });
+
+ it('Check destroy', function () {
+ var $dateRange = $(dateRangeSelector).dateRange({
+ from: {
+ id: 'from'
+ },
+ to: {
+ id: 'to'
+ }
+ }),
+ $from = $('#from'),
+ $to = $('#to');
+
+ expect($dateRange.is(':mage-dateRange')).toBe(true);
+ expect($from.hasClass('_has-datepicker')).toBe(true);
+ expect($to.hasClass('_has-datepicker')).toBe(true);
+ $dateRange.dateRange('destroy');
+ expect($dateRange.is(':mage-dateRange')).toBe(false);
+ expect($from.hasClass('_has-datepicker')).toBe(false);
+ expect($to.hasClass('_has-datepicker')).toBe(false);
+ });
+ });
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js b/dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js
new file mode 100644
index 0000000000000..d6c95d2887ec7
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js
@@ -0,0 +1,211 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* eslint-disable max-nested-callbacks */
+/* jscs:disable jsDoc */
+
+define([
+ 'jquery',
+ 'jquery/ui',
+ 'mage/collapsible'
+], function ($) {
+ 'use strict';
+
+ describe('Test for mage/collapsible jQuery plugin', function () {
+ it('check if collapsible can be initialized and destroyed', function () {
+ var group = $('');
+
+ group.collapsible();
+ expect(group.is(':mage-collapsible')).toBeTruthy();
+
+ group.collapsible('destroy');
+ expect(group.is(':mage-collapsible')).toBeFalsy();
+ group.remove();
+ });
+
+ describe('Test enable, disable, activate and deactivate methods', function () {
+ var group = $(''),
+ content = $('').appendTo(group);
+
+ $('').prependTo(group);
+
+ beforeEach(function () {
+ group.appendTo('body');
+ });
+
+ afterEach(function () {
+ group.remove();
+ });
+
+ it('check enable and disable methods', function () {
+ group.collapsible();
+ expect(group.is(':mage-collapsible')).toBeTruthy();
+
+ group.collapsible('disable');
+ expect(content.is(':hidden')).toBeTruthy();
+
+ group.collapsible('enable');
+ expect(content.is(':visible')).toBeTruthy();
+
+ group.collapsible('destroy');
+ expect(group.is(':mage-collapsible')).toBeFalsy();
+ });
+
+ it('check activate and deactivate methods', function () {
+ group.collapsible();
+ expect(group.is(':mage-collapsible')).toBeTruthy();
+
+ group.collapsible('deactivate');
+ expect(content.is(':hidden')).toBeTruthy();
+
+ group.collapsible('activate');
+ expect(content.is(':visible')).toBeTruthy();
+
+ group.collapsible('destroy');
+ expect(group.is(':mage-collapsible')).toBeFalsy();
+ });
+ });
+
+ it('check if the widget gets expanded/collapsed when the title is clicked', function () {
+ var group = $(''),
+ title = $('').appendTo(group),
+ content = $('').appendTo(group);
+
+ group.appendTo('body');
+
+ group.collapsible();
+ expect(group.is(':mage-collapsible')).toBeTruthy();
+
+ group.collapsible('deactivate');
+ expect(content.is(':hidden')).toBeTruthy();
+
+ title.trigger('click');
+ expect(content.is(':visible')).toBeTruthy();
+
+ title.trigger('click');
+ expect(content.is(':hidden')).toBeTruthy();
+
+ group.collapsible('destroy');
+ expect(group.is(':mage-collapsible')).toBeFalsy();
+ group.remove();
+ });
+
+ it('check state classes', function () {
+ var group = $(''),
+ title = $('').appendTo(group);
+
+ $('').appendTo(group);
+
+ group.appendTo('body');
+
+ group.collapsible({
+ openedState: 'opened',
+ closedState: 'closed',
+ disabledState: 'disabled'
+ });
+ expect(group.is(':mage-collapsible')).toBeTruthy();
+ expect(group.hasClass('closed')).toBeTruthy();
+
+ title.trigger('click');
+ expect(group.hasClass('opened')).toBeTruthy();
+
+ group.collapsible('disable');
+ expect(group.hasClass('disabled')).toBeTruthy();
+
+ group.collapsible('destroy');
+ expect(group.is(':mage-collapsible')).toBeFalsy();
+ group.remove();
+ });
+
+ it('check if icons are added to title when initialized and removed when destroyed', function () {
+ var group = $(''),
+ title = $('').appendTo(group);
+
+ $('').appendTo(group);
+
+ group.appendTo('body');
+
+ group.collapsible({
+ icons: {
+ header: 'minus',
+ activeHeader: 'plus'
+ }
+ });
+ expect(group.is(':mage-collapsible')).toBeTruthy();
+ expect(title.children('[data-role=icons]').length).toBeTruthy();
+
+ group.collapsible('destroy');
+ expect(group.is(':mage-collapsible')).toBeFalsy();
+ expect(title.children('[data-role=icons]').length).toBeFalsy();
+ group.remove();
+ });
+
+ it('check if icon classes are changed when content gets expanded/collapsed', function () {
+ var group = $(''),
+ title = $('').appendTo(group),
+ content = $('').appendTo(group),
+ icons;
+
+ group.appendTo('body');
+
+ group.collapsible({
+ icons: {
+ header: 'minus',
+ activeHeader: 'plus'
+ }
+ });
+ expect(group.is(':mage-collapsible')).toBeTruthy();
+
+ icons = group.collapsible('option', 'icons');
+ group.collapsible('deactivate');
+ expect(content.is(':hidden')).toBeTruthy();
+ expect(title.children('[data-role=icons]').hasClass(icons.header)).toBeTruthy();
+
+ title.trigger('click');
+ expect(title.children('[data-role=icons]').hasClass(icons.activeHeader)).toBeTruthy();
+
+ group.collapsible('destroy');
+ expect(group.is(':mage-collapsible')).toBeFalsy();
+ group.remove();
+ });
+
+ it('check if content gets updated via Ajax when title is clicked', function () {
+ var group = $(''),
+ title = $('').appendTo(group),
+ content = $('').appendTo(group);
+
+ $('').appendTo(group);
+
+ $.get = jasmine.createSpy().and.callFake(function () {
+ var d = $.Deferred();
+
+ d.promise().success = function () {
+ };
+
+ d.promise().complete = function () {
+ };
+
+ return d.promise();
+ });
+
+ group.appendTo('body');
+
+ group.collapsible({
+ ajaxContent: true
+ });
+ expect(group.is(':mage-collapsible')).toBeTruthy();
+
+ group.collapsible('deactivate');
+ expect(content.is(':hidden')).toBeTruthy();
+ expect(content.children('p').length).toBeFalsy();
+
+ title.trigger('click');
+ expect(content.children('p')).toBeTruthy();
+
+ group.collapsible('destroy');
+ expect(group.is(':mage-collapsible')).toBeFalsy();
+ group.remove();
+ });
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/decorate.test.js b/dev/tests/js/jasmine/tests/lib/mage/decorate.test.js
new file mode 100644
index 0000000000000..898bcf8b51128
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/decorate.test.js
@@ -0,0 +1,201 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+ 'mage/decorate',
+ 'jquery'
+], function (decorate, $) {
+ 'use strict';
+
+ describe('mage/decorate', function () {
+ describe('"list" method', function () {
+ var listId = 'testList';
+
+ beforeEach(function () {
+ var list = $('abc
')).toEqual(false);
+ });
+ });
+
+ describe('Testing allow-container-className', function () {
+ it('allow-container-className', function () {
+ var radio = $(''),
+ checkbox = $(''),
+ radio2 = $(''),
+ checkbox2 = $('');
+
+ expect($.validator.methods['allow-container-className']
+ .call($.validator.prototype, radio[0])).toEqual(true);
+ expect($.validator.methods['allow-container-className']
+ .call($.validator.prototype, checkbox[0])).toEqual(true);
+ expect($.validator.methods['allow-container-className']
+ .call($.validator.prototype, radio2[0])).toEqual(false);
+ expect($.validator.methods['allow-container-className']
+ .call($.validator.prototype, checkbox2[0])).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-select', function () {
+ it('validate-select', function () {
+ expect($.validator.methods['validate-select']
+ .call($.validator.prototype, '')).toEqual(false);
+ expect($.validator.methods['validate-select']
+ .call($.validator.prototype, 'none')).toEqual(false);
+ expect($.validator.methods['validate-select']
+ .call($.validator.prototype, null)).toEqual(false);
+ expect($.validator.methods['validate-select']
+ .call($.validator.prototype, undefined)).toEqual(false);
+ expect($.validator.methods['validate-select']
+ .call($.validator.prototype, 'abc')).toEqual(true);
+ });
+ });
+
+ describe('Testing validate-no-empty', function () {
+ it('validate-no-empty', function () {
+ expect($.validator.methods['validate-no-empty']
+ .call($.validator.prototype, '')).toEqual(false);
+ expect($.validator.methods['validate-no-empty']
+ .call($.validator.prototype, null)).toEqual(false);
+ expect($.validator.methods['validate-no-empty']
+ .call($.validator.prototype, undefined)).toEqual(false);
+ expect($.validator.methods['validate-no-empty']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-no-empty']
+ .call($.validator.prototype, 'test')).toEqual(true);
+ });
+ });
+
+ describe('Testing validate-alphanum-with-spaces', function () {
+ it('validate-alphanum-with-spaces', function () {
+ expect($.validator.methods['validate-alphanum-with-spaces']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-alphanum-with-spaces']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-alphanum-with-spaces']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-alphanum-with-spaces']
+ .call($.validator.prototype, ' ')).toEqual(true);
+ expect($.validator.methods['validate-alphanum-with-spaces']
+ .call($.validator.prototype, 'abc ')).toEqual(true);
+ expect($.validator.methods['validate-alphanum-with-spaces']
+ .call($.validator.prototype, ' 123 ')).toEqual(true);
+ expect($.validator.methods['validate-alphanum-with-spaces']
+ .call($.validator.prototype, ' abc123 ')).toEqual(true);
+ expect($.validator.methods['validate-alphanum-with-spaces']
+ .call($.validator.prototype, ' !@# ')).toEqual(false);
+ expect($.validator.methods['validate-alphanum-with-spaces']
+ .call($.validator.prototype, ' abc.123 ')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-phoneStrict', function () {
+ it('validate-phoneStrict', function () {
+ expect($.validator.methods['validate-phoneStrict']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-phoneStrict']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-phoneStrict']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-phoneStrict']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-phoneStrict']
+ .call($.validator.prototype, '5121231234')).toEqual(false);
+ expect($.validator.methods['validate-phoneStrict']
+ .call($.validator.prototype, '512.123.1234')).toEqual(false);
+ expect($.validator.methods['validate-phoneStrict']
+ .call($.validator.prototype, '512-123-1234')).toEqual(true);
+ expect($.validator.methods['validate-phoneStrict']
+ .call($.validator.prototype, '(512)123-1234')).toEqual(true);
+ expect($.validator.methods['validate-phoneStrict']
+ .call($.validator.prototype, '(512) 123-1234')).toEqual(true);
+ });
+ });
+
+ describe('Testing validate-phoneLax', function () {
+ it('validate-phoneLax', function () {
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, '5121231234')).toEqual(true);
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, '512.123.1234')).toEqual(true);
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, '512-123-1234')).toEqual(true);
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, '(512)123-1234')).toEqual(true);
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, '(512) 123-1234')).toEqual(true);
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, '(512)1231234')).toEqual(true);
+ expect($.validator.methods['validate-phoneLax']
+ .call($.validator.prototype, '(512)_123_1234')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-fax', function () {
+ it('validate-fax', function () {
+ expect($.validator.methods['validate-fax']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-fax']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-fax']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-fax']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-fax']
+ .call($.validator.prototype, '5121231234')).toEqual(false);
+ expect($.validator.methods['validate-fax']
+ .call($.validator.prototype, '512.123.1234')).toEqual(false);
+ expect($.validator.methods['validate-fax']
+ .call($.validator.prototype, '512-123-1234')).toEqual(true);
+ expect($.validator.methods['validate-fax']
+ .call($.validator.prototype, '(512)123-1234')).toEqual(true);
+ expect($.validator.methods['validate-fax']
+ .call($.validator.prototype, '(512) 123-1234')).toEqual(true);
+ });
+ });
+
+ describe('Testing validate-email', function () {
+ it('validate-email', function () {
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, '123@123.com')).toEqual(true);
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, 'abc@124.en')).toEqual(true);
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, 'abc@abc.commmmm')).toEqual(true);
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, 'abc.abc.abc@abc.commmmm')).toEqual(true);
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, 'abc.abc-abc@abc.commmmm')).toEqual(true);
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, 'abc.abc_abc@abc.commmmm')).toEqual(true);
+ expect($.validator.methods['validate-email']
+ .call($.validator.prototype, 'abc.abc_abc@abc')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-emailSender', function () {
+ it('validate-emailSender', function () {
+ expect($.validator.methods['validate-emailSender']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-emailSender']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-emailSender']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-emailSender']
+ .call($.validator.prototype, ' ')).toEqual(true);
+ expect($.validator.methods['validate-emailSender']
+ .call($.validator.prototype, '123@123.com')).toEqual(true);
+ expect($.validator.methods['validate-emailSender']
+ .call($.validator.prototype, 'abc@124.en')).toEqual(true);
+ expect($.validator.methods['validate-emailSender']
+ .call($.validator.prototype, 'abc@abc.commmmm')).toEqual(true);
+ expect($.validator.methods['validate-emailSender']
+ .call($.validator.prototype, 'abc.abc.abc@abc.commmmm')).toEqual(true);
+ expect($.validator.methods['validate-emailSender']
+ .call($.validator.prototype, 'abc.abc-abc@abc.commmmm')).toEqual(true);
+ expect($.validator.methods['validate-emailSender']
+ .call($.validator.prototype, 'abc.abc_abc@abc.commmmm')).toEqual(true);
+ });
+ });
+
+ describe('Testing validate-password', function () {
+ it('validate-password', function () {
+ expect($.validator.methods['validate-password']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-password']
+ .call($.validator.prototype, null)).toEqual(false);
+ expect($.validator.methods['validate-password']
+ .call($.validator.prototype, undefined)).toEqual(false);
+ expect($.validator.methods['validate-password']
+ .call($.validator.prototype, ' ')).toEqual(true);
+ expect($.validator.methods['validate-password']
+ .call($.validator.prototype, '123@123.com')).toEqual(true);
+ expect($.validator.methods['validate-password']
+ .call($.validator.prototype, 'abc')).toEqual(false);
+ expect($.validator.methods['validate-password']
+ .call($.validator.prototype, 'abc ')).toEqual(false);
+ expect($.validator.methods['validate-password']
+ .call($.validator.prototype, ' abc ')).toEqual(false);
+ expect($.validator.methods['validate-password']
+ .call($.validator.prototype, 'dddd')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-admin-password', function () {
+ it('validate-admin-password', function () {
+ expect($.validator.methods['validate-admin-password']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-admin-password']
+ .call($.validator.prototype, null)).toEqual(false);
+ expect($.validator.methods['validate-admin-password']
+ .call($.validator.prototype, undefined)).toEqual(false);
+ expect($.validator.methods['validate-admin-password']
+ .call($.validator.prototype, ' ')).toEqual(true);
+ expect($.validator.methods['validate-admin-password']
+ .call($.validator.prototype, '123@123.com')).toEqual(true);
+ expect($.validator.methods['validate-admin-password']
+ .call($.validator.prototype, 'abc')).toEqual(false);
+ expect($.validator.methods['validate-admin-password']
+ .call($.validator.prototype, 'abc ')).toEqual(false);
+ expect($.validator.methods['validate-admin-password']
+ .call($.validator.prototype, ' abc ')).toEqual(false);
+ expect($.validator.methods['validate-admin-password']
+ .call($.validator.prototype, 'dddd')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-url', function () {
+ it('validate-url', function () {
+ expect($.validator.methods['validate-url']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-url']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-url']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-url']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-url']
+ .call($.validator.prototype, 'http://www.google.com')).toEqual(true);
+ expect($.validator.methods['validate-url']
+ .call($.validator.prototype, 'http://127.0.0.1:8080/index.php')).toEqual(true);
+ expect($.validator.methods['validate-url']
+ .call($.validator.prototype, 'http://app-spot.com/index.php')).toEqual(true);
+ expect($.validator.methods['validate-url']
+ .call($.validator.prototype, 'http://app-spot_space.com/index.php')).toEqual(true);
+ });
+ });
+
+ describe('Testing validate-clean-url', function () {
+ it('validate-clean-url', function () {
+ expect($.validator.methods['validate-clean-url']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-clean-url']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-clean-url']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-clean-url']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-clean-url']
+ .call($.validator.prototype, 'http://www.google.com')).toEqual(true);
+ expect($.validator.methods['validate-clean-url']
+ .call($.validator.prototype, 'http://127.0.0.1:8080/index.php')).toEqual(false);
+ expect($.validator.methods['validate-clean-url']
+ .call($.validator.prototype, 'http://127.0.0.1:8080')).toEqual(false);
+ expect($.validator.methods['validate-clean-url']
+ .call($.validator.prototype, 'http://127.0.0.1')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-xml-identifier', function () {
+ it('validate-xml-identifier', function () {
+ expect($.validator.methods['validate-xml-identifier']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-xml-identifier']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-xml-identifier']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-xml-identifier']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-xml-identifier']
+ .call($.validator.prototype, 'abc')).toEqual(true);
+ expect($.validator.methods['validate-xml-identifier']
+ .call($.validator.prototype, 'abc_123')).toEqual(true);
+ expect($.validator.methods['validate-xml-identifier']
+ .call($.validator.prototype, 'abc-123')).toEqual(true);
+ expect($.validator.methods['validate-xml-identifier']
+ .call($.validator.prototype, '123-abc')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-ssn', function () {
+ it('validate-ssn', function () {
+ expect($.validator.methods['validate-ssn']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-ssn']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-ssn']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-ssn']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-ssn']
+ .call($.validator.prototype, 'abc')).toEqual(false);
+ expect($.validator.methods['validate-ssn']
+ .call($.validator.prototype, '123-13-1234')).toEqual(true);
+ expect($.validator.methods['validate-ssn']
+ .call($.validator.prototype, '012-12-1234')).toEqual(true);
+ expect($.validator.methods['validate-ssn']
+ .call($.validator.prototype, '23-12-1234')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-zip-us', function () {
+ it('validate-zip-us', function () {
+ expect($.validator.methods['validate-zip-us']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-zip-us']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-zip-us']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-zip-us']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-zip-us']
+ .call($.validator.prototype, '12345-1234')).toEqual(true);
+ expect($.validator.methods['validate-zip-us']
+ .call($.validator.prototype, '02345')).toEqual(true);
+ expect($.validator.methods['validate-zip-us']
+ .call($.validator.prototype, '1234')).toEqual(false);
+ expect($.validator.methods['validate-zip-us']
+ .call($.validator.prototype, '1234-1234')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-date-au', function () {
+ it('validate-date-au', function () {
+ expect($.validator.methods['validate-date-au']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-date-au']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-date-au']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-date-au']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-date-au']
+ .call($.validator.prototype, '01/01/2012')).toEqual(true);
+ expect($.validator.methods['validate-date-au']
+ .call($.validator.prototype, '30/01/2012')).toEqual(true);
+ expect($.validator.methods['validate-date-au']
+ .call($.validator.prototype, '01/30/2012')).toEqual(false);
+ expect($.validator.methods['validate-date-au']
+ .call($.validator.prototype, '1/1/2012')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-currency-dollar', function () {
+ it('validate-currency-dollar', function () {
+ expect($.validator.methods['validate-currency-dollar']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-currency-dollar']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-currency-dollar']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-currency-dollar']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-currency-dollar']
+ .call($.validator.prototype, '$123')).toEqual(true);
+ expect($.validator.methods['validate-currency-dollar']
+ .call($.validator.prototype, '$1,123.00')).toEqual(true);
+ expect($.validator.methods['validate-currency-dollar']
+ .call($.validator.prototype, '$1234')).toEqual(true);
+ expect($.validator.methods['validate-currency-dollar']
+ .call($.validator.prototype, '$1234.1234')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-not-negative-number', function () {
+ it('validate-not-negative-number', function () {
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, '0')).toEqual(true);
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, '1')).toEqual(true);
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, '1234')).toEqual(true);
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, '1,234.1234')).toEqual(true);
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, '-1')).toEqual(false);
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, '-1e')).toEqual(false);
+ expect($.validator.methods['validate-not-negative-number']
+ .call($.validator.prototype, '-1,234.1234')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-greater-than-zero', function () {
+ it('validate-greater-than-zero', function () {
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, '0')).toEqual(false);
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, '1')).toEqual(true);
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, '1234')).toEqual(true);
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, '1,234.1234')).toEqual(true);
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, '-1')).toEqual(false);
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, '-1e')).toEqual(false);
+ expect($.validator.methods['validate-greater-than-zero']
+ .call($.validator.prototype, '-1,234.1234')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-css-length', function () {
+ it('validate-css-length', function () {
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, null)).toEqual(false);
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, undefined)).toEqual(false);
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, '0')).toEqual(true);
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, '1')).toEqual(true);
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, '1234')).toEqual(true);
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, '1,234.1234')).toEqual(false);
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, '-1')).toEqual(false);
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, '-1e')).toEqual(false);
+ expect($.validator.methods['validate-css-length']
+ .call($.validator.prototype, '-1,234.1234')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-data', function () {
+ it('validate-data', function () {
+ expect($.validator.methods['validate-data']
+ .call($.validator.prototype, '')).toEqual(true);
+ expect($.validator.methods['validate-data']
+ .call($.validator.prototype, null)).toEqual(true);
+ expect($.validator.methods['validate-data']
+ .call($.validator.prototype, undefined)).toEqual(true);
+ expect($.validator.methods['validate-data']
+ .call($.validator.prototype, ' ')).toEqual(false);
+ expect($.validator.methods['validate-data']
+ .call($.validator.prototype, '123abc')).toEqual(false);
+ expect($.validator.methods['validate-data']
+ .call($.validator.prototype, 'abc')).toEqual(true);
+ expect($.validator.methods['validate-data']
+ .call($.validator.prototype, ' abc')).toEqual(false);
+ expect($.validator.methods['validate-data']
+ .call($.validator.prototype, 'abc123')).toEqual(true);
+ expect($.validator.methods['validate-data']
+ .call($.validator.prototype, 'abc-123')).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-one-required-by-name', function () {
+ it('validate-one-required-by-name', function () {
+ var radio = $(''),
+ radio2 = $(''),
+ checkbox = $(''),
+ checkbox2 = $(''),
+ $test = $(''),
+ prevForm = $.validator.prototype.currentForm;
+
+ $.validator.prototype.currentForm = $test[0];
+
+ $test.append(radio);
+ expect($.validator.methods['validate-one-required-by-name']
+ .call($.validator.prototype, null, radio[0], true)).toEqual(false);
+ $test.append(radio2);
+ expect($.validator.methods['validate-one-required-by-name']
+ .call($.validator.prototype, null, radio2[0], true)).toEqual(true);
+ $test.append(checkbox);
+ expect($.validator.methods['validate-one-required-by-name']
+ .call($.validator.prototype, null, checkbox[0], true)).toEqual(false);
+ $test.append(checkbox2);
+ expect($.validator.methods['validate-one-required-by-name']
+ .call($.validator.prototype, null, checkbox2[0], true)).toEqual(true);
+
+ $.validator.prototype.currentForm = prevForm;
+ });
+ });
+
+ describe('Testing less-than-equals-to', function () {
+ it('less-than-equals-to', function () {
+ var elm1 = $(''),
+ elm2 = $(''),
+ elm3 = $(''),
+ elm4 = $(''),
+ elm5 = $(''),
+ elm6 = $(''),
+ elm7 = $(''),
+ elm8 = $('');
+
+ expect($.validator.methods['less-than-equals-to']
+ .call($.validator.prototype, elm1[0].value, elm1, elm2)).toEqual(false);
+ elm1[0].value = 4;
+ expect($.validator.methods['less-than-equals-to']
+ .call($.validator.prototype, elm1[0].value, elm1, elm2)).toEqual(true);
+ expect($.validator.methods['less-than-equals-to']
+ .call($.validator.prototype, elm3[0].value, elm3, elm4)).toEqual(true);
+ expect($.validator.methods['less-than-equals-to']
+ .call($.validator.prototype, elm5[0].value, elm5, elm6)).toEqual(true);
+ expect($.validator.methods['less-than-equals-to']
+ .call($.validator.prototype, elm7[0].value, elm7, elm8)).toEqual(true);
+ });
+ });
+
+ describe('Testing greater-than-equals-to', function () {
+ it('greater-than-equals-to', function () {
+ var elm1 = $(''),
+ elm2 = $(''),
+ elm3 = $(''),
+ elm4 = $(''),
+ elm5 = $(''),
+ elm6 = $(''),
+ elm7 = $(''),
+ elm8 = $('');
+
+ expect($.validator.methods['greater-than-equals-to']
+ .call($.validator.prototype, elm1[0].value, elm1, elm2)).toEqual(false);
+ elm1[0].value = 9;
+ expect($.validator.methods['greater-than-equals-to']
+ .call($.validator.prototype, elm1[0].value, elm1, elm2)).toEqual(true);
+ expect($.validator.methods['greater-than-equals-to']
+ .call($.validator.prototype, elm3[0].value, elm3, elm4)).toEqual(true);
+ expect($.validator.methods['greater-than-equals-to']
+ .call($.validator.prototype, elm5[0].value, elm5, elm6)).toEqual(true);
+ expect($.validator.methods['greater-than-equals-to']
+ .call($.validator.prototype, elm7[0].value, elm7, elm8)).toEqual(true);
+ });
+ });
+
+ describe('Testing validate-cc-type-select', function () {
+ it('validate-cc-type-select', function () {
+ var visaValid = $(''),
+ visaInvalid = $(''),
+ mcValid = $(''),
+ mcInvalid = $(''),
+ aeValid = $(''),
+ aeInvalid = $(''),
+ diValid = $(''),
+ diInvalid = $(''),
+ dnValid = $(''),
+ dnInvalid = $(''),
+ jcbValid = $(''),
+ jcbInvalid = $('');
+
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'VI', null, visaValid)).toEqual(true);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'VI', null, visaInvalid)).toEqual(false);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'MC', null, mcValid)).toEqual(true);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'MC', null, mcInvalid)).toEqual(false);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'AE', null, aeValid)).toEqual(true);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'AE', null, aeInvalid)).toEqual(false);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'DI', null, diValid)).toEqual(true);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'DI', null, diInvalid)).toEqual(false);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'DN', null, dnValid)).toEqual(true);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'DN', null, dnInvalid)).toEqual(false);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'JCB', null, jcbValid)).toEqual(true);
+ expect($.validator.methods['validate-cc-type-select']
+ .call($.validator.prototype, 'JCB', null, jcbInvalid)).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-cc-number', function () {
+ it('validate-cc-number', function () {
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '4916835098995909', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '5265071363284878', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6011120623356953', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '371293266574617', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '4916835098995901', null, null)).toEqual(false);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '5265071363284870', null, null)).toEqual(false);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6011120623356951', null, null)).toEqual(false);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '371293266574619', null, null)).toEqual(false);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '2221220000000003', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '2721220000000008', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '601109020000000003', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6011111144444444', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6011222233334444', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6011522233334447', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '601174455555553', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6011745555555550', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '601177455555556', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '601182455555556', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '601187999555558', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '601287999555556', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6444444444444443', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6644444444444441', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '3044444444444444', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '3064444444444449', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '3095444444444442', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '3096444444444441', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '3696444444444445', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '3796444444444444', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '3896444444444443', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '3528444444444449', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '3529444444444448', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6221262244444440', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6229981111111111', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6249981111111117', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6279981111111110', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6282981111111115', null, null)).toEqual(true);
+ expect($.validator.methods['validate-cc-number']
+ .call($.validator.prototype, '6289981111111118', null, null)).toEqual(true);
+ });
+ });
+
+ describe('Testing validate-cc-type', function () {
+ it('validate-cc-type', function () {
+ var select = $('');
+
+ select.val('VI');
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '4916835098995909', null, select)).toEqual(true);
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '5265071363284878', null, select)).toEqual(false);
+
+ select.val('MC');
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '5265071363284878', null, select)).toEqual(true);
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '4916835098995909', null, select)).toEqual(false);
+
+ select.val('AE');
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '371293266574617', null, select)).toEqual(true);
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '5265071363284878', null, select)).toEqual(false);
+
+ select.val('DI');
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '6011050000000009', null, select)).toEqual(true);
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '371293266574617', null, select)).toEqual(false);
+
+ select.val('DN');
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '3095434000000001', null, select)).toEqual(true);
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '6011050000000009', null, select)).toEqual(false);
+
+ select.val('JCB');
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '3528000000000007', null, select)).toEqual(true);
+ expect($.validator.methods['validate-cc-type']
+ .call($.validator.prototype, '3095434000000001', null, select)).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-cc-exp', function () {
+ it('validate-cc-exp', function () {
+ var year = $(''),
+ currentTime = new Date(),
+ currentMonth = currentTime.getMonth() + 1,
+ currentYear = currentTime.getFullYear();
+
+ year.val(currentYear);
+
+ if (currentMonth > 1) {
+ expect($.validator.methods['validate-cc-exp']
+ .call($.validator.prototype, currentMonth - 1, null, year)).toEqual(false);
+ }
+ expect($.validator.methods['validate-cc-exp']
+ .call($.validator.prototype, currentMonth, null, year)).toEqual(true);
+ year.val(currentYear + 1);
+ expect($.validator.methods['validate-cc-exp']
+ .call($.validator.prototype, currentMonth, null, year)).toEqual(true);
+ });
+ });
+
+ describe('Testing validate-cc-cvn', function () {
+ it('validate-cc-cvn', function () {
+ var ccType = $('');
+
+ ccType.val('VI');
+ expect($.validator.methods['validate-cc-cvn']
+ .call($.validator.prototype, '123', null, ccType)).toEqual(true);
+ expect($.validator.methods['validate-cc-cvn']
+ .call($.validator.prototype, '1234', null, ccType)).toEqual(false);
+
+ ccType.val('MC');
+ expect($.validator.methods['validate-cc-cvn']
+ .call($.validator.prototype, '123', null, ccType)).toEqual(true);
+ expect($.validator.methods['validate-cc-cvn']
+ .call($.validator.prototype, '1234', null, ccType)).toEqual(false);
+
+ ccType.val('AE');
+ expect($.validator.methods['validate-cc-cvn']
+ .call($.validator.prototype, '1234', null, ccType)).toEqual(true);
+ expect($.validator.methods['validate-cc-cvn']
+ .call($.validator.prototype, '123', null, ccType)).toEqual(false);
+
+ ccType.val('DI');
+ expect($.validator.methods['validate-cc-cvn']
+ .call($.validator.prototype, '123', null, ccType)).toEqual(true);
+ expect($.validator.methods['validate-cc-cvn']
+ .call($.validator.prototype, '1234', null, ccType)).toEqual(false);
+ });
+ });
+
+ describe('Testing validate-number-range', function () {
+ it('validate-number-range', function () {
+ var el1 = $('').get(0);
+
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '-1', null, null)).toEqual(true);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '1', null, null)).toEqual(true);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '', null, null)).toEqual(true);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, null, null, null)).toEqual(true);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '0', null, null)).toEqual(true);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, 'asds', null, null)).toEqual(false);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '10', null, '10-20.06')).toEqual(true);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '15', null, '10-20.06')).toEqual(true);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '1', null, '10-20.06')).toEqual(false);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '30', null, '10-20.06')).toEqual(false);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '10', el1, null)).toEqual(true);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '15', el1, null)).toEqual(true);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '1', el1, null)).toEqual(false);
+ expect($.validator.methods['validate-number-range']
+ .call($.validator.prototype, '30', el1, null)).toEqual(true);
+ });
+ });
+
+ describe('Testing validate-digits-range', function () {
+ it('validate-digits-range', function () {
+ var el1 = $('').get(0);
+
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '-1', null, null)).toEqual(true);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '1', null, null)).toEqual(true);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '', null, null)).toEqual(true);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, null, null, null)).toEqual(true);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '0', null, null)).toEqual(true);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, 'asds', null, null)).toEqual(false);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '10', null, '10-20')).toEqual(true);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '15', null, '10-20')).toEqual(true);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '1', null, '10-20')).toEqual(false);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '30', null, '10-20')).toEqual(false);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '30', null, '10-20.06')).toEqual(false);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '10', el1, null)).toEqual(true);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '15', el1, null)).toEqual(true);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '1', el1, null)).toEqual(false);
+ expect($.validator.methods['validate-digits-range']
+ .call($.validator.prototype, '30', el1, null)).toEqual(false);
+ });
+ });
+
+ describe('Testing 3 bytes characters only policy (UTF-8)', function () {
+ it('rejects data, if any of the characters cannot be stored using UTF-8 collation', function () {
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, '😅😂', null
+ )).toEqual(false);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, '😅 test 😂', null
+ )).toEqual(false);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, '💩 👻 💀', null
+ )).toEqual(false);
+ });
+
+ it('approves data, if all the characters can be stored using UTF-8 collation', function () {
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, '', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, '!$-_%ç&#?!', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, '1234567890', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, ' ', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'test', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'испытание', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'тест', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'փորձարկում', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'परीक्षण', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'テスト', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, '테스트', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, '测试', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, '測試', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'ทดสอบ', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'δοκιμή', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'اختبار', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'تست', null
+ )).toEqual(true);
+ expect($.validator.methods['validate-no-utf8mb4-characters'].call(
+ $.validator.prototype, 'מִבְחָן', null
+ )).toEqual(true);
+ });
+ });
});
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
index c696881588567..1b4fb53c45010 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
@@ -25,7 +25,7 @@ class ZeroUnitsSniff implements Sniff
const CSS_PROPERTY_UNIT_REM = 'rem';
/**
- * List of available CSS Propery units
+ * List of available CSS Property units
*
* @var array
*/
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php
index deed829838936..e62c4112553b6 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php
@@ -44,9 +44,9 @@ protected function buildModulesDependencies()
$moduleName = str_replace('/', '_', $moduleName[1]);
$config = simplexml_load_file($configFile);
$result = $config->xpath("/config/module/depends/module") ?: [];
- while (list(, $node) = each($result)) {
+ foreach ($result as $node) {
/** @var \SimpleXMLElement $node */
- $this->moduleDependencies[$moduleName][] = (string)$node['name'];
+ $this->moduleDependencies[$moduleName][] = (string) $node['name'];
}
}
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index 6752a98e38080..add61e6722227 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -336,7 +336,8 @@ public function testComponentPathsInRoot()
"If there are any component paths specified, then they must be reflected in 'replace' section"
);
$flat = $this->getFlatPathsInfo(self::$rootJson['extra']['component_paths']);
- while (list(, list($component, $path)) = each($flat)) {
+ foreach ($flat as $item) {
+ list($component, $path) = $item;
$this->assertFileExists(
self::$root . '/' . $path,
"Missing or invalid component path: {$component} -> {$path}"
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
index 620b6ad21bf75..505d3e5c3270b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
@@ -31,7 +31,7 @@ class ControllerAclTest extends \PHPUnit\Framework\TestCase
*
* @var array
*/
- private $whiteListetBackendControllers = [];
+ private $whiteListedBackendControllers = [];
/**
* List of ACL resources collected from acl.xml files.
@@ -57,7 +57,7 @@ protected function setUp()
if (substr($item, 0, 1) === '#') {
continue;
}
- $this->whiteListetBackendControllers[$item] = 1;
+ $this->whiteListedBackendControllers[$item] = 1;
}
}
@@ -83,7 +83,7 @@ public function testAcl()
$controllerClass = $this->getClassByFilePath($controllerPath);
// skip whitelisted controllers.
- if (isset($this->whiteListetBackendControllers[$controllerClass->getName()])) {
+ if (isset($this->whiteListedBackendControllers[$controllerClass->getName()])) {
continue;
}
// we don't have to check abstract classes.
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
index 22ac7a34ce81e..56d00bc725dbd 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
@@ -31,13 +31,24 @@ class PublicCodeTest extends \PHPUnit\Framework\TestCase
*/
public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
{
+ // A block can be whitelisted and thus not be required to be public
+ $whiteListFiles = str_replace('\\', '/', realpath(__DIR__))
+ . '/_files/whitelist/public_code*.txt';
+ $whiteListBlocks = [];
+ foreach (glob($whiteListFiles) as $fileName) {
+ $whiteListBlocks = array_merge(
+ $whiteListBlocks,
+ file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+ );
+ }
+
$nonPublishedBlocks = [];
$xml = simplexml_load_file($layoutFile);
$elements = $xml->xpath('//block | //referenceBlock') ?: [];
/** @var $node \SimpleXMLElement */
foreach ($elements as $node) {
$class = (string) $node['class'];
- if ($class && \class_exists($class)) {
+ if ($class && \class_exists($class) && !in_array($class, $whiteListBlocks)) {
$reflection = (new \ReflectionClass($class));
if (strpos($reflection->getDocComment(), '@api') === false) {
$nonPublishedBlocks[] = $class;
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 2d115b29a42f0..7c0329153d6e0 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -2526,5 +2526,6 @@
['getDataFormTab', 'Magento\Backend\Test\Block\Widget\Tab', 'Magento\Ui\Test\Block\Adminhtml\AbstractContainer::getFieldsData'],
['getBunchImages', 'Magento\CatalogImportExport\Model\Import\Product'],
['_isAttributeValueEmpty', 'Magento\Catalog\Model\ResourceModel\AbstractResource'],
- ['var_dump', '']
+ ['var_dump', ''],
+ ['each', ''],
];
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php b/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php
index 34531b6b7c658..fac14af5ecab8 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php
@@ -27,16 +27,14 @@ public function testXssSensitiveOutput()
* Static test will cover the following cases:
*
* 1. /\* @noEscape \*\/ before output. Output doesn't require escaping. Test is green.
- * 2. /\* @escapeNotVerified \*\/ before output. Output escaping is not checked and
- * should be verified. Test is green.
- * 3. Methods which contains "html" in their names (e.g. echo $object->{suffix}Html{postfix}() ).
+ * 2. Methods which contains "html" in their names (e.g. echo $object->{suffix}Html{postfix}() ).
* Data is ready for the HTML output. Test is green.
- * 4. AbstractBlock methods escapeHtml, escapeUrl, escapeQuote, escapeXssInUrl are allowed. Test is green.
- * 5. Type casting and php function count() are allowed
+ * 3. AbstractBlock methods escapeHtml, escapeUrl, escapeQuote, escapeXssInUrl are allowed. Test is green.
+ * 4. Type casting and php function count() are allowed
* (e.g. echo (int)$var, echo (float)$var, echo (bool)$var, echo count($var)). Test is green.
- * 6. Output in single quotes (e.g. echo 'some text'). Test is green.
- * 7. Output in double quotes without variables (e.g. echo "some text"). Test is green.
- * 8. Other of p.1-7. Output is not escaped. Test is red.
+ * 5. Output in single quotes (e.g. echo 'some text'). Test is green.
+ * 6. Output in double quotes without variables (e.g. echo "some text"). Test is green.
+ * 7. Other of p.1-6. Output is not escaped. Test is red.
*
* @param string $file
*/
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php b/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
index d7a92460a7f4d..dab0650fc7f6e 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
@@ -97,7 +97,7 @@ public function getExtensibleInterfaceName($extensibleClassName)
}
$modelReflection = new \ReflectionClass($extensibleClassName);
if ($modelReflection->isInterface()
- && $modelReflection->isSubClassOf(self::EXTENSIBLE_INTERFACE_NAME)
+ && $modelReflection->isSubclassOf(self::EXTENSIBLE_INTERFACE_NAME)
&& $modelReflection->hasMethod('getExtensionAttributes')
) {
$this->classInterfaceMap[$extensibleClassName] = $extensibleClassName;
diff --git a/lib/internal/Magento/Framework/App/State/CleanupFiles.php b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
index 4202fd8883ec0..c95caf8310b77 100644
--- a/lib/internal/Magento/Framework/App/State/CleanupFiles.php
+++ b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
@@ -106,7 +106,7 @@ private function emptyDir($code, $subPath = null)
$messages[] = $dirPath . $path;
try {
$dir->delete($path);
- } catch (FilesystemException $e) {
+ } catch (FileSystemException $e) {
$messages[] = $e->getMessage();
}
}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
index 4348177ef326f..f4560ed31ae49 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
@@ -47,7 +47,7 @@ public function testGetTagsForNotObject()
public function testGetTagsForObject()
{
$strategyReturnValue = ['test tag'];
- $object = new \StdClass;
+ $object = new \stdClass;
$this->strategy->expects($this->once())
->method('getTags')
->with($object)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
index e8c76048f4eac..ad04326064587 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
@@ -28,7 +28,7 @@ public function testGetTagsWithObject()
{
$emptyArray = [];
- $this->assertEquals($emptyArray, $this->model->getTags(new \StdClass));
+ $this->assertEquals($emptyArray, $this->model->getTags(new \stdClass));
$identityInterface = $this->getMockForAbstractClass(\Magento\Framework\DataObject\IdentityInterface::class);
$this->assertEquals($emptyArray, $this->model->getTags($identityInterface));
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
index 7f570d9f13523..8964bd70f0ba8 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
@@ -55,7 +55,7 @@ public function testGetStrategyWithScalar()
public function testGetStrategyWithObject()
{
- $this->assertEquals($this->dummyStrategy, $this->model->getStrategy(new \StdClass));
+ $this->assertEquals($this->dummyStrategy, $this->model->getStrategy(new \stdClass));
}
public function testGetStrategyWithIdentityInterface()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
index e2039c0517c53..d0fcf9d8a739d 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
@@ -28,7 +28,7 @@ public function testGetWithScalar()
public function testGetTagsWithObject()
{
- $this->assertEquals([], $this->model->getTags(new \StdClass));
+ $this->assertEquals([], $this->model->getTags(new \stdClass));
}
public function testGetTagsWithIdentityInterface()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
index 450e1ed0b3a00..66eee671e17d3 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
@@ -363,7 +363,7 @@ public function testIsSafeMethodTrue($httpMethod)
{
$this->_model = $this->getModel();
$_SERVER['REQUEST_METHOD'] = $httpMethod;
- $this->assertEquals(true, $this->_model->IsSafeMethod());
+ $this->assertEquals(true, $this->_model->isSafeMethod());
}
/**
@@ -375,7 +375,7 @@ public function testIsSafeMethodFalse($httpMethod)
{
$this->_model = $this->getModel();
$_SERVER['REQUEST_METHOD'] = $httpMethod;
- $this->assertEquals(false, $this->_model->IsSafeMethod());
+ $this->assertEquals(false, $this->_model->isSafeMethod());
}
public function httpSafeMethodProvider()
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php
index c867e39032e1e..800cd2851eb66 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php
@@ -131,7 +131,7 @@ public function __construct(
$this->_arrayVariable = $arrayVariable;
}
}
-class ThirdClassForParentCall extends firstClassForParentCall
+class ThirdClassForParentCall extends FirstClassForParentCall
{
/**
* @var stdClass
@@ -154,7 +154,7 @@ public function __construct(\stdClass $stdClassObject, \ClassExtendsDefaultPhpTy
$this->_secondClass = $secondClass;
}
}
-class WrongArgumentsOrder extends firstClassForParentCall
+class WrongArgumentsOrder extends FirstClassForParentCall
{
/**
* @var stdClass
@@ -177,7 +177,7 @@ public function __construct(\stdClass $stdClassObject, \ClassExtendsDefaultPhpTy
$this->_secondClass = $secondClass;
}
}
-class ArgumentsOnSeparateLines extends firstClassForParentCall
+class ArgumentsOnSeparateLines extends FirstClassForParentCall
{
/**
* @var stdClass
diff --git a/lib/internal/Magento/Framework/Controller/Result/Redirect.php b/lib/internal/Magento/Framework/Controller/Result/Redirect.php
index d68caeb3e4409..120b18d873cff 100644
--- a/lib/internal/Magento/Framework/Controller/Result/Redirect.php
+++ b/lib/internal/Magento/Framework/Controller/Result/Redirect.php
@@ -9,6 +9,8 @@
use Magento\Framework\App;
use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
use Magento\Framework\Controller\AbstractResult;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\UrlInterface;
/**
* In many cases controller actions may result in a redirect
@@ -18,13 +20,14 @@
*/
class Redirect extends AbstractResult
{
+
/**
- * @var \Magento\Framework\App\Response\RedirectInterface
+ * @var RedirectInterface
*/
protected $redirect;
/**
- * @var \Magento\Framework\UrlInterface
+ * @var UrlInterface
*/
protected $urlBuilder;
@@ -37,11 +40,11 @@ class Redirect extends AbstractResult
* Constructor
*
* @param App\Response\RedirectInterface $redirect
- * @param \Magento\Framework\UrlInterface $urlBuilder
+ * @param UrlInterface $urlBuilder
*/
public function __construct(
App\Response\RedirectInterface $redirect,
- \Magento\Framework\UrlInterface $urlBuilder
+ UrlInterface $urlBuilder
) {
$this->redirect = $redirect;
$this->urlBuilder = $urlBuilder;
@@ -70,6 +73,7 @@ public function setRefererOrBaseUrl()
}
/**
+ * URL Setter
* @param string $url
* @return $this
*/
@@ -97,7 +101,11 @@ public function setPath($path, array $params = [])
*/
protected function render(HttpResponseInterface $response)
{
- $response->setRedirect($this->url);
+ if (empty($this->httpResponseCode)) {
+ $response->setRedirect($this->url);
+ } else {
+ $response->setRedirect($this->url, $this->httpResponseCode);
+ }
return $this;
}
}
diff --git a/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php b/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
index 0295f0713d429..65e7ee489e84c 100644
--- a/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
+++ b/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
@@ -6,10 +6,13 @@
namespace Magento\Framework\Controller\Test\Unit\Result;
-use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use \PHPUnit\Framework\TestCase;
+use \Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use \Magento\Framework\App\Response\RedirectInterface;
use \Magento\Framework\Controller\Result\Redirect;
+use \Magento\Framework\UrlInterface;
-class RedirectTest extends \PHPUnit\Framework\TestCase
+class RedirectTest extends TestCase
{
/** @var \Magento\Framework\Controller\Result\Redirect */
protected $redirect;
@@ -28,9 +31,9 @@ class RedirectTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
- $this->redirectInterface = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
- $this->urlBuilder = $this->createMock(\Magento\Framework\UrlInterface::class);
- $this->urlInterface = $this->createMock(\Magento\Framework\UrlInterface::class);
+ $this->redirectInterface = $this->createMock(RedirectInterface::class);
+ $this->urlBuilder = $this->createMock(UrlInterface::class);
+ $this->urlInterface = $this->createMock(UrlInterface::class);
$this->response = $this->createMock(HttpResponseInterface::class);
$this->redirect = new Redirect($this->redirectInterface, $this->urlInterface);
}
@@ -39,7 +42,7 @@ public function testSetRefererUrl()
{
$this->redirectInterface->expects($this->once())->method('getRefererUrl');
$this->assertInstanceOf(
- \Magento\Framework\Controller\Result\Redirect::class,
+ Redirect::class,
$this->redirect->setRefererUrl()
);
}
@@ -48,7 +51,7 @@ public function testSetRefererOrBaseUrl()
{
$this->redirectInterface->expects($this->once())->method('getRedirectUrl');
$this->assertInstanceOf(
- \Magento\Framework\Controller\Result\Redirect::class,
+ Redirect::class,
$this->redirect->setRefererOrBaseUrl()
);
}
@@ -56,7 +59,7 @@ public function testSetRefererOrBaseUrl()
public function testSetUrl()
{
$url = 'http://test.com';
- $this->assertInstanceOf(\Magento\Framework\Controller\Result\Redirect::class, $this->redirect->setUrl($url));
+ $this->assertInstanceOf(Redirect::class, $this->redirect->setUrl($url));
}
public function testSetPath()
@@ -67,17 +70,36 @@ public function testSetPath()
$this->returnValue($params)
);
$this->assertInstanceOf(
- \Magento\Framework\Controller\Result\Redirect::class,
+ Redirect::class,
$this->redirect->setPath($path, $params)
);
}
- public function testRender()
+ public function httpRedirectResponseStatusCodes()
{
- $this->response->expects($this->once())->method('setRedirect');
- $this->assertInstanceOf(
- \Magento\Framework\Controller\Result\Redirect::class,
- $this->redirect->renderResult($this->response)
- );
+ return [
+ [302, null],
+ [302, 302],
+ [303, 303]
+ ];
+ }
+
+ /**
+ * @param int $expectedStatusCode
+ * @param int|null $actualStatusCode
+ * @dataProvider httpRedirectResponseStatusCodes
+ */
+ public function testRender($expectedStatusCode, $actualStatusCode)
+ {
+ $url = 'http://test.com';
+ $this->redirect->setUrl($url);
+ $this->redirect->setHttpResponseCode($actualStatusCode);
+
+ $this->response
+ ->expects($this->once())
+ ->method('setRedirect')
+ ->with($url, $expectedStatusCode);
+
+ $this->redirect->renderResult($this->response);
}
}
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
index 9871df1b16841..5176c85cfa702 100644
--- a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
+++ b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
@@ -113,7 +113,7 @@ public function __construct(
public function current()
{
if (null === $this->currentSelect) {
- $this->isValid = ($this->currentOffset + $this->batchSize) <= $this->totalItemCount;
+ $this->isValid = $this->currentOffset < $this->totalItemCount;
$this->currentSelect = $this->initSelectObject();
}
return $this->currentSelect;
@@ -144,7 +144,7 @@ public function next()
if (null === $this->currentSelect) {
$this->current();
}
- $this->isValid = ($this->batchSize + $this->currentOffset) <= $this->totalItemCount;
+ $this->isValid = $this->currentOffset < $this->totalItemCount;
$select = $this->initSelectObject();
if ($this->isValid) {
$this->iteration++;
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index b0b31fa3751a8..f8b82d3122234 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -492,7 +492,7 @@ public function clear()
*
* Returns array with results of callback for each item
*
- * @param string $callback
+ * @param callable $callback
* @param array $args
* @return array
*/
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
index 58e6378759010..e91ec72dae112 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
@@ -40,7 +40,7 @@ public function testOffsets()
$this->assertSame($this->collection->offsetExists('node1'), true);
$this->collection->offsetSet('node1', 'Hello');
$this->assertSame($this->collection->offsetExists('node1'), true);
- $this->assertSame($this->collection->offsetget('node1'), 'Hello');
+ $this->assertSame($this->collection->offsetGet('node1'), 'Hello');
$this->collection->offsetUnset('node1');
$this->assertSame($this->collection->offsetExists('node1'), false);
}
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index c3316db7be016..07de9941271c3 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -201,7 +201,7 @@ public function save($destinationFolder, $newFileName = null)
if ($this->_enableFilesDispersion) {
$fileName = $this->correctFileNameCase($fileName);
$this->setAllowCreateFolders(true);
- $this->_dispretionPath = self::getDispretionPath($fileName);
+ $this->_dispretionPath = self::getDispersionPath($fileName);
$destinationFile .= $this->_dispretionPath;
$this->_createDestinationFolder($destinationFile);
}
@@ -610,8 +610,20 @@ public static function getNewFileName($destinationFile)
*
* @param string $fileName
* @return string
+ * @deprecated
*/
public static function getDispretionPath($fileName)
+ {
+ return self::getDispersionPath($fileName);
+ }
+
+ /**
+ * Get dispertion path
+ *
+ * @param string $fileName
+ * @return string
+ */
+ public static function getDispersionPath($fileName)
{
$char = 0;
$dispertionPath = '';
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php
new file mode 100644
index 0000000000000..1cc47bb0db12e
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php
@@ -0,0 +1,53 @@
+isSafe = $isSafe;
+ parent::__construct($phrase, $cause, $code);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function isClientSafe()
+ {
+ return $this->isSafe;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getCategory()
+ {
+ return self::EXCEPTION_CATEGORY;
+ }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
index a72a70bb5035b..b05120f47938a 100644
--- a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
@@ -14,6 +14,8 @@
*/
class GraphQlInputException extends InputException implements \GraphQL\Error\ClientAware
{
+ const EXCEPTION_CATEGORY = 'graphql-input';
+
/**
* @var boolean
*/
@@ -46,6 +48,6 @@ public function isClientSafe()
*/
public function getCategory()
{
- return 'graphql-input';
+ return self::EXCEPTION_CATEGORY;
}
}
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php
new file mode 100644
index 0000000000000..26bfddecc3376
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php
@@ -0,0 +1,53 @@
+isSafe = $isSafe;
+ parent::__construct($phrase, $cause, $code);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function isClientSafe()
+ {
+ return $this->isSafe;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getCategory()
+ {
+ return self::EXCEPTION_CATEGORY;
+ }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/ExceptionFormatter.php b/lib/internal/Magento/Framework/GraphQl/ExceptionFormatter.php
index ac7f62f70cf03..02e636e82061b 100644
--- a/lib/internal/Magento/Framework/GraphQl/ExceptionFormatter.php
+++ b/lib/internal/Magento/Framework/GraphQl/ExceptionFormatter.php
@@ -6,11 +6,38 @@
namespace Magento\Framework\GraphQl;
+use Magento\Framework\App\State;
+use Magento\Framework\Webapi\ErrorProcessor;
+use Psr\Log\LoggerInterface;
+
/**
* Wrapper for GraphQl Exception Formatter
*/
class ExceptionFormatter
{
+ const HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS = 500;
+
+ /**
+ * @var State
+ */
+ private $appState;
+
+ /**
+ * @var LoggerInterface
+ */
+ private $logger;
+
+ /**
+ * @param State $appState
+ * @param ErrorProcessor $errorProcessor
+ */
+ public function __construct(State $appState, ErrorProcessor $errorProcessor, LoggerInterface $logger)
+ {
+ $this->appState = $appState;
+ $errorProcessor->registerShutdownFunction();
+ $this->logger = $logger;
+ }
+
/**
* Format a GraphQL error from an exception by converting it to array to conform to GraphQL spec.
*
@@ -18,13 +45,35 @@ class ExceptionFormatter
* (or when debug flags are passed).
*
* @param \Throwable $exception
- * @param bool|int $debug
* @param string $internalErrorMessage
* @return array
* @throws \Throwable
*/
- public function create(\Throwable $exception, $debug = false, $internalErrorMessage = null)
+ public function create(\Throwable $exception, $internalErrorMessage = null)
+ {
+ if (!$this->shouldShowDetail()) {
+ $reportId = uniqid("graph-ql-");
+ $message = "Report ID: {$reportId}; Message: {$exception->getMessage()}";
+ $code = $exception->getCode();
+ $loggedException = new \Exception($message, $code, $exception);
+ $this->logger->critical($loggedException);
+ }
+
+ return \GraphQL\Error\FormattedError::createFromException(
+ $exception,
+ $this->shouldShowDetail()
+ ? \GraphQL\Error\Debug::INCLUDE_DEBUG_MESSAGE | \GraphQL\Error\Debug::INCLUDE_TRACE : false,
+ $internalErrorMessage
+ );
+ }
+
+ /**
+ * Return true if detailed error message should be displayed to client, false otherwise.
+ *
+ * @return bool
+ */
+ public function shouldShowDetail()
{
- return \GraphQL\Error\FormattedError::createFromException($exception, $debug, $internalErrorMessage);
+ return $this->appState->getMode() === State::MODE_DEVELOPER;
}
}
diff --git a/lib/internal/Magento/Framework/GraphQl/QueryProcessor.php b/lib/internal/Magento/Framework/GraphQl/QueryProcessor.php
index 1b55208ba4533..33578c25455c7 100644
--- a/lib/internal/Magento/Framework/GraphQl/QueryProcessor.php
+++ b/lib/internal/Magento/Framework/GraphQl/QueryProcessor.php
@@ -13,6 +13,19 @@
*/
class QueryProcessor
{
+ /**
+ * @var ExceptionFormatter
+ */
+ private $exceptionFormatter;
+
+ /**
+ * @param ExceptionFormatter $exceptionFormatter
+ */
+ public function __construct(ExceptionFormatter $exceptionFormatter)
+ {
+ $this->exceptionFormatter = $exceptionFormatter;
+ }
+
/**
* Process a GraphQl query according to defined schema
*
@@ -32,13 +45,16 @@ public function process(
$variableValues = null,
$operationName = null
) {
- return \GraphQL\GraphQL::execute(
+ return \GraphQL\GraphQL::executeQuery(
$schema,
$source,
$rootValue,
$contextValue,
$variableValues,
$operationName
+ )->toArray(
+ $this->exceptionFormatter->shouldShowDetail() ?
+ \GraphQL\Error\Debug::INCLUDE_DEBUG_MESSAGE | \GraphQL\Error\Debug::INCLUDE_TRACE : false
);
}
}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Input/InputObjectType.php b/lib/internal/Magento/Framework/GraphQl/Type/Input/InputObjectType.php
index ff0bf69d5ebfb..cc85a9e9fb752 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Input/InputObjectType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Input/InputObjectType.php
@@ -6,17 +6,28 @@
namespace Magento\Framework\GraphQl\Type\Input;
+use GraphQL\Type\Definition\InputType;
+use Magento\Framework\GraphQl\Config\Data\Field;
use Magento\Framework\GraphQl\Config\Data\Type as TypeStructure;
+use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
+use Magento\Framework\GraphQl\TypeFactory;
/**
* Class InputObjectType
*/
class InputObjectType extends \GraphQL\Type\Definition\InputObjectType
{
+ /**
+ * @var TypeFactory
+ */
+ private $typeFactory;
+
public function __construct(
InputMapper $inputMapper,
- TypeStructure $structure
+ TypeStructure $structure,
+ TypeFactory $typeFactory
) {
+ $this->typeFactory = $typeFactory;
$config = [
'name' => $structure->getName(),
'description' => $structure->getDescription()
@@ -29,6 +40,9 @@ public function __construct(
} else {
$type = $inputMapper->getFieldRepresentation($field->getType());
}
+
+ $type = $this->processIsNullable($field, $this->processIsList($field, $type));
+
$config['fields'][$field->getName()] = [
'name' => $field->getName(),
'type' => $type
@@ -36,4 +50,34 @@ public function __construct(
}
parent::__construct($config);
}
+
+ /**
+ * Return passed in type wrapped as a non null type if definition determines necessary.
+ *
+ * @param Field $field
+ * @param InputType $object
+ * @return TypeInterface|\GraphQL\Type\Definition\Type
+ */
+ private function processIsNullable(Field $field, InputType $object)
+ {
+ if ($field->isRequired()) {
+ return $this->typeFactory->createNonNull($object);
+ }
+ return $object;
+ }
+
+ /**
+ * Return passed in type wrapped as a list if definition determines necessary.
+ *
+ * @param Field $field
+ * @param InputType $object
+ * @return TypeInterface|\GraphQL\Type\Definition\Type
+ */
+ private function processIsList(Field $field, InputType $object)
+ {
+ if ($field->isList()) {
+ return $this->typeFactory->createList($object);
+ }
+ return $object;
+ }
}
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
index 444ab7113d429..365fa5939b6b5 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -62,7 +62,10 @@ public function open($filename)
throw new \OverflowException('Memory limit has been reached.');
}
$this->imageDestroy();
- $this->_imageHandler = call_user_func($this->_getCallback('create'), $this->_fileName);
+ $this->_imageHandler = call_user_func(
+ $this->_getCallback('create', null, sprintf('Unsupported image format. File: %s', $this->_fileName)),
+ $this->_fileName
+ );
}
/**
diff --git a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
index 50b9a5a013273..e0ead031a9ba0 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
@@ -77,7 +77,7 @@ public function open($filename)
try {
$this->_imageHandler = new \Imagick($this->_fileName);
} catch (\ImagickException $e) {
- throw new \Exception('Unsupported image format.', $e->getCode(), $e);
+ throw new \Exception(sprintf('Unsupported image format. File: %s', $this->_fileName), $e->getCode(), $e);
}
$this->backgroundColor();
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index 99b35509c4bad..020159985105d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -127,12 +127,12 @@ protected function createObject($type, $args)
protected function resolveArgument(&$argument, $paramType, $paramDefault, $paramName, $requestedType)
{
if ($paramType && $argument !== $paramDefault && !is_object($argument)) {
- $argumentType = $argument['instance'];
if (!isset($argument['instance']) || $argument !== (array)$argument) {
throw new \UnexpectedValueException(
'Invalid parameter configuration provided for $' . $paramName . ' argument of ' . $requestedType
);
}
+ $argumentType = $argument['instance'];
if (isset($argument['shared'])) {
$isShared = $argument['shared'];
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSample.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSample.php
new file mode 100644
index 0000000000000..1d78f9ed0a7d8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSample.php
@@ -0,0 +1,25 @@
+assertEquals("resNameMethodName", $this->_typeProcessor->getOperationName("resName", "methodName"));
}
+
+ /**
+ * Checks a case when method has only `@inheritdoc` annotation.
+ */
+ public function testGetReturnTypeWithInheritDocBlock()
+ {
+ $expected = [
+ 'type' => 'string',
+ 'isRequired' => true,
+ 'description' => null,
+ 'parameterCount' => 0
+ ];
+
+ $classReflection = new ClassReflection(TSample::class);
+ $methodReflection = $classReflection->getMethod('getPropertyName');
+
+ self::assertEquals($expected, $this->_typeProcessor->getGetterReturnType($methodReflection));
+ }
+
+ /**
+ * Checks a case when method and parent interface don't have `@return` annotation.
+ *
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage Getter return type must be specified using @return annotation. See Magento\Framework\Reflection\Test\Unit\Fixture\TSample::getName()
+ */
+ public function testGetReturnTypeWithoutReturnTag()
+ {
+ $classReflection = new ClassReflection(TSample::class);
+ $methodReflection = $classReflection->getMethod('getName');
+ $this->_typeProcessor->getGetterReturnType($methodReflection);
+ }
}
diff --git a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
index 5d6054056d35e..74c1bc95b208b 100644
--- a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
@@ -8,6 +8,7 @@
use Magento\Framework\Exception\SerializationException;
use Magento\Framework\Phrase;
use Zend\Code\Reflection\ClassReflection;
+use Zend\Code\Reflection\DocBlock\Tag\ReturnTag;
use Zend\Code\Reflection\DocBlockReflection;
use Zend\Code\Reflection\MethodReflection;
use Zend\Code\Reflection\ParameterReflection;
@@ -16,6 +17,7 @@
* Type processor of config reader properties
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) this suppress MUST be removed after removing deprecated methods.
*/
class TypeProcessor
{
@@ -275,22 +277,7 @@ protected function dataObjectGetterDescriptionToFieldDescription($shortDescripti
*/
public function getGetterReturnType($methodReflection)
{
- $methodDocBlock = $methodReflection->getDocBlock();
- if (!$methodDocBlock) {
- throw new \InvalidArgumentException(
- "Each getter must have description with @return annotation. "
- . "See {$methodReflection->getDeclaringClass()->getName()}::{$methodReflection->getName()}()"
- );
- }
- $returnAnnotations = $methodDocBlock->getTags('return');
- if (empty($returnAnnotations)) {
- throw new \InvalidArgumentException(
- "Getter return type must be specified using @return annotation. "
- . "See {$methodReflection->getDeclaringClass()->getName()}::{$methodReflection->getName()}()"
- );
- }
- /** @var \Zend\Code\Reflection\DocBlock\Tag\ReturnTag $returnAnnotation */
- $returnAnnotation = current($returnAnnotations);
+ $returnAnnotation = $this->getMethodReturnAnnotation($methodReflection);
$types = $returnAnnotation->getTypes();
$returnType = current($types);
$nullable = in_array('null', $types);
@@ -362,7 +349,7 @@ public function isTypeSimple($type)
self::NORMALIZED_INT_TYPE,
self::NORMALIZED_FLOAT_TYPE,
self::NORMALIZED_DOUBLE_TYPE,
- self::NORMALIZED_BOOLEAN_TYPE
+ self::NORMALIZED_BOOLEAN_TYPE,
]
);
}
@@ -708,4 +695,56 @@ private function getNormalizedType($type)
}
return $type;
}
+
+ /**
+ * Parses `return` annotation from reflection method.
+ *
+ * @param MethodReflection $methodReflection
+ * @return ReturnTag
+ * @throws \InvalidArgumentException if doc block is empty or `@return` annotation doesn't exist
+ */
+ private function getMethodReturnAnnotation(MethodReflection $methodReflection)
+ {
+ $methodName = $methodReflection->getName();
+ $returnAnnotations = $this->getReturnFromDocBlock($methodReflection);
+ if (empty($returnAnnotations)) {
+ // method can inherit doc block from implemented interface, like for interceptors
+ $implemented = $methodReflection->getDeclaringClass()->getInterfaces();
+ /** @var ClassReflection $parentClassReflection */
+ foreach ($implemented as $parentClassReflection) {
+ if ($parentClassReflection->hasMethod($methodName)) {
+ $returnAnnotations = $this->getReturnFromDocBlock(
+ $parentClassReflection->getMethod($methodName)
+ );
+ break;
+ }
+ }
+ // throw an exception if even implemented interface doesn't have return annotations
+ if (empty($returnAnnotations)) {
+ throw new \InvalidArgumentException(
+ "Getter return type must be specified using @return annotation. "
+ . "See {$methodReflection->getDeclaringClass()->getName()}::{$methodName}()"
+ );
+ }
+ }
+ return $returnAnnotations;
+ }
+
+ /**
+ * Parses `return` annotation from doc block.
+ *
+ * @param MethodReflection $methodReflection
+ * @return ReturnTag
+ */
+ private function getReturnFromDocBlock(MethodReflection $methodReflection)
+ {
+ $methodDocBlock = $methodReflection->getDocBlock();
+ if (!$methodDocBlock) {
+ throw new \InvalidArgumentException(
+ "Each getter must have a doc block. "
+ . "See {$methodReflection->getDeclaringClass()->getName()}::{$methodReflection->getName()}()"
+ );
+ }
+ return current($methodDocBlock->getTags('return'));
+ }
}
diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php
index 26ae1635f18f1..053bd3e7fd6b9 100644
--- a/lib/internal/Magento/Framework/Session/Config.php
+++ b/lib/internal/Magento/Framework/Session/Config.php
@@ -134,6 +134,14 @@ public function __construct(
$this->setSavePath($savePath);
}
+ /**
+ * Session save handler - memcache, files, etc
+ */
+ $saveHandler = $deploymentConfig->get(self::PARAM_SESSION_SAVE_METHOD);
+ if ($saveHandler) {
+ $this->setOption('session.save_handler', $saveHandler);
+ }
+
/**
* Session cache limiter
*/
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
index 66fc12b493090..12e28cdb3970d 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
@@ -350,33 +350,36 @@ public function constructorDataProvider()
true,
true,
[
- 'session.cache_limiter' => 'files',
+ 'session.cache_limiter' => 'private_no_expire',
'session.cookie_lifetime' => 7200,
'session.cookie_path' => '/',
'session.cookie_domain' => 'init.host',
'session.cookie_httponly' => false,
'session.cookie_secure' => false,
+ 'session.save_handler' => 'files'
],
],
'all invalid' => [
true,
false,
[
- 'session.cache_limiter' => 'files',
+ 'session.cache_limiter' => 'private_no_expire',
'session.cookie_httponly' => false,
'session.cookie_secure' => false,
+ 'session.save_handler' => 'files'
],
],
'invalid_valid' => [
false,
true,
[
- 'session.cache_limiter' => 'files',
+ 'session.cache_limiter' => 'private_no_expire',
'session.cookie_lifetime' => 3600,
'session.cookie_path' => '/',
'session.cookie_domain' => 'init.host',
'session.cookie_httponly' => false,
'session.cookie_secure' => false,
+ 'session.save_handler' => 'files'
],
],
];
@@ -429,14 +432,18 @@ protected function getModel($validator)
->will($this->returnValue($dirMock));
$deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
- $deploymentConfigMock->expects($this->at(0))
+ $deploymentConfigMock
->method('get')
- ->with(Config::PARAM_SESSION_SAVE_PATH)
- ->will($this->returnValue(null));
- $deploymentConfigMock->expects($this->at(1))
- ->method('get')
- ->with(Config::PARAM_SESSION_CACHE_LIMITER)
- ->will($this->returnValue('files'));
+ ->willReturnCallback(function ($configPath) {
+ switch ($configPath) {
+ case Config::PARAM_SESSION_SAVE_METHOD:
+ return 'files';
+ case Config::PARAM_SESSION_CACHE_LIMITER:
+ return 'private_no_expire';
+ default:
+ return null;
+ }
+ });
$this->config = $this->helper->getObject(
\Magento\Framework\Session\Config::class,
diff --git a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
index 22fdf0a05686a..9e2014c1b070a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
@@ -116,6 +116,6 @@ public function testIterations()
$iterations++;
}
- $this->assertEquals(10, $iterations);
+ $this->assertEquals(11, $iterations);
}
}
diff --git a/lib/internal/Magento/Framework/View/Context.php b/lib/internal/Magento/Framework/View/Context.php
index 0c3932ffe4bd7..c3f1c3e691c84 100644
--- a/lib/internal/Magento/Framework/View/Context.php
+++ b/lib/internal/Magento/Framework/View/Context.php
@@ -332,15 +332,11 @@ public function getModuleName()
}
/**
- * Retrieve the module name
- *
- * @return string
- *
- * @todo alias of getModuleName
+ * @see getModuleName
*/
public function getFrontName()
{
- return $this->getRequest()->getModuleName();
+ return $this->getModuleName();
}
/**
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php b/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php
index 826811b55b4bf..000fba24f0822 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ThemeList.php
@@ -234,7 +234,7 @@ protected function _prepareConfigurationData($themePackage)
$media = $themeConfig->getMedia();
$parentPathPieces = $themeConfig->getParentTheme();
- if (count($parentPathPieces) == 1) {
+ if (is_array($parentPathPieces) && count($parentPathPieces) == 1) {
$pathPieces = $pathData['theme_path_pieces'];
array_pop($pathPieces);
$parentPathPieces = array_merge($pathPieces, $parentPathPieces);
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
index ea80380865e6a..39cdec05a65ea 100755
--- a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
@@ -138,7 +138,7 @@