Minor bug fixes

This commit is contained in:
Dennis Eichhorn 2018-12-29 13:07:04 +01:00
parent b83b957740
commit d9996c1d5a
4 changed files with 13 additions and 8 deletions

View File

@ -110,7 +110,7 @@
}
const allGroups = Object.keys(this.callbacks),
regex = new RegExp($group),
regex = new RegExp(group),
length = allGroups.length;
let result = false;

View File

@ -458,16 +458,19 @@
return typeof variable !== 'undefined' && variable !== null;
};
jsOMS.strpbrk = function (haystack, char_list)
jsOMS.strpbrk = function (haystack, chars)
{
const length = haystack.length;
const length = chars.length;
let found = haystack.length;
let min = haystack.length;
for (let i = 0; i < length; ++i) {
if (char_list.indexOf(haystack.charAt(i)) >= 0) {
return haystack.slice(i);
if ((found = haystack.indexOf(chars.charAt(i))) >= 0 && min > found) {
min = found;
}
}
return false;
return haystack.slice(min);
};
jsOMS.htmlspecialchars = function (text, quotes) {

View File

@ -21,7 +21,7 @@ describe('EventManagerTest', function ()
let manager = new jsOMS.Event.EventManager();
expect(manager.attach('group', function() { return true; }, false, false)).toBeTruthy();
expect(manager.attach('group', function() { return true; }, false, false)).toBeFalsy();
expect(manager.attach('group', function() { return true; }, false, false)).toBeTruthy();
expect(manager.count()).toBe(1);
});
});

View File

@ -6,13 +6,15 @@ describe('RequestTypeTest', function ()
{
it('Testing amount of enums', function ()
{
expect(Object.keys(jsOMS.Message.Request.RequestType).length).toBe(2);
expect(Object.keys(jsOMS.Message.Request.RequestType).length).toBe(4);
});
it('Testing values of enums', function ()
{
expect(jsOMS.Message.Request.RequestType.JSON).toBe('json');
expect(jsOMS.Message.Request.RequestType.RAW).toBe('raw');
expect(jsOMS.Message.Request.RequestType.FILE).toBe('file');
expect(jsOMS.Message.Request.RequestType.URL_ENCODE).toBe('url');
});
});
});