Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-01-11 01:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix js tests

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-06-25 21:06:19 +02:00
parent 478518166a
commit a51765231b
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Uri/UriFactory.js
View File

@ -45,7 +45,7 @@
*
* @param {string} key
*
* @return {string}
* @return {null|string}
*
* @method
*
@ -53,11 +53,7 @@
*/
static getQuery (key)
{
if (!jsOMS.Uri.UriFactory.uri.hasOwnProperty(key)) {
return '';
}
return jsOMS.Uri.UriFactory.uri[key];
return jsOMS.Uri.UriFactory.uri.hasOwnProperty(key) ? jsOMS.Uri.UriFactory.uri[key] : null;
};
/**

22
tests/SpecRunner.html
View File

@ -4,25 +4,25 @@
<meta charset="utf-8">
<title>Framework Test Suit</title>
<link rel="shortcut icon" type="image/png" href="../jasmine/lib/jasmine-2.7.0/jasmine_favicon.png">
<link rel="stylesheet" href="../jasmine/lib/jasmine-2.7.0/jasmine.css">
<link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-3.1.0/jasmine_favicon.png">
<link rel="stylesheet" href="jasmine/lib/jasmine-3.1.0/jasmine.css">
<!-- jasmine -->
<script src="../jasmine/lib/jasmine-2.7.0/jasmine.js"></script>
<script src="../jasmine/lib/jasmine-2.7.0/jasmine-html.js"></script>
<script src="../jasmine/lib/jasmine-2.7.0/boot.js"></script>
<script src="jasmine/lib/jasmine-3.1.0/jasmine.js"></script>
<script src="jasmine/lib/jasmine-3.1.0/jasmine-html.js"></script>
<script src="jasmine/lib/jasmine-3.1.0/boot.js"></script>
<!-- include source files here... -->
<script src="../../../jsOMS/Utils/oLib.js"></script>
<script src="../Utils/oLib.js"></script>
<!-- include source files here... -->
<script src="../../../jsOMS/Asset/AssetManager.js"></script>
<script src="../../../jsOMS/Autoloader.js"></script>
<script src="../Asset/AssetManager.js"></script>
<script src="../Autoloader.js"></script>
<script src="../../../jsOMS/Uri/Http.js"></script>
<script src="../../../jsOMS/Uri/UriFactory.js"></script>
<script src="../Uri/Http.js"></script>
<script src="../Uri/UriFactory.js"></script>
<script src="../../../jsOMS/Views/FormView.js"></script>
<script src="../Views/FormView.js"></script>
<!-- include spec files here... -->
<script src="Uri/HttpTest.js"></script>

5
tests/Uri/UriFactoryTest.js
View File

@ -41,6 +41,11 @@ describe('UriFactoryTest', function ()
{
it('Testing query clearing', function ()
{
jsOMS.Uri.UriFactory.setQuery('Valid', 'query1');
jsOMS.Uri.UriFactory.setQuery('Valid', 'query2', true);
jsOMS.Uri.UriFactory.setQuery('Valid', 'query3', false);
jsOMS.Uri.UriFactory.setQuery('/valid2', 'query4');
expect(jsOMS.Uri.UriFactory.clear('Valid')).toBeTruthy();
expect(jsOMS.Uri.UriFactory.clear('Valid')).toBeFalsy();
expect(jsOMS.Uri.UriFactory.getQuery('Valid')).toBe(null);