[otrs-cvs] otrs/var/httpd/htdocs/js/test Core.AJAX.UnitTest.js, 1.10, 1.11 Core.UI.Accessibility.UnitTest.js, 1.3, 1.4 Core.Data.UnitTest.js, 1.2, 1.3 Core.JavaScriptEnhancements.UnitTest.js, 1.2, 1.3 Core.Form.Validate.UnitTest.js, 1.5, 1.6 Core.Config.UnitTest.js, 1.3, 1.4 Core.JSON.UnitTest.js, 1.2, 1.3 JSUnitTest.html, 1.21, 1.22 Core.UI.Popup.UnitTest.js, 1.1, 1.2 Core.Form.UnitTest.js, 1.5, 1.6 Core.App.UnitTest.js, 1.2, 1.3 Core.Debug.UnitTest.js, 1.1, 1.2
"CVS commits notifications of OTRS.org" <[email protected]>
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/otrs/var/httpd/htdocs/js/test
In directory lancelot:/tmp/cvs-serv26553/var/httpd/htdocs/js/test
Modified Files:
Core.AJAX.UnitTest.js Core.UI.Accessibility.UnitTest.js
Core.Data.UnitTest.js Core.JavaScriptEnhancements.UnitTest.js
Core.Form.Validate.UnitTest.js Core.Config.UnitTest.js
Core.JSON.UnitTest.js JSUnitTest.html
Core.UI.Popup.UnitTest.js Core.Form.UnitTest.js
Core.App.UnitTest.js Core.Debug.UnitTest.js
Log Message:
Updated QUnit to version 1.10.0.
Author: mn
Index: Core.AJAX.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.AJAX.UnitTest.js,v
retrieving revision 1.10
retrieving revision 1.11
diff -2 -u -d -r1.10 -r1.11
--- Core.AJAX.UnitTest.js 28 Oct 2011 08:24:16 -0000 1.10
+++ Core.AJAX.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.11
@@ -1,5 +1,5 @@
// --
// Core.AJAX.UnitTest.js - UnitTests
-// Copyright (C) 2001-2011 OTRS AG, http://otrs.org/\n";
+// Copyright (C) 2001-2012 OTRS AG, http://otrs.org/\n";
// --
// $Id$
@@ -177,5 +177,5 @@
$('#CORE_AJAX_SerializeFormTest').empty().append(Test.HTML);
- equals(Core.AJAX.SerializeForm($('#CORE_AJAX_SerializeFormTest'), Test.Ignore), Test.Result, Test.Name);
+ equal(Core.AJAX.SerializeForm($('#CORE_AJAX_SerializeFormTest'), Test.Ignore), Test.Result, Test.Name);
});
@@ -196,6 +196,6 @@
URL: 'sample/Core.AJAX.ContentUpdate1.html',
ResultCheck: function() {
- equals($('#Core_AJAX_ContentUpdateTest_Element').val(), 2, 'Simple select');
- equals($('#CORE_AJAX_ContentUpdateTest').children().length, 1, 'Number of form children');
+ equal($('#Core_AJAX_ContentUpdateTest_Element').val(), 2, 'Simple select');
+ equal($('#CORE_AJAX_ContentUpdateTest').children().length, 1, 'Number of form children');
}
}
@@ -222,5 +222,5 @@
}
catch (Error) {
- equals(true, false, 'Exception was thrown');
+ equal(true, false, 'Exception was thrown');
start();
}
@@ -239,5 +239,5 @@
URL: 'sample/Core.AJAX.FunctionCall1.html',
Callback: function(Result) {
- equals(Result, "1\n2\n3\n-", 'Function call with simple data');
+ equal(Result, "1\n2\n3\n-", 'Function call with simple data');
start();
}
@@ -253,5 +253,5 @@
}
catch (Error) {
- equals(true, false, 'Exception was thrown');
+ equal(true, false, 'Exception was thrown');
start();
}
@@ -266,5 +266,5 @@
ErrorHandlingFunc = Core.Exception.HandleFinalError;
Core.Exception.HandleFinalError = function (Exception) {
- equals(Exception.GetType(), 'CommunicationError', 'Error handling called');
+ equal(Exception.GetType(), 'CommunicationError', 'Error handling called');
start();
RestoreOrignal();
@@ -304,5 +304,5 @@
try {
Core.AJAX.FormUpdate($('#FormUpdateErrorHandlingForm'), 'Subaction', 'Test1', ['Test2'], function () {
- equals(true, false, 'Error handling was not called');
+ equal(true, false, 'Error handling was not called');
start();
RestoreOrignal();
@@ -310,5 +310,5 @@
}
catch (Error) {
- equals(true, false, 'Error caught, Exception was thrown');
+ equal(true, false, 'Error caught, Exception was thrown');
start();
RestoreOrignal();
@@ -347,5 +347,5 @@
}
catch (Error) {
- equals(true, false, 'Error caught, Exception was thrown');
+ equal(true, false, 'Error caught, Exception was thrown');
start();
RestoreOrignal();
@@ -364,5 +364,5 @@
URL: 'sample/Core.AJAX.FunctionCall-InvalidURL',
Callback: function () {
- equals(true, false, 'Error handling was not called');
+ equal(true, false, 'Error handling was not called');
RestoreOrignal();
}
@@ -379,5 +379,5 @@
}
catch (Error) {
- equals(true, false, 'Error caught, Exception was thrown');
+ equal(true, false, 'Error caught, Exception was thrown');
start();
RestoreOrignal();
@@ -414,5 +414,5 @@
}
catch (Error) {
- equals(true, false, 'Error caught, Exception was thrown');
+ equal(true, false, 'Error caught, Exception was thrown');
start();
RestoreOrignal();
@@ -431,5 +431,5 @@
var ErrorShownToUser = HandleFinalErrorOriginal(ErrorObject, Trace);
- equals(ErrorShownToUser, false, 'AJAX errors should be suppressed when leaving the page (custom error handler called)');
+ equal(ErrorShownToUser, false, 'AJAX errors should be suppressed when leaving the page (custom error handler called)');
start();
@@ -441,10 +441,10 @@
try {
Core.AJAX.FunctionCall('nonexisting.url', {}, function () {
- equals(true, false, 'Callback on nonexisting URL');
+ equal(true, false, 'Callback on nonexisting URL');
start();
});
}
catch (Error) {
- equals(true, false, 'Error caught, unexpected Exception was thrown');
+ equal(true, false, 'Error caught, unexpected Exception was thrown');
start();
}
Author: mn
Index: Core.UI.Accessibility.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.UI.Accessibility.UnitTest.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -2 -u -d -r1.3 -r1.4
--- Core.UI.Accessibility.UnitTest.js 20 Dec 2010 09:22:03 -0000 1.3
+++ Core.UI.Accessibility.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.4
@@ -1,5 +1,5 @@
// --
// Core.UI.Accessibility.UnitTest.js - UnitTests
-// Copyright (C) 2001-2010 OTRS AG, http://otrs.org/\n";
+// Copyright (C) 2001-2012 OTRS AG, http://otrs.org/\n";
// --
// $Id$
@@ -41,19 +41,19 @@
Core.UI.Accessibility.Init();
- equals($('.ARIARoleBanner')
+ equal($('.ARIARoleBanner')
.attr('role'), 'banner', 'Role banner');
- equals($('.ARIARoleNavigation')
+ equal($('.ARIARoleNavigation')
.attr('role'), 'navigation', 'Role navigation');
- equals($('.ARIARoleSearch')
+ equal($('.ARIARoleSearch')
.attr('role'), 'search', 'Role search');
- equals($('.ARIARoleMain')
+ equal($('.ARIARoleMain')
.attr('role'), 'main', 'Role main');
- equals($('.ARIARoleContentinfo')
+ equal($('.ARIARoleContentinfo')
.attr('role'), 'contentinfo', 'Role contentinfo');
- equals($('.ARIAHasPopup')
+ equal($('.ARIAHasPopup')
.attr('aria-haspopup'), 'true', 'HasPopup attribute');
- equals($('.Validate_Required')
+ equal($('.Validate_Required')
.attr('aria-required'), 'true', 'ARIA required attribute');
- equals($('.Validate_DependingRequiredAND')
+ equal($('.Validate_DependingRequiredAND')
.attr('aria-required'), 'true', 'ARIA required attribute');
Author: mn
Index: Core.Data.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.Data.UnitTest.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -2 -u -d -r1.2 -r1.3
--- Core.Data.UnitTest.js 28 Oct 2010 12:19:10 -0000 1.2
+++ Core.Data.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.3
@@ -1,5 +1,5 @@
// --
// Core.UI.Accessibility.UnitTest.js - UnitTests
-// Copyright (C) 2001-2010 OTRS AG, http://otrs.org/\n";
+// Copyright (C) 2001-2012 OTRS AG, http://otrs.org/\n";
// --
// $Id$
@@ -38,8 +38,8 @@
var ResultOneEmpty = Core.Data.Get(ObjectOne,'One');
- same(ResultOneEmpty, {}, 'information not yet stored');
+ deepEqual(ResultOneEmpty, {}, 'information not yet stored');
var NonexistingResuult = Core.Data.Get($('#nonexisting_selector'),'One');
- same(NonexistingResuult, {}, 'nonexisting element');
+ deepEqual(NonexistingResuult, {}, 'nonexisting element');
Core.Data.Set(ObjectOne,'One',Sign);
@@ -49,7 +49,7 @@
var ResultTwo = Core.Data.Get(ObjectTwo,'Two');
- equals(ResultOne, Sign, 'okay');
- equals(ResultTwo, Sign, 'okay');
- equals(ResultOne, ResultTwo, 'okay');
+ equal(ResultOne, Sign, 'okay');
+ equal(ResultTwo, Sign, 'okay');
+ equal(ResultOne, ResultTwo, 'okay');
/*
Author: mn
Index: Core.JavaScriptEnhancements.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.JavaScriptEnhancements.UnitTest.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -2 -u -d -r1.2 -r1.3
--- Core.JavaScriptEnhancements.UnitTest.js 5 Nov 2010 10:12:10 -0000 1.2
+++ Core.JavaScriptEnhancements.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.3
@@ -1,5 +1,5 @@
// --
// Core.JavaScriptEnhancements.UnitTest.js - UnitTests
-// Copyright (C) 2001-2010 OTRS AG, http://otrs.org/\n";
+// Copyright (C) 2001-2012 OTRS AG, http://otrs.org/\n";
// --
// $Id$
@@ -22,10 +22,10 @@
expect(6);
- equals(isJQueryObject($([])), true, 'empty jQuery object');
- equals(isJQueryObject($('body')), true, 'simple jQuery object');
- equals(isJQueryObject({}), false, 'plain object');
- equals(isJQueryObject(undefined), false, 'undefined');
- equals(isJQueryObject($([]), $([])), true, 'multiple');
- equals(isJQueryObject($([]), $([]), {}), false, 'multiple, one plain object');
+ equal(isJQueryObject($([])), true, 'empty jQuery object');
+ equal(isJQueryObject($('body')), true, 'simple jQuery object');
+ equal(isJQueryObject({}), false, 'plain object');
+ equal(isJQueryObject(undefined), false, 'undefined');
+ equal(isJQueryObject($([]), $([])), true, 'multiple');
+ equal(isJQueryObject($([]), $([]), {}), false, 'multiple, one plain object');
});
};
\ No newline at end of file
Author: mn
Index: Core.Form.Validate.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.Form.Validate.UnitTest.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -2 -u -d -r1.5 -r1.6
--- Core.Form.Validate.UnitTest.js 9 Jan 2012 12:21:52 -0000 1.5
+++ Core.Form.Validate.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.6
@@ -49,5 +49,5 @@
Core.Form.Validate.ValidateElement($(this));
- equals($(this).hasClass('Error'), true);
+ equal($(this).hasClass('Error'), true);
// now focus field, change something and leave again
@@ -66,5 +66,5 @@
Core.Form.Validate.ValidateElement($(this));
- equals($(this).hasClass('Error'), false);
+ equal($(this).hasClass('Error'), false);
});
@@ -159,10 +159,10 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), true, Object.Method + ': ' + Object.Desc1);
+ equal($('#ObjectOne').hasClass('Error'), true, Object.Method + ': ' + Object.Desc1);
$('#ObjectOne').val(Object.Content2);
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, Object.Method + ': ' + Object.Desc2);
+ equal($('#ObjectOne').hasClass('Error'), false, Object.Method + ': ' + Object.Desc2);
$('#ObjectOne').removeClass(Object.Method);
});
@@ -200,10 +200,10 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), true, 'Validate_DateDay: 30.2.2011');
+ equal($('#ObjectOne').hasClass('Error'), true, 'Validate_DateDay: 30.2.2011');
$('#ObjectOne').val('28');
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DateDay: 28.2.2011');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DateDay: 28.2.2011');
$('#ObjectOne').val('15');
@@ -211,5 +211,5 @@
$('#ObjectThree').val('13');
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DateDay: 15.13.2011');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DateDay: 15.13.2011');
$('#ObjectOne').removeClass('Validate_DateDay Validate_DateYear_ObjectTwo Validate_DateMonth_ObjectThree');
@@ -228,5 +228,5 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), true, 'Validate_DateInFuture: today - 2 days');
+ equal($('#ObjectOne').hasClass('Error'), true, 'Validate_DateInFuture: today - 2 days');
NewDate = new Date();
@@ -239,5 +239,5 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DateInFuture: today + 2 days');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DateInFuture: today + 2 days');
$('#ObjectOne').removeClass('Validate_DateDay Validate_DateYear_ObjectTwo Validate_DateMonth_ObjectThree Validate_DateInFuture');
@@ -250,10 +250,10 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), true, 'Validate_Equal: two fields are not equal');
+ equal($('#ObjectOne').hasClass('Error'), true, 'Validate_Equal: two fields are not equal');
$('#ObjectTwo').val('abc');
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_Equal: two fields are equal');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_Equal: two fields are equal');
$('#ObjectOne').addClass('Validate_Equal_ObjectThree');
@@ -261,10 +261,10 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), true, 'Validate_Equal: three fields are not equal (2 are, 1 not)');
+ equal($('#ObjectOne').hasClass('Error'), true, 'Validate_Equal: three fields are not equal (2 are, 1 not)');
$('#ObjectThree').val('abc');
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_Equal: three fields are equal');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_Equal: three fields are equal');
$('#ObjectOne').removeClass('Validate_Equal Validate_Equal_ObjectTwo Validate_Equal_ObjectThree');
@@ -277,14 +277,14 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), true, 'Validate_DependingRequiredAND: field is empty, depending field not');
+ equal($('#ObjectOne').hasClass('Error'), true, 'Validate_DependingRequiredAND: field is empty, depending field not');
$('#ObjectOne').val('abc');
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredAND: both fields are not empty');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredAND: both fields are not empty');
$('#ObjectTwo').val('');
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredAND: field is not empty, but depending field is empty');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredAND: field is not empty, but depending field is empty');
$('#ObjectOne').addClass('Validate_Depending_ObjectThree');
@@ -293,15 +293,15 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), true, 'Validate_DependingRequiredAND: field is empty, one depending field is not empty');
+ equal($('#ObjectOne').hasClass('Error'), true, 'Validate_DependingRequiredAND: field is empty, one depending field is not empty');
$('#ObjectTwo').val('abc');
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), true, 'Validate_DependingRequiredAND: field is empty, both depending fields are not empty');
+ equal($('#ObjectOne').hasClass('Error'), true, 'Validate_DependingRequiredAND: field is empty, both depending fields are not empty');
$('#ObjectOne').val('abc');
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredAND: field is not empty, both depending fields are not empty');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredAND: field is not empty, both depending fields are not empty');
$('#ObjectOne').removeClass('Validate_DependingRequiredAND Validate_Depending_ObjectTwo Validate_Depending_ObjectThree');
@@ -314,10 +314,10 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), true, 'Validate_DependingRequiredOR: both fields empty');
+ equal($('#ObjectOne').hasClass('Error'), true, 'Validate_DependingRequiredOR: both fields empty');
$('#ObjectTwo').val('abc');
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: first empty, second not');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: first empty, second not');
$('#ObjectOne').val('abc');
@@ -325,10 +325,10 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: second empty, first not');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: second empty, first not');
$('#ObjectTwo').val('def');
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: both not empty');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: both not empty');
$('#ObjectOne').addClass('Validate_Depending_ObjectThree');
@@ -338,10 +338,10 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), true, 'Validate_DependingRequiredOR: three fields empty');
+ equal($('#ObjectOne').hasClass('Error'), true, 'Validate_DependingRequiredOR: three fields empty');
$('#ObjectOne').val('abc');
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: 1 filled. 2+3 empty');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: 1 filled. 2+3 empty');
$('#ObjectOne').val('');
@@ -349,5 +349,5 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: 1 empty. 2 filled. 3 empty');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: 1 empty. 2 filled. 3 empty');
$('#ObjectOne').val('');
@@ -356,5 +356,5 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: 1 + 2 empty. 3 filled');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: 1 + 2 empty. 3 filled');
$('#ObjectOne').val('abc');
@@ -363,5 +363,5 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: 1 + 2 filled. 3 empty');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: 1 + 2 filled. 3 empty');
$('#ObjectOne').val('');
@@ -370,5 +370,5 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: 1 empty. 2 + 3 filled');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: 1 empty. 2 + 3 filled');
$('#ObjectOne').val('abc');
@@ -377,5 +377,5 @@
Core.Form.Validate.ValidateElement($('#ObjectOne'));
- equals($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: three fields not empty');
+ equal($('#ObjectOne').hasClass('Error'), false, 'Validate_DependingRequiredOR: three fields not empty');
// Cleanup div container and contents
Author: mn
Index: Core.Config.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.Config.UnitTest.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -2 -u -d -r1.3 -r1.4
--- Core.Config.UnitTest.js 24 Nov 2010 11:05:24 -0000 1.3
+++ Core.Config.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.4
@@ -1,5 +1,5 @@
// --
// Core.Config.UnitTest.js - UnitTests
-// Copyright (C) 2001-2010 OTRS AG, http://otrs.org/\n";
+// Copyright (C) 2001-2012 OTRS AG, http://otrs.org/\n";
// --
// $Id$
@@ -23,17 +23,17 @@
var ConfigTest = 'Test value';
Core.Config.Set('Test', ConfigTest);
- same(Core.Config.Get('Test'), ConfigTest);
+ deepEqual(Core.Config.Get('Test'), ConfigTest);
Core.Config.Set('RichText.Test', ConfigTest);
- same(Core.Config.Get('RichText.Test'), ConfigTest);
+ deepEqual(Core.Config.Get('RichText.Test'), ConfigTest);
Core.Config.Set('RichText.Test2', ConfigTest);
- same(Core.Config.Get('RichText.Test2'), ConfigTest);
+ deepEqual(Core.Config.Get('RichText.Test2'), ConfigTest);
- same(Core.Config.Get('non.existing.dummy.ns'), undefined);
+ deepEqual(Core.Config.Get('non.existing.dummy.ns'), undefined);
- same(Core.Config.Get('EasyName', 42), 42, "Test for default value");
+ deepEqual(Core.Config.Get('EasyName', 42), 42, "Test for default value");
- same(Core.Config.Get('non.existing.dummy.ns', 'DefaultValueTest'), 'DefaultValueTest', "Test for default value 2");
+ deepEqual(Core.Config.Get('non.existing.dummy.ns', 'DefaultValueTest'), 'DefaultValueTest', "Test for default value 2");
});
@@ -47,13 +47,13 @@
};
Core.Config.AddConfig(ConfigTest, 'RichText');
- same(Core.Config.Get('RichText'), ConfigTest);
+ deepEqual(Core.Config.Get('RichText'), ConfigTest);
Core.Config.AddConfig(ConfigTest, 'RichText.Details');
- same(Core.Config.Get('RichText.Details'), ConfigTest);
+ deepEqual(Core.Config.Get('RichText.Details'), ConfigTest);
var ConfigTest = '{"Width":"600","Height":"400","Name":"Test"}';
Core.Config.AddConfig(ConfigTest,'RichText.JSONStuff');
- same(Core.Config.Get('RichText.JSONStuff'), ConfigTest);
+ deepEqual(Core.Config.Get('RichText.JSONStuff'), ConfigTest);
});
};
Author: mn
Index: Core.JSON.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.JSON.UnitTest.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -2 -u -d -r1.2 -r1.3
--- Core.JSON.UnitTest.js 10 May 2011 11:22:49 -0000 1.2
+++ Core.JSON.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.3
@@ -1,5 +1,5 @@
// --
// Core.UI.Accessibility.UnitTest.js - UnitTests
-// Copyright (C) 2001-2011 OTRS AG, http://otrs.org/\n";
+// Copyright (C) 2001-2012 OTRS AG, http://otrs.org/\n";
// --
// $Id$
@@ -29,7 +29,7 @@
var ReturnOne = Core.JSON.Stringify(ObjectOne);
- equals(StringOne, ReturnOne, 'okay');
- equals(ObjectOne.ItemOne, '1234', 'okay');
- equals(ObjectOne.ItemTwo, ValueTwo, 'okay');
+ equal(StringOne, ReturnOne, 'okay');
+ equal(ObjectOne.ItemOne, '1234', 'okay');
+ equal(ObjectOne.ItemTwo, ValueTwo, 'okay');
@@ -51,9 +51,9 @@
var ReturnThree = Core.JSON.Stringify(ObjectThree);
- equals(ObjectTwo.Consulting[0].Address, ObjectThree.Consulting[0].Address, 'okay');
- equals(ObjectTwo.Sales[0].LastUpdate, ObjectThree.Sales[0].LastUpdate, 'okay');
- equals(ReturnTwo, ReturnThree, 'okay');
+ equal(ObjectTwo.Consulting[0].Address, ObjectThree.Consulting[0].Address, 'okay');
+ equal(ObjectTwo.Sales[0].LastUpdate, ObjectThree.Sales[0].LastUpdate, 'okay');
+ equal(ReturnTwo, ReturnThree, 'okay');
var ResultCompare1 = Core.Data.CompareObject(ObjectTwo, ObjectThree);
- equals(ResultCompare1, true, 'okay');
+ equal(ResultCompare1, true, 'okay');
// Delete a element and compare
@@ -97,10 +97,10 @@
var ReturnCompanyTwo = Core.JSON.Stringify(ObjectFive.Areas);
- equals(StringCompanyTwo, ReturnCompanyTwo, 'okay');
+ equal(StringCompanyTwo, ReturnCompanyTwo, 'okay');
var ResultCompare3 = Core.Data.CompareObject(ObjectFour.CompanyTwo.Areas, ObjectSix);
- equals(ResultCompare3, true, 'okay');
+ equal(ResultCompare3, true, 'okay');
var ReturnCompanyTwoAreas = Core.JSON.Stringify(ObjectFour.CompanyTwo.Areas);
- equals(ReturnCompanyTwoAreas, StringCompanyTwo, 'okay');
+ equal(ReturnCompanyTwoAreas, StringCompanyTwo, 'okay');
@@ -111,5 +111,5 @@
var ObjectFourParse = Core.JSON.Parse(ReturnFour);
var ResultCompare5 = Core.Data.CompareObject(ObjectFourParse, ObjectFour);
- equals(ResultCompare5, true, 'okay');
+ equal(ResultCompare5, true, 'okay');
@@ -123,5 +123,5 @@
var ObjectSevenParse = Core.JSON.Parse(ReturnSeven);
var ResultCompare6 = Core.Data.CompareObject(ObjectSeven, ObjectSevenParse);
- equals(ResultCompare6, true, 'okay');
+ equal(ResultCompare6, true, 'okay');
ObjectSeven.five = ObjectTwo;
Author: mn
Index: JSUnitTest.html
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/JSUnitTest.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -2 -u -d -r1.21 -r1.22
--- JSUnitTest.html 11 Dec 2012 08:32:41 -0000 1.21
+++ JSUnitTest.html 11 Dec 2012 09:05:42 -0000 1.22
@@ -2,5 +2,5 @@
<html>
<head>
- <link rel="stylesheet" href="../thirdparty/qunit-1.1.0/qunit.css" type="text/css"/>
+ <link rel="stylesheet" href="../thirdparty/qunit-1.10.0/qunit.css" type="text/css"/>
<title>OTRS 3.1 – UnitTest Results</title>
@@ -14,5 +14,5 @@
<!-- UnitTest code goes here -->
- <script type="text/javascript" src="../thirdparty/qunit-1.1.0/qunit.js"></script>
+ <script type="text/javascript" src="../thirdparty/qunit-1.10.0/qunit.js"></script>
<!--
Now always load library first and then the UnitTest file for it.
Author: mn
Index: Core.UI.Popup.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.UI.Popup.UnitTest.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -2 -u -d -r1.1 -r1.2
--- Core.UI.Popup.UnitTest.js 20 Dec 2010 09:22:03 -0000 1.1
+++ Core.UI.Popup.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.2
@@ -1,5 +1,5 @@
// --
// Core.UI.Accessibility.UnitTest.js - UnitTests
-// Copyright (C) 2001-2010 OTRS AG, http://otrs.org/\n";
+// Copyright (C) 2001-2012 OTRS AG, http://otrs.org/\n";
// --
// $Id$
@@ -26,5 +26,5 @@
};
- same(Core.UI.Popup.ProfileList(), ExpectedProfiles, 'Default profile list');
+ deepEqual(Core.UI.Popup.ProfileList(), ExpectedProfiles, 'Default profile list');
ExpectedProfiles['CustomLarge'] = "dependent=yes,height=700,left=100,top=100,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no,width=1000";
@@ -32,5 +32,5 @@
Core.UI.Popup.ProfileAdd('CustomLarge', ExpectedProfiles['CustomLarge']);
- same(Core.UI.Popup.ProfileList(), ExpectedProfiles, 'Modified profile list');
+ deepEqual(Core.UI.Popup.ProfileList(), ExpectedProfiles, 'Modified profile list');
});
};
Author: mn
Index: Core.Form.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.Form.UnitTest.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -2 -u -d -r1.5 -r1.6
--- Core.Form.UnitTest.js 28 Oct 2011 09:02:18 -0000 1.5
+++ Core.Form.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.6
@@ -1,5 +1,5 @@
// --
// Core.UI.Accessibility.UnitTest.js - UnitTests
-// Copyright (C) 2001-2011 OTRS AG, http://otrs.org/\n";
+// Copyright (C) 2001-2012 OTRS AG, http://otrs.org/\n";
// --
// $Id$
@@ -48,5 +48,5 @@
Core.Form.DisableForm($('#TestForm'));
- equals($('#TestForm').hasClass("AlreadyDisabled"), true, 'Form is already disabled' );
+ equal($('#TestForm').hasClass("AlreadyDisabled"), true, 'Form is already disabled' );
$.each($('#TestForm').find("input, textarea, select, button"), function(key, value) {
@@ -59,12 +59,12 @@
if (tagnameValue == "BUTTON") {
- equals(disabledValue, 'disabled', 'disabledValue for BUTTON' );
+ equal(disabledValue, 'disabled', 'disabledValue for BUTTON' );
}
else {
if (typeValue == "hidden") {
- equals(readonlyValue, undefined, 'readonlyValue for ' + tagnameValue );
+ equal(readonlyValue, undefined, 'readonlyValue for ' + tagnameValue );
}
else {
- equals(readonlyValue, 'readonly', 'readonlyValue for ' + tagnameValue );
+ equal(readonlyValue, 'readonly', 'readonlyValue for ' + tagnameValue );
}
}
@@ -77,5 +77,5 @@
Core.Form.EnableForm($('#TestForm'));
- equals($('#TestForm').hasClass("AlreadyDisabled"), false, 'Form is not already disabled' );
+ equal($('#TestForm').hasClass("AlreadyDisabled"), false, 'Form is not already disabled' );
$.each($('#TestForm').find("input, textarea, select, button"), function(key, value) {
@@ -90,12 +90,12 @@
if (tagnameValue == "BUTTON") {
- equals(disabledValue, expectedDisabledValue, 'enabledValue for BUTTON' );
+ equal(disabledValue, expectedDisabledValue, 'enabledValue for BUTTON' );
}
else {
if (typeValue == "hidden") {
- equals(readonlyValue, expectedReadonlyValue, 'readonlyValue for ' + tagnameValue );
+ equal(readonlyValue, expectedReadonlyValue, 'readonlyValue for ' + tagnameValue );
}
else {
- equals(readonlyValue, expectedReadonlyValue, 'readonlyValue for ' + tagnameValue );
+ equal(readonlyValue, expectedReadonlyValue, 'readonlyValue for ' + tagnameValue );
}
}
Author: mn
Index: Core.App.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.App.UnitTest.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -2 -u -d -r1.2 -r1.3
--- Core.App.UnitTest.js 30 May 2012 15:25:42 -0000 1.2
+++ Core.App.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.3
@@ -27,5 +27,5 @@
Core.Config.Set('ChallengeToken', 'C123');
- same(Core.App.GetSessionInformation(), {
+ deepEqual(Core.App.GetSessionInformation(), {
CSID: '1234',
CPanelSID: '1234',
@@ -34,9 +34,9 @@
Core.Config.Set('SessionIDCookie', true);
- same(Core.App.GetSessionInformation(), {
+ deepEqual(Core.App.GetSessionInformation(), {
ChallengeToken: 'C123'
});
});
-
+
test('Core.App.EscapeSelector()', function () {
expect(3);
@@ -44,8 +44,8 @@
Id,
Value;
-
+
equal(Core.App.EscapeSelector(Selector), 'ConfigItemClass\\:\\:Config\\:\\:Hardware\\:\\:MapTypeAdd\\:\\:Attribute');
equal(Core.App.EscapeSelector('ID-mit_anderen+Sonderzeichen'), 'ID-mit_anderen+Sonderzeichen');
-
+
$('<div id="testcase"><label for="Testcase::Element">Elementlabeltext</label><input type="text" id="Testcase::Element" value="5"/></div>').appendTo('body');
Id = $('#testcase').find('input').attr('id');
Author: mn
Index: Core.Debug.UnitTest.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/test/Core.Debug.UnitTest.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -2 -u -d -r1.1 -r1.2
--- Core.Debug.UnitTest.js 13 Jul 2010 09:46:45 -0000 1.1
+++ Core.Debug.UnitTest.js 11 Dec 2012 09:05:42 -0000 1.2
@@ -1,5 +1,5 @@
// --
// Core.Debug.UnitTest.js - UnitTests
-// Copyright (C) 2001-2010 OTRS AG, http://otrs.org/\n";
+// Copyright (C) 2001-2012 OTRS AG, http://otrs.org/\n";
// --
// $Id$
@@ -24,20 +24,20 @@
expect(4);
- equals(
+ equal(
Core.Debug.CheckDependency('Core.Debug.RunUnitTests', 'Core.Debug.DummyFunction', 'existing_function', true),
true
);
- equals(
+ equal(
Core.Debug.CheckDependency('Core.Debug.RunUnitTests', 'Core.Debug.DummyFunction2', 'existing_function', true),
false
);
- equals(
+ equal(
Core.Debug.CheckDependency('Core.Debug.RunUnitTests', 'Core.Debug2.DummyFunction2', 'existing_function', true),
false
);
- equals(
+ equal(
Core.Debug.CheckDependency('Core.Debug.RunUnitTests', 'nonexisting_function', 'nonexisting_function', true),
false
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log