Fixes unit tests and adds few for util.js
This commit is contained in:
parent
00f1d6dbf1
commit
0dd445bf18
13
src/util.js
13
src/util.js
@ -57,6 +57,8 @@ function assert(cond, msg) {
|
|||||||
error(msg);
|
error(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Combines two URLs. The baseUrl shall be absolute URL. If the url is an
|
||||||
|
// absolute URL, it will be returned as is.
|
||||||
function combineUrl(baseUrl, url) {
|
function combineUrl(baseUrl, url) {
|
||||||
if (url.indexOf(':') >= 0)
|
if (url.indexOf(':') >= 0)
|
||||||
return url;
|
return url;
|
||||||
@ -67,10 +69,13 @@ function combineUrl(baseUrl, url) {
|
|||||||
return baseUrl.substring(0, i) + url;
|
return baseUrl.substring(0, i) + url;
|
||||||
} else {
|
} else {
|
||||||
// relative path
|
// relative path
|
||||||
var i = baseUrl.lastIndexOf('#');
|
var pathLength = baseUrl.length, i;
|
||||||
i = baseUrl.lastIndexOf('?', i < 0 ? baseUrl.length : i);
|
i = baseUrl.lastIndexOf('#');
|
||||||
i = baseUrl.lastIndexOf('/', i < 0 ? baseUrl.length : i);
|
pathLength = i >= 0 ? i : pathLength;
|
||||||
return baseUrl.substring(0, i + 1) + url;
|
i = baseUrl.lastIndexOf('?', pathLength);
|
||||||
|
pathLength = i >= 0 ? i : pathLength;
|
||||||
|
var prefixLength = baseUrl.lastIndexOf('/', pathLength);
|
||||||
|
return baseUrl.substring(0, prefixLength + 1) + url;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PDFJS.combineUrl = combineUrl;
|
PDFJS.combineUrl = combineUrl;
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
describe('api', function() {
|
describe('api', function() {
|
||||||
// TODO run with worker enabled
|
// TODO run with worker enabled
|
||||||
PDFJS.disableWorker = true;
|
PDFJS.disableWorker = true;
|
||||||
var basicApiUrl = '../pdfs/basicapi.pdf';
|
var basicApiUrl = combineUrl(window.location.href, '../pdfs/basicapi.pdf');
|
||||||
function waitsForPromise(promise) {
|
function waitsForPromise(promise) {
|
||||||
waitsFor(function() {
|
waitsFor(function() {
|
||||||
return promise.isResolved || promise.isRejected;
|
return promise.isResolved || promise.isRejected;
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
<script type="text/javascript" src="stream_spec.js"></script>
|
<script type="text/javascript" src="stream_spec.js"></script>
|
||||||
<script type="text/javascript" src="api_spec.js"></script>
|
<script type="text/javascript" src="api_spec.js"></script>
|
||||||
<script type="text/javascript" src="metadata_spec.js"></script>
|
<script type="text/javascript" src="metadata_spec.js"></script>
|
||||||
|
<script type="text/javascript" src="util_spec.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
51
test/unit/util_spec.js
Normal file
51
test/unit/util_spec.js
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||||
|
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
describe('util', function() {
|
||||||
|
|
||||||
|
describe('combineUrl', function() {
|
||||||
|
it('absolute url with protocol stays as is', function() {
|
||||||
|
var baseUrl = 'http://server/index.html';
|
||||||
|
var url = 'http://server2/test2.html';
|
||||||
|
var result = combineUrl(baseUrl, url);
|
||||||
|
var expected = 'http://server2/test2.html';
|
||||||
|
expect(result).toEqual(expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('absolute url without protocol uses prefix from base', function() {
|
||||||
|
var baseUrl = 'http://server/index.html';
|
||||||
|
var url = '/test2.html';
|
||||||
|
var result = combineUrl(baseUrl, url);
|
||||||
|
var expected = 'http://server/test2.html';
|
||||||
|
expect(result).toEqual(expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('combines relative url with base', function() {
|
||||||
|
var baseUrl = 'http://server/index.html';
|
||||||
|
var url = 'test2.html';
|
||||||
|
var result = combineUrl(baseUrl, url);
|
||||||
|
var expected = 'http://server/test2.html';
|
||||||
|
expect(result).toEqual(expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('combines relative url (w/hash) with base', function() {
|
||||||
|
var baseUrl = 'http://server/index.html#!/test';
|
||||||
|
var url = 'test2.html';
|
||||||
|
var result = combineUrl(baseUrl, url);
|
||||||
|
var expected = 'http://server/test2.html';
|
||||||
|
expect(result).toEqual(expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('combines relative url (w/query) with base', function() {
|
||||||
|
var baseUrl = 'http://server/index.html?search=/test';
|
||||||
|
var url = 'test2.html';
|
||||||
|
var result = combineUrl(baseUrl, url);
|
||||||
|
var expected = 'http://server/test2.html';
|
||||||
|
expect(result).toEqual(expected);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user