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/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/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);
+ });
+ });
});
diff --git a/lib/internal/Magento/Framework/App/Response/Http.php b/lib/internal/Magento/Framework/App/Response/Http.php
index 099b1500cb14b..62ff94e7043f5 100644
--- a/lib/internal/Magento/Framework/App/Response/Http.php
+++ b/lib/internal/Magento/Framework/App/Response/Http.php
@@ -9,10 +9,12 @@
use Magento\Framework\App\Http\Context;
use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\Cookie\CookieMetadata;
use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
use Magento\Framework\Stdlib\CookieManagerInterface;
use Magento\Framework\Stdlib\DateTime;
use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Session\Config\ConfigInterface;
class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
{
@@ -50,25 +52,33 @@ class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
*/
protected $dateTime;
+ /**
+ * @var \Magento\Framework\Session\Config\ConfigInterface
+ */
+ private $sessionConfig;
+
/**
* @param HttpRequest $request
* @param CookieManagerInterface $cookieManager
* @param CookieMetadataFactory $cookieMetadataFactory
* @param Context $context
* @param DateTime $dateTime
+ * @param ConfigInterface|null $sessionConfig
*/
public function __construct(
HttpRequest $request,
CookieManagerInterface $cookieManager,
CookieMetadataFactory $cookieMetadataFactory,
Context $context,
- DateTime $dateTime
+ DateTime $dateTime,
+ ConfigInterface $sessionConfig = null
) {
$this->request = $request;
$this->cookieManager = $cookieManager;
$this->cookieMetadataFactory = $cookieMetadataFactory;
$this->context = $context;
$this->dateTime = $dateTime;
+ $this->sessionConfig = $sessionConfig ?: ObjectManager::getInstance()->get(ConfigInterface::class);
}
/**
@@ -91,7 +101,10 @@ public function sendVary()
{
$varyString = $this->context->getVaryString();
if ($varyString) {
- $sensitiveCookMetadata = $this->cookieMetadataFactory->createSensitiveCookieMetadata()->setPath('/');
+ $cookieLifeTime = $this->sessionConfig->getCookieLifetime();
+ $sensitiveCookMetadata = $this->cookieMetadataFactory->createSensitiveCookieMetadata(
+ [CookieMetadata::KEY_DURATION => $cookieLifeTime]
+ )->setPath('/');
$this->cookieManager->setSensitiveCookie(self::COOKIE_VARY_STRING, $varyString, $sensitiveCookMetadata);
} elseif ($this->request->get(self::COOKIE_VARY_STRING)) {
$cookieMetadata = $this->cookieMetadataFactory->createSensitiveCookieMetadata()->setPath('/');
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
index 3215a82ffad5f..f9aed16ec6a44 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
@@ -8,6 +8,8 @@
use \Magento\Framework\App\Response\Http;
use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Session\Config\ConfigInterface;
+use Magento\Framework\Stdlib\Cookie\CookieMetadata;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -40,6 +42,12 @@ class HttpTest extends \PHPUnit\Framework\TestCase
/** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
protected $objectManager;
+ /** @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
+ private $sessionConfigMock;
+
+ /** @var int */
+ private $cookieLifeTime = 3600;
+
protected function setUp()
{
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -59,6 +67,10 @@ protected function setUp()
->disableOriginalConstructor()
->getMock();
+ $this->sessionConfigMock = $this->getMockBuilder(ConfigInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
$this->model = $this->objectManager->getObject(
\Magento\Framework\App\Response\Http::class,
[
@@ -66,7 +78,8 @@ protected function setUp()
'cookieManager' => $this->cookieManagerMock,
'cookieMetadataFactory' => $this->cookieMetadataFactoryMock,
'context' => $this->contextMock,
- 'dateTime' => $this->dateTimeMock
+ 'dateTime' => $this->dateTimeMock,
+ 'sessionConfig' => $this->sessionConfigMock
]
);
$this->model->headersSentThrowsException = false;
@@ -99,9 +112,14 @@ public function testSendVary()
->method('getVaryString')
->will($this->returnValue($expectedCookieValue));
+ $this->sessionConfigMock->expects($this->once())
+ ->method('getCookieLifetime')
+ ->willReturn($this->cookieLifeTime);
+
$this->cookieMetadataFactoryMock->expects($this->once())
->method('createSensitiveCookieMetadata')
- ->will($this->returnValue($sensitiveCookieMetadataMock));
+ ->with([CookieMetadata::KEY_DURATION => $this->cookieLifeTime])
+ ->willReturn($sensitiveCookieMetadataMock);
$this->cookieManagerMock->expects($this->once())
->method('setSensitiveCookie')
diff --git a/lib/internal/Magento/Framework/Data/AbstractSearchResult.php b/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
index f9272683005ce..bcedf16e3f5be 100644
--- a/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
+++ b/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
@@ -235,6 +235,7 @@ protected function load()
if (is_array($data)) {
foreach ($data as $row) {
$item = $this->createDataObject(['data' => $row]);
+ $item->setOrigData();
$this->addItem($item);
}
}
diff --git a/lib/internal/Magento/Framework/Data/Form/Filter/Trim.php b/lib/internal/Magento/Framework/Data/Form/Filter/Trim.php
new file mode 100644
index 0000000000000..0dbbcf6dbf8d0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Data/Form/Filter/Trim.php
@@ -0,0 +1,37 @@
+
+ */
+namespace Magento\Framework\Data\Form\Filter;
+
+class Trim implements \Magento\Framework\Data\Form\Filter\FilterInterface
+{
+ /**
+ * Returns the result of filtering $value
+ *
+ * @param string $value
+ * @return string
+ */
+ public function inputFilter($value)
+ {
+ return trim($value, ' ');
+ }
+
+ /**
+ * Returns the result of filtering $value
+ *
+ * @param string $value
+ * @return string
+ */
+ public function outputFilter($value)
+ {
+ return $value;
+ }
+}
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
index 444ab7113d429..a36e41a526466 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -5,6 +5,9 @@
*/
namespace Magento\Framework\Image\Adapter;
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
{
/**
@@ -404,7 +407,7 @@ public function rotate($angle)
*/
public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity = 30, $tile = false)
{
- list($watermarkSrcWidth, $watermarkSrcHeight, $watermarkFileType, ) = $this->_getImageOptions($imagePath);
+ list($watermarkSrcWidth, $watermarkSrcHeight, $watermarkFileType,) = $this->_getImageOptions($imagePath);
$this->_getFileAttributes();
$watermark = call_user_func(
$this->_getCallback('create', $watermarkFileType, 'Unsupported watermark image format.'),
@@ -465,7 +468,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
} elseif ($this->getWatermarkPosition() == self::POSITION_CENTER) {
$positionX = $this->_imageSrcWidth / 2 - imagesx($watermark) / 2;
$positionY = $this->_imageSrcHeight / 2 - imagesy($watermark) / 2;
- imagecopymerge(
+ $this->copyImageWithAlphaPercentage(
$this->_imageHandler,
$watermark,
$positionX,
@@ -478,7 +481,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
);
} elseif ($this->getWatermarkPosition() == self::POSITION_TOP_RIGHT) {
$positionX = $this->_imageSrcWidth - imagesx($watermark);
- imagecopymerge(
+ $this->copyImageWithAlphaPercentage(
$this->_imageHandler,
$watermark,
$positionX,
@@ -490,7 +493,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
$this->getWatermarkImageOpacity()
);
} elseif ($this->getWatermarkPosition() == self::POSITION_TOP_LEFT) {
- imagecopymerge(
+ $this->copyImageWithAlphaPercentage(
$this->_imageHandler,
$watermark,
$positionX,
@@ -504,7 +507,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
} elseif ($this->getWatermarkPosition() == self::POSITION_BOTTOM_RIGHT) {
$positionX = $this->_imageSrcWidth - imagesx($watermark);
$positionY = $this->_imageSrcHeight - imagesy($watermark);
- imagecopymerge(
+ $this->copyImageWithAlphaPercentage(
$this->_imageHandler,
$watermark,
$positionX,
@@ -517,7 +520,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
);
} elseif ($this->getWatermarkPosition() == self::POSITION_BOTTOM_LEFT) {
$positionY = $this->_imageSrcHeight - imagesy($watermark);
- imagecopymerge(
+ $this->copyImageWithAlphaPercentage(
$this->_imageHandler,
$watermark,
$positionX,
@@ -531,7 +534,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
}
if ($tile === false && $merged === false) {
- imagecopymerge(
+ $this->copyImageWithAlphaPercentage(
$this->_imageHandler,
$watermark,
$positionX,
@@ -547,7 +550,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
$offsetY = $positionY;
while ($offsetY <= $this->_imageSrcHeight + imagesy($watermark)) {
while ($offsetX <= $this->_imageSrcWidth + imagesx($watermark)) {
- imagecopymerge(
+ $this->copyImageWithAlphaPercentage(
$this->_imageHandler,
$watermark,
$offsetX,
@@ -778,4 +781,106 @@ protected function _createEmptyImage($width, $height)
$this->imageDestroy();
$this->_imageHandler = $image;
}
+
+ /**
+ * Copy source image onto destination image with given alpha percentage
+ *
+ * @internal The arguments and functionality is the same as imagecopymerge
+ * but with proper handling of alpha transparency
+ *
+ * @param resource $destinationImage
+ * @param resource $sourceImage
+ * @param int $destinationX
+ * @param int $destinationY
+ * @param int $sourceX
+ * @param int $sourceY
+ * @param int $sourceWidth
+ * @param int $sourceHeight
+ * @param int $alphaPercentage
+ *
+ * @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ private function copyImageWithAlphaPercentage(
+ $destinationImage,
+ $sourceImage,
+ $destinationX,
+ $destinationY,
+ $sourceX,
+ $sourceY,
+ $sourceWidth,
+ $sourceHeight,
+ $alphaPercentage
+ ) {
+ if (imageistruecolor($destinationImage) === false || imageistruecolor($sourceImage) === false) {
+ return imagecopymerge(
+ $destinationImage,
+ $sourceImage,
+ $destinationX,
+ $destinationY,
+ $sourceX,
+ $sourceY,
+ $sourceWidth,
+ $sourceHeight,
+ $alphaPercentage
+ );
+ }
+
+ if ($alphaPercentage >= 100) {
+ return imagecopy(
+ $destinationImage,
+ $sourceImage,
+ $destinationX,
+ $destinationY,
+ $sourceX,
+ $sourceY,
+ $sourceWidth,
+ $sourceHeight
+ );
+ }
+
+ if ($alphaPercentage < 0) {
+ return false;
+ }
+
+ $sizeX = imagesx($sourceImage);
+ $sizeY = imagesy($sourceImage);
+ if ($sizeX === false || $sizeY === false || $sizeX === 0 || $sizeY === 0) {
+ return false;
+ }
+
+ $tmpImg = imagecreatetruecolor($sourceWidth, $sourceHeight);
+ if ($tmpImg === false) {
+ return false;
+ }
+
+ if (imagealphablending($tmpImg, false) === false) {
+ return false;
+ }
+
+ if (imagecopy($tmpImg, $sourceImage, 0, 0, 0, 0, $sizeX, $sizeY) === false) {
+ return false;
+ }
+
+ $transparency = 127 - (($alphaPercentage*127)/100);
+ if (imagefilter($tmpImg, IMG_FILTER_COLORIZE, 0, 0, 0, $transparency) === false) {
+ return false;
+ }
+
+ $result = imagecopy(
+ $destinationImage,
+ $tmpImg,
+ $destinationX,
+ $destinationY,
+ $sourceX,
+ $sourceY,
+ $sourceWidth,
+ $sourceHeight
+ );
+ imagedestroy($tmpImg);
+
+ return $result;
+ }
}
diff --git a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
index 50b9a5a013273..5d9ef49c7d285 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
@@ -269,15 +269,17 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
);
}
- if (method_exists($watermark, 'setImageOpacity')) {
- // available from imagick 6.3.1
- $watermark->setImageOpacity($opacity);
- } else {
- // go to each pixel and make it transparent
- $watermark->paintTransparentImage($watermark->getImagePixelColor(0, 0), 1, 65530);
- $watermark->evaluateImage(\Imagick::EVALUATE_SUBTRACT, 1 - $opacity, \Imagick::CHANNEL_ALPHA);
+ if (method_exists($watermark, 'getImageAlphaChannel')) {
+ // available from imagick 6.4.0
+ if ($watermark->getImageAlphaChannel() == 0) {
+ $watermark->setImageAlphaChannel(\Imagick::ALPHACHANNEL_OPAQUE);
+ }
}
+ $compositeChannels = \Imagick::CHANNEL_ALL;
+ $watermark->evaluateImage(\Imagick::EVALUATE_MULTIPLY, $opacity, \Imagick::CHANNEL_OPACITY);
+ $compositeChannels &= ~(\Imagick::CHANNEL_OPACITY);
+
switch ($this->getWatermarkPosition()) {
case self::POSITION_STRETCH:
$watermark->sampleImage($this->_imageSrcWidth, $this->_imageSrcHeight);
@@ -309,14 +311,26 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
$offsetY = $positionY;
while ($offsetY <= $this->_imageSrcHeight + $watermark->getImageHeight()) {
while ($offsetX <= $this->_imageSrcWidth + $watermark->getImageWidth()) {
- $this->_imageHandler->compositeImage($watermark, \Imagick::COMPOSITE_OVER, $offsetX, $offsetY);
+ $this->_imageHandler->compositeImage(
+ $watermark,
+ \Imagick::COMPOSITE_OVER,
+ $offsetX,
+ $offsetY,
+ $compositeChannels
+ );
$offsetX += $watermark->getImageWidth();
}
$offsetX = $positionX;
$offsetY += $watermark->getImageHeight();
}
} else {
- $this->_imageHandler->compositeImage($watermark, \Imagick::COMPOSITE_OVER, $positionX, $positionY);
+ $this->_imageHandler->compositeImage(
+ $watermark,
+ \Imagick::COMPOSITE_OVER,
+ $positionX,
+ $positionY,
+ $compositeChannels
+ );
}
} catch (\ImagickException $e) {
throw new \Exception('Unable to create watermark.', $e->getCode(), $e);
diff --git a/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php b/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
index 94f34ec7ba3b2..4b74ce50c9ed6 100644
--- a/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
+++ b/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
@@ -35,7 +35,7 @@ public function prepareSql(SourceProviderInterface $source, $alias, $fieldInfo)
'left'
);
} else {
- $source->addAttributeToSelect($fieldInfo['origin'], 'left');
+ $source->addFieldToSelect($fieldInfo['origin'], 'left');
}
}
}
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/Handler/AttributeHandlerTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/Handler/AttributeHandlerTest.php
new file mode 100644
index 0000000000000..82b178e0ff487
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/Handler/AttributeHandlerTest.php
@@ -0,0 +1,57 @@
+source = $this->getMockBuilder(SourceProviderInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $objectManager = new ObjectManager($this);
+
+ $this->subject = $objectManager->getObject(
+ AttributeHandler::class,
+ []
+ );
+ }
+
+ public function testPrepareSql()
+ {
+ $alias = 'e';
+ $fieldInfo = [
+ 'name' => 'is_approved',
+ 'origin' => 'is_approved',
+ 'type' => 'searchable',
+ 'dataType' => 'varchar',
+ 'entity' => 'customer',
+ 'bind' => null
+ ];
+ $this->source->expects($this->once())
+ ->method('addFieldToSelect')
+ ->with('is_approved', 'left')
+ ->willReturnSelf();
+
+ $this->subject->prepareSql($this->source, $alias, $fieldInfo);
+ }
+}
diff --git a/lib/internal/Magento/Framework/Locale/Config.php b/lib/internal/Magento/Framework/Locale/Config.php
index 2a623deca082f..4db842acedb7e 100644
--- a/lib/internal/Magento/Framework/Locale/Config.php
+++ b/lib/internal/Magento/Framework/Locale/Config.php
@@ -89,6 +89,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
'sq_AL', /*Albanian (Albania)*/
'sr_Cyrl_RS', /*Serbian (Serbia)*/
'sv_SE', /*Swedish (Sweden)*/
+ 'sv_FI', /*Swedish (Finland)*/
'sw_KE', /*Swahili (Kenya)*/
'th_TH', /*Thai (Thailand)*/
'tr_TR', /*Turkish (Turkey)*/
diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php
index f9b6e47c19a86..d5b9443788dd2 100644
--- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php
+++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php
@@ -13,7 +13,7 @@ class InlineTest extends \PHPUnit\Framework\TestCase
protected $translator;
/**
- * @var \Magento\Framework\Phrase\Renderer\Translate
+ * @var \Magento\Framework\Phrase\Renderer\Inline
*/
protected $renderer;
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index 49265774814d9..61e36c908eeff 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -34,7 +34,8 @@
"zendframework/zend-uri": "^2.5.1",
"zendframework/zend-validator": "^2.6.0",
"zendframework/zend-stdlib": "^2.7.7",
- "zendframework/zend-http": "^2.6.0"
+ "zendframework/zend-http": "^2.6.0",
+ "magento/zendframework1": "~1.13.0"
},
"suggest": {
"ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"
diff --git a/lib/web/fotorama/fotorama.js b/lib/web/fotorama/fotorama.js
index 0947164e5b0f2..e388ec0a23038 100644
--- a/lib/web/fotorama/fotorama.js
+++ b/lib/web/fotorama/fotorama.js
@@ -1218,6 +1218,14 @@ fotoramaVersion = '4.6.4';
}
function stubEvent($el, eventType) {
+ var isIOS = /ip(ad|hone|od)/i.test(window.navigator.userAgent);
+
+ if (isIOS && eventType === 'touchend') {
+ $el.on('touchend', function(e){
+ $DOCUMENT.trigger('mouseup', e);
+ })
+ }
+
$el.on(eventType, function (e) {
stopEvent(e, true);
diff --git a/lib/web/fotorama/fotorama.min.js b/lib/web/fotorama/fotorama.min.js
index 0139babea4bfe..808ae6a60db9b 100644
--- a/lib/web/fotorama/fotorama.min.js
+++ b/lib/web/fotorama/fotorama.min.js
@@ -1,5 +1,4 @@
/*!
* Fotorama 4.6.4 | http://fotorama.io/license/
*/
-fotoramaVersion="4.6.4",function(a,b,c,d,e){"use strict";function Ba(a){var b="bez_"+d.makeArray(arguments).join("_").replace(".","p");if("function"!=typeof d.easing[b]){var c=function(a,b){var c=[null,null],d=[null,null],e=[null,null],f=function(f,g){return e[g]=3*a[g],d[g]=3*(b[g]-a[g])-e[g],c[g]=1-e[g]-d[g],f*(e[g]+f*(d[g]+f*c[g]))},g=function(a){return e[0]+a*(2*d[0]+3*c[0]*a)},h=function(a){for(var d,b=a,c=0;++c<14&&(d=f(b,0)-a,!(Math.abs(d)<.001));)b-=d/g(b);return b};return function(a){return f(h(a),1)}};d.easing[b]=function(b,d,e,f,g){return f*c([a[0],a[1]],[a[2],a[3]])(d/g)+e}}return b}function eb(){}function fb(a,b,c){return Math.max(isNaN(b)?-(1/0):b,Math.min(isNaN(c)?1/0:c,a))}function gb(a,b){return a.match(/ma/)&&a.match(/-?\d+(?!d)/g)[a.match(/3d/)?"vertical"===b?13:12:"vertical"===b?5:4]}function hb(a,b){return Ia?+gb(a.css("transform"),b):+a.css("vertical"===b?"top":"left").replace("px","")}function ib(a,b){var c={};if(Ia)switch(b){case"vertical":c.transform="translate3d(0, "+a+"px,0)";break;case"list":break;default:c.transform="translate3d("+a+"px,0,0)"}else"vertical"===b?c.top=a:c.left=a;return c}function jb(a){return{"transition-duration":a+"ms"}}function kb(a,b){return isNaN(a)?b:a}function lb(a,b){return kb(+String(a).replace(b||"px",""))}function mb(a){return/%$/.test(a)?lb(a,"%"):e}function nb(a,b){return kb(mb(a)/100*b,lb(a))}function ob(a){return(!isNaN(lb(a))||!isNaN(lb(a,"%")))&&a}function pb(a,b,c,d){return(a-(d||0))*(b+(c||0))}function qb(a,b,c,d){return-Math.round(a/(b+(c||0))-(d||0))}function rb(a){var b=a.data();if(!b.tEnd){var c=a[0],d={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",msTransition:"MSTransitionEnd",transition:"transitionend"};Rb(c,d[wa.prefixed("transition")],function(a){b.tProp&&a.propertyName.match(b.tProp)&&b.onEndFn()}),b.tEnd=!0}}function sb(a,b,c,d){var e,f=a.data();f&&(f.onEndFn=function(){e||(e=!0,clearTimeout(f.tT),c())},f.tProp=b,clearTimeout(f.tT),f.tT=setTimeout(function(){f.onEndFn()},1.5*d),rb(a))}function tb(a,b){var c=a.navdir||"horizontal";if(a.length){var d=a.data();Ia?(a.css(jb(0)),d.onEndFn=eb,clearTimeout(d.tT)):a.stop();var e=ub(b,function(){return hb(a,c)});return a.css(ib(e,c)),e}}function ub(){for(var a,b=0,c=arguments.length;b'+(b||"")+"
"}function Kb(a){return"."+a}function Lb(a){var b='';return b}function Mb(a){for(var b=a.length;b;){var c=Math.floor(Math.random()*b--),d=a[b];a[b]=a[c],a[c]=d}return a}function Nb(a){return"[object Array]"==Object.prototype.toString.call(a)&&d.map(a,function(a){return d.extend({},a)})}function Ob(a,b,c){a.scrollLeft(b||0).scrollTop(c||0)}function Pb(a){if(a){var b={};return d.each(a,function(a,c){b[a.toLowerCase()]=c}),b}}function Qb(a){if(a){var b=+a;return isNaN(b)?(b=a.split("/"),+b[0]/+b[1]||e):b}}function Rb(a,b,c,d){b&&(a.addEventListener?a.addEventListener(b,c,!!d):a.attachEvent("on"+b,c))}function Sb(a,b){return a>b.max?a=b.max:a\r\n \r\n
'},d.Fotorama.jst.frameCaption=function(a){var b,c="";va.escape;return c+='\r\n"},d.Fotorama.jst.style=function(a){var b,c="";va.escape;return c+=".fotorama"+(null==(b=a.s)?"":b)+" .fotorama__nav--thumbs .fotorama__nav__frame{\r\npadding:"+(null==(b=a.m)?"":b)+"px;\r\nheight:"+(null==(b=a.h)?"":b)+"px}\r\n.fotorama"+(null==(b=a.s)?"":b)+" .fotorama__thumb-border{\r\nheight:"+(null==(b=a.h)?"":b)+"px;\r\nborder-width:"+(null==(b=a.b)?"":b)+"px;\r\nmargin-top:"+(null==(b=a.m)?"":b)+"px}"},d.Fotorama.jst.thumb=function(a){var c="";va.escape;return c+='\r\n
'}}(window,document,location,"undefined"!=typeof jQuery&&jQuery);
\ No newline at end of file
+fotoramaVersion="4.6.4";(function(bo,k,a3,bV,aP){var ag="fotorama",bH="fotorama__fullscreen",ae=ag+"__wrap",ah=ae+"--css2",aX=ae+"--css3",bt=ae+"--video",ar=ae+"--fade",aw=ae+"--slide",P=ae+"--no-controls",aM=ae+"--no-shadows",U=ae+"--pan-y",a0=ae+"--rtl",az=ae+"--only-active",bN=ae+"--no-captions",f=ae+"--toggle-arrows",a7=ag+"__stage",x=a7+"__frame",l=x+"--video",B=a7+"__shaft",aB=ag+"__grab",bC=ag+"__pointer",aK=ag+"__arr",F=aK+"--disabled",bc=aK+"--prev",r=aK+"--next",bO=ag+"__nav",bq=bO+"-wrap",aH=bO+"__shaft",b=bq+"--vertical",ax=bq+"--list",bZ=bq+"--horizontal",bW=bO+"--dots",ai=bO+"--thumbs",aG=bO+"__frame",br=ag+"__fade",al=br+"-front",n=br+"-rear",aW=ag+"__shadow",bz=aW+"s",S=bz+"--left",aL=bz+"--right",a2=bz+"--top",aR=bz+"--bottom",a4=ag+"__active",a9=ag+"__select",bs=ag+"--hidden",M=ag+"--fullscreen",aJ=ag+"__fullscreen-icon",bP=ag+"__error",bM=ag+"__loading",c=ag+"__loaded",b3=c+"--full",bg=c+"--img",bR=ag+"__grabbing",J=ag+"__img",Y=J+"--full",bS=ag+"__thumb",b0=bS+"__arr--left",H=bS+"__arr--right",cb=bS+"-border",bd=ag+"__html",af=ag+"-video-container",bJ=ag+"__video",T=bJ+"-play",w=bJ+"-close",au=ag+"_horizontal_ratio",aY=ag+"_vertical_ratio",ca=ag+"__spinner",Z=ca+"--show";var E=bV&&bV.fn.jquery.split(".");if(!E||E[0]<1||(E[0]==1&&E[1]<8)){throw"Fotorama requires jQuery 1.8 or later and will not run without it."}var bx={};var ap=(function(co,ct,cj){var cf="2.8.3",cm={},cD=ct.documentElement,cE="modernizr",cB=ct.createElement(cE),cp=cB.style,cg,cw={}.toString,cy=" -webkit- -moz- -o- -ms- ".split(" "),cd="Webkit Moz O ms",cG=cd.split(" "),cq=cd.toLowerCase().split(" "),ck={},ce={},cu={},cA=[],cv=cA.slice,cc,cz=function(cQ,cS,cK,cR){var cJ,cP,cM,cN,cI=ct.createElement("div"),cO=ct.body,cL=cO||ct.createElement("body");if(parseInt(cK,10)){while(cK--){cM=ct.createElement("div");cM.id=cR?cR[cK]:cE+(cK+1);cI.appendChild(cM)}}cJ=["",'"].join("");cI.id=cE;(cO?cI:cL).innerHTML+=cJ;cL.appendChild(cI);if(!cO){cL.style.background="";cL.style.overflow="hidden";cN=cD.style.overflow;cD.style.overflow="hidden";cD.appendChild(cL)}cP=cS(cI,cQ);if(!cO){cL.parentNode.removeChild(cL);cD.style.overflow=cN}else{cI.parentNode.removeChild(cI)}return !!cP},cs=({}).hasOwnProperty,cC;if(!cl(cs,"undefined")&&!cl(cs.call,"undefined")){cC=function(cI,cJ){return cs.call(cI,cJ)}}else{cC=function(cI,cJ){return((cJ in cI)&&cl(cI.constructor.prototype[cJ],"undefined"))}}if(!Function.prototype.bind){Function.prototype.bind=function cH(cK){var cL=this;if(typeof cL!="function"){throw new TypeError()}var cI=cv.call(arguments,1),cJ=function(){if(this instanceof cJ){var cO=function(){};cO.prototype=cL.prototype;var cN=new cO();var cM=cL.apply(cN,cI.concat(cv.call(arguments)));if(Object(cM)===cM){return cM}return cN}else{return cL.apply(cK,cI.concat(cv.call(arguments)))}};return cJ}}function cr(cI){cp.cssText=cI}function ci(cJ,cI){return cr(cy.join(cJ+";")+(cI||""))}function cl(cJ,cI){return typeof cJ===cI}function cn(cJ,cI){return !!~(""+cJ).indexOf(cI)}function cF(cK,cI){for(var cJ in cK){var cL=cK[cJ];if(!cn(cL,"-")&&cp[cL]!==cj){return cI=="pfx"?cL:true}}return false}function cx(cJ,cM,cL){for(var cI in cJ){var cK=cM[cJ[cI]];if(cK!==cj){if(cL===false){return cJ[cI]}if(cl(cK,"function")){return cK.bind(cL||cM)}return cK}}return false}function i(cM,cI,cL){var cJ=cM.charAt(0).toUpperCase()+cM.slice(1),cK=(cM+" "+cG.join(cJ+" ")+cJ).split(" ");if(cl(cI,"string")||cl(cI,"undefined")){return cF(cK,cI)}else{cK=(cM+" "+(cq).join(cJ+" ")+cJ).split(" ");return cx(cK,cI,cL)}}ck.touch=function(){var cI;if(("ontouchstart" in co)||co.DocumentTouch&&ct instanceof DocumentTouch){cI=true}else{cz(["@media (",cy.join("touch-enabled),("),cE,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(cJ){cI=cJ.offsetTop===9})}return cI};ck.csstransforms3d=function(){var cI=!!i("perspective");if(cI&&"webkitPerspective" in cD.style){cz("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(cJ,cK){cI=cJ.offsetLeft===9&&cJ.offsetHeight===3})}return cI};ck.csstransitions=function(){return i("transition")};for(var ch in ck){if(cC(ck,ch)){cc=ch.toLowerCase();cm[cc]=ck[ch]();cA.push((cm[cc]?"":"no-")+cc)}}cm.addTest=function(cJ,cK){if(typeof cJ=="object"){for(var cI in cJ){if(cC(cJ,cI)){cm.addTest(cI,cJ[cI])}}}else{cJ=cJ.toLowerCase();if(cm[cJ]!==cj){return cm}cK=typeof cK=="function"?cK():cK;if(typeof enableClasses!=="undefined"&&enableClasses){cD.className+=" "+(cK?"":"no-")+cJ}cm[cJ]=cK}return cm};cr("");cB=cg=null;cm._version=cf;cm._prefixes=cy;cm._domPrefixes=cq;cm._cssomPrefixes=cG;cm.testProp=function(cI){return cF([cI])};cm.testAllProps=i;cm.testStyles=cz;cm.prefixed=function(cK,cJ,cI){if(!cJ){return i(cK,"pfx")}else{return i(cK,cJ,cI)}};return cm})(bo,k);var bB={ok:false,is:function(){return false},request:function(){},cancel:function(){},event:"",prefix:""},h="webkit moz o ms khtml".split(" ");if(typeof k.cancelFullScreen!="undefined"){bB.ok=true}else{for(var bv=0,N=h.length;bv\r\n
\r\n'+(cc||"")+"
"}function aT(i){return"."+i}function q(i){var cc='';return cc}function aC(cf){var cc=cf.length;while(cc){var ce=Math.floor(Math.random()*cc--);var cd=cf[cc];cf[cc]=cf[ce];cf[ce]=cd}return cf}function bG(i){return Object.prototype.toString.call(i)=="[object Array]"&&bV.map(i,function(cc){return bV.extend({},cc)})}function bU(i,cd,cc){i.scrollLeft(cd||0).scrollTop(cc||0)}function bA(i){if(i){var cc={};bV.each(i,function(cd,ce){cc[cd.toLowerCase()]=ce});return cc}}function bm(i){if(!i){return}var cc=+i;if(!isNaN(cc)){return cc}else{cc=i.split("/");return +cc[0]/+cc[1]||aP}}function D(cd,ce,cc,i){if(!ce){return}cd.addEventListener?cd.addEventListener(ce,cc,!!i):cd.attachEvent("on"+ce,cc)}function a5(i,cc){if(i>cc.max){i=cc.max}else{if(i\r\n \r\n
';return ce};bV.Fotorama.jst.frameCaption=function(cc){var i,ce="",cd=bx.escape;ce+='\r\n";return ce};bV.Fotorama.jst.style=function(cc){var i,ce="",cd=bx.escape;ce+=".fotorama"+((i=(cc.s))==null?"":i)+" .fotorama__nav--thumbs .fotorama__nav__frame{\r\npadding:"+((i=(cc.m))==null?"":i)+"px;\r\nheight:"+((i=(cc.h))==null?"":i)+"px}\r\n.fotorama"+((i=(cc.s))==null?"":i)+" .fotorama__thumb-border{\r\nheight:"+((i=(cc.h))==null?"":i)+"px;\r\nborder-width:"+((i=(cc.b))==null?"":i)+"px;\r\nmargin-top:"+((i=(cc.m))==null?"":i)+"px}";return ce};bV.Fotorama.jst.thumb=function(cc){var i,ce="",cd=bx.escape;ce+='\r\n
';return ce}})(window,document,location,typeof jQuery!=="undefined"&&jQuery);
\ No newline at end of file
diff --git a/lib/web/i18n/en_US.csv b/lib/web/i18n/en_US.csv
index 5c63a191420a4..4acc62aa6dc81 100644
--- a/lib/web/i18n/en_US.csv
+++ b/lib/web/i18n/en_US.csv
@@ -95,7 +95,7 @@ Submit,Submit
"Please enter valid SKU key.","Please enter valid SKU key."
"Please enter a valid number.","Please enter a valid number."
"This is required field","This is required field"
-"Admin is a required field in the each row.","Admin is a required field in the each row."
+"Admin is a required field in each row.","Admin is a required field in each row."
"Password cannot be the same as email address.","Password cannot be the same as email address."
"Please fix this field.","Please fix this field."
"Please enter a valid email address.","Please enter a valid email address."
diff --git a/lib/web/jquery/jstree/jquery.jstree.js b/lib/web/jquery/jstree/jquery.jstree.js
index e2f6330ba45eb..4671256b4207b 100644
--- a/lib/web/jquery/jstree/jquery.jstree.js
+++ b/lib/web/jquery/jstree/jquery.jstree.js
@@ -28,7 +28,7 @@
"use strict";
// top wrapper to prevent multiple inclusion (is this OK?)
-(function () { if(jQuery && jQuery.jstree) { return; }
+(function () {
var is_ie6 = false, is_ie7 = false, is_ff2 = false;
/*
diff --git a/lib/web/mage/apply/main.js b/lib/web/mage/apply/main.js
index 60b737e59e110..489e467f9b110 100644
--- a/lib/web/mage/apply/main.js
+++ b/lib/web/mage/apply/main.js
@@ -32,6 +32,12 @@ define([
} else if ($(el)[component]) {
$(el)[component](config);
}
+ }, function (error) {
+ if ('console' in window && typeof window.console.error === 'function') {
+ console.error(error);
+ }
+
+ return true;
});
}
diff --git a/lib/web/mage/collapsible.js b/lib/web/mage/collapsible.js
index 0d8cf836c198e..267734605f141 100644
--- a/lib/web/mage/collapsible.js
+++ b/lib/web/mage/collapsible.js
@@ -243,7 +243,7 @@ define([
});
// For collapsible widget only (not tabs or accordion)
- if (this.header.parent().attr('role') != 'presentation') { //eslint-disable-line eqeqeq
+ if (this.header.parent().attr('role') !== 'presentation') {
this.header
.parent()
.attr('role', 'tablist');
@@ -316,9 +316,9 @@ define([
* Disable.
*/
disable: function () {
+ this.options.disabled = true;
this._off(this.trigger);
this.forceDeactivate();
- this.options.disabled = true;
if (this.options.disabledState) {
this.element.addClass(this.options.disabledState);
@@ -330,12 +330,14 @@ define([
* Enable.
*/
enable: function () {
- this._on(this.trigger, this.events);
this.options.disabled = false;
+ this._on(this.trigger, this.events);
+ this.forceActivate();
if (this.options.disabledState) {
this.element.removeClass(this.options.disabledState);
}
+ this.trigger.attr('tabIndex', 0);
},
/**
@@ -517,7 +519,7 @@ define([
that = this;
if (url) {
- this.xhr = $.get({
+ that.xhr = $.get({
url: url,
dataType: 'html'
}, function () {
@@ -533,7 +535,8 @@ define([
setTimeout(function () {
that.content.html(response);
}, 1);
- }).complete(function (jqXHR, status) {
+ });
+ that.xhr.complete(function (jqXHR, status) {
setTimeout(function () {
if (status === 'abort') {
that.content.stop(false, true);
diff --git a/lib/web/mage/menu.js b/lib/web/mage/menu.js
index 6ad60333d2e1b..41730aa036b08 100644
--- a/lib/web/mage/menu.js
+++ b/lib/web/mage/menu.js
@@ -626,6 +626,9 @@ define([
return;
}
+ // remove the active state class from the siblings
+ this.active.siblings().children('.ui-state-active').removeClass('ui-state-active');
+
this._open(newItem.parent());
// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index fee88826be7eb..ac99b04ad1b7a 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -845,11 +845,13 @@
result = true;
range = param;
- if (typeof range === 'object') {
+ if (typeof range === 'string') {
m = dataAttrRange.exec(range);
if (m) {
result = result && $.mage.isBetween(numValue, m[1], m[2]);
+ } else {
+ result = false;
}
} else if (elm && elm.className) {
classes = elm.className.split(' ');
@@ -896,11 +898,13 @@
result = true;
range = param;
- if (typeof range === 'object') {
+ if (typeof range === 'string') {
m = dataAttrRange.exec(range);
if (m) {
result = result && $.mage.isBetween(numValue, m[1], m[2]);
+ } else {
+ result = false;
}
} else if (elm && elm.className) {
classes = elm.className.split(' ');
@@ -1550,15 +1554,15 @@
],
'required-text-swatch-entry': [
tableSingleValidation,
- $.mage.__('Admin is a required field in the each row.')
+ $.mage.__('Admin is a required field in each row.')
],
'required-visual-swatch-entry': [
tableSingleValidation,
- $.mage.__('Admin is a required field in the each row.')
+ $.mage.__('Admin is a required field in each row.')
],
'required-dropdown-attribute-entry': [
tableSingleValidation,
- $.mage.__('Admin is a required field in the each row.')
+ $.mage.__('Admin is a required field in each row.')
],
'validate-item-quantity': [
function (value, element, params) {
diff --git a/lib/web/magnifier/magnifier.js b/lib/web/magnifier/magnifier.js
index 958af0e96641b..c475364368922 100644
--- a/lib/web/magnifier/magnifier.js
+++ b/lib/web/magnifier/magnifier.js
@@ -588,7 +588,7 @@
_init($box, gOptions);
});
- $(document).on('mousemove', onMousemove);
+ $box.on('mousemove', onMousemove);
_init($box, gOptions);
}
diff --git a/nginx.conf.sample b/nginx.conf.sample
index 7257c329df24b..1e20a51a511d3 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -100,7 +100,7 @@ location /static/ {
# Remove signature of the static files that is used to overcome the browser cache
location ~ ^/static/version {
- rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
+ rewrite ^/static/(version[^/]+/)?(.*)$ /static/$2 last;
}
location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 154915cd3a4fc..ef407b9206c0f 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -12976,6 +12976,9 @@ vars.put("admin_user", adminUser);
//Index of the current product from the cluster
Random random = new Random();
+ if (${seedForRandom} > 0) {
+ random.setSeed(${seedForRandom} + ${__threadNum});
+ }
int iterator = random.nextInt(clusterLength);
if (iterator == 0) {
iterator = 1;
@@ -32318,7 +32321,7 @@ vars.put("admin_user", adminUser);
\r\n
\r\n