StarMirror/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2024-03-22 13:10:41 +08:00
Code Issues Projects Releases Wiki Activity

refactor URL generators

Browse Source
This commit is contained in:
El RIDO 2024-01-07 16:06:24 +01:00
parent d493ba7337
commit fd82b937a9
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/test/Model.js
View File

@ -80,7 +80,7 @@ describe('Model', function () {
jsc.property(
'returns the query string without separator, if any',
common.jscUrl(),
common.jscUrl(true, false),
jsc.tuple(new Array(16).fill(common.jscHexString)),
jsc.array(common.jscQueryString()),
jsc.array(common.jscQueryString()),
@ -184,7 +184,7 @@ describe('Model', function () {
);
jsc.property(
'throws exception on empty fragment of the URL',
common.jscUrl(false, false),
common.jscUrl(false),
function (url) {
let clean = jsdom('', {url: common.urlToString(url)}),
result = false;

32
js/test/UiHelper.js
View File

@ -13,10 +13,9 @@ describe('UiHelper', function () {
jsc.property(
'redirects to home, when the state is null',
common.jscSchemas(),
jsc.nearray(common.jscA2zString()),
function (schema, address) {
var expected = schema + '://' + address.join('') + '/',
common.jscUrl(false, false),
function (url) {
const expected = common.urlToString(url),
clean = jsdom('', {url: expected});
// make window.location.href writable
@ -34,13 +33,11 @@ describe('UiHelper', function () {
jsc.property(
'does not redirect to home, when a new paste is created',
common.jscSchemas(),
jsc.nearray(common.jscA2zString()),
jsc.array(common.jscQueryString()),
common.jscUrl(false),
jsc.nearray(common.jscBase64String()),
function (schema, address, query, fragment) {
var expected = schema + '://' + address.join('') + '/?' +
query.join('') + '#' + fragment.join(''),
function (url, fragment) {
url.fragment = fragment.join('');
const expected = common.urlToString(url),
clean = jsdom('', {url: expected});
// make window.location.href writable
@ -67,15 +64,12 @@ describe('UiHelper', function () {
jsc.property(
'redirects to home',
common.jscSchemas(),
jsc.nearray(common.jscA2zString()),
jsc.array(common.jscQueryString()),
jsc.nearray(common.jscBase64String()),
function (schema, address, query, fragment) {
var expected = schema + '://' + address.join('') + '/',
clean = jsdom('', {
url: expected + '?' + query.join('') + '#' + fragment.join('')
});
common.jscUrl(),
function (url) {
const clean = jsdom('', {url: common.urlToString(url)});
delete(url.query);
delete(url.fragment);
const expected = common.urlToString(url);
// make window.location.href writable
Object.defineProperty(window.location, 'href', {