Fix js tests

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

View File

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

View File

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

View File

@ -41,6 +41,11 @@ describe('UriFactoryTest', function ()
{ {
it('Testing query clearing', 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')).toBeTruthy();
expect(jsOMS.Uri.UriFactory.clear('Valid')).toBeFalsy(); expect(jsOMS.Uri.UriFactory.clear('Valid')).toBeFalsy();
expect(jsOMS.Uri.UriFactory.getQuery('Valid')).toBe(null); expect(jsOMS.Uri.UriFactory.getQuery('Valid')).toBe(null);