Browse Source

Fixes lint warning W004 in /test

Tim van der Meij 11 years ago
parent
commit
7a2cb7cddd
  1. 5
      test/downloadutils.js
  2. 7
      test/test.js
  3. 9
      test/testutils.js
  4. 8
      test/unit/font_spec.js

5
test/downloadutils.js

@ -28,19 +28,20 @@ function downloadFile(file, url, callback, redirects) { @@ -28,19 +28,20 @@ function downloadFile(file, url, callback, redirects) {
var completed = false;
var protocol = /^https:\/\//.test(url) ? https : http;
protocol.get(url, function (response) {
var redirectTo;
if (response.statusCode === 301 || response.statusCode === 302 ||
response.statusCode === 307 || response.statusCode === 308) {
if (redirects > 10) {
callback('Too many redirects');
}
var redirectTo = response.headers.location;
redirectTo = response.headers.location;
redirectTo = require('url').resolve(url, redirectTo);
downloadFile(file, redirectTo, callback, (redirects || 0) + 1);
return;
}
if (response.statusCode === 404 && url.indexOf('web.archive.org') < 0) {
// trying waybackmachine
var redirectTo = 'http://web.archive.org/web/' + url;
redirectTo = 'http://web.archive.org/web/' + url;
downloadFile(file, redirectTo, callback, (redirects || 0) + 1);
return;
}

7
test/test.js

@ -438,10 +438,11 @@ function refTestPostHandler(req, res) { @@ -438,10 +438,11 @@ function refTestPostHandler(req, res) {
res.writeHead(200, {'Content-Type': 'text/plain'});
res.end();
var session;
if (pathname === '/tellMeToQuit') {
// finding by path
var browserPath = parsedUrl.query.path;
var session = sessions.filter(function (session) {
session = sessions.filter(function (session) {
return session.config.path === browserPath;
})[0];
monitorBrowserTimeout(session, null);
@ -463,7 +464,7 @@ function refTestPostHandler(req, res) { @@ -463,7 +464,7 @@ function refTestPostHandler(req, res) {
var snapshot = data.snapshot;
var lastPageNum = data.lastPageNum;
var session = getSession(browser);
session = getSession(browser);
monitorBrowserTimeout(session, handleSessionTimeout);
var taskResults = session.taskResults[id];
@ -720,4 +721,4 @@ var host = '127.0.0.1'; @@ -720,4 +721,4 @@ var host = '127.0.0.1';
var options = parseOptions();
var stats;
main();
main();

9
test/testutils.js

@ -75,14 +75,15 @@ var stdinBuffer = '', endOfStdin = false, stdinInitialized = false; @@ -75,14 +75,15 @@ var stdinBuffer = '', endOfStdin = false, stdinInitialized = false;
var stdinOnLineCallbacks = [];
function handleStdinBuffer() {
var callback;
if (endOfStdin) {
if (stdinBuffer && stdinOnLineCallbacks.length > 0) {
var callback = stdinOnLineCallbacks.shift();
callback = stdinOnLineCallbacks.shift();
callback(stdinBuffer);
stdinBuffer = null;
}
while (stdinOnLineCallbacks.length > 0) {
var callback = stdinOnLineCallbacks.shift();
callback = stdinOnLineCallbacks.shift();
callback();
}
return;
@ -92,7 +93,7 @@ function handleStdinBuffer() { @@ -92,7 +93,7 @@ function handleStdinBuffer() {
if (i < 0) {
return;
}
var callback = stdinOnLineCallbacks.shift();
callback = stdinOnLineCallbacks.shift();
var result = stdinBuffer.substring(0, i + 1);
stdinBuffer = stdinBuffer.substring(i + 1);
callback(result);
@ -143,4 +144,4 @@ exports.confirm = function confirm(message, callback) { @@ -143,4 +144,4 @@ exports.confirm = function confirm(message, callback) {
confirm(message, callback);
}
});
};
};

8
test/unit/font_spec.js

@ -196,7 +196,7 @@ describe('font', function() { @@ -196,7 +196,7 @@ describe('font', function() {
expect(charset.charset[1]).toEqual('exclam');
// CID font
var charset = parser.parseCharsets(3, 2, new CFFStrings(), true);
charset = parser.parseCharsets(3, 2, new CFFStrings(), true);
expect(charset.charset[1]).toEqual(2);
});
@ -212,7 +212,7 @@ describe('font', function() { @@ -212,7 +212,7 @@ describe('font', function() {
expect(charset.charset).toEqual(['.notdef', 'quoteright', 'parenleft']);
// CID font
var charset = parser.parseCharsets(3, 2, new CFFStrings(), true);
charset = parser.parseCharsets(3, 2, new CFFStrings(), true);
expect(charset.charset).toEqual(['.notdef', 8, 9]);
});
@ -229,7 +229,7 @@ describe('font', function() { @@ -229,7 +229,7 @@ describe('font', function() {
expect(charset.charset).toEqual(['.notdef', 'quoteright', 'parenleft']);
// CID font
var charset = parser.parseCharsets(3, 2, new CFFStrings(), true);
charset = parser.parseCharsets(3, 2, new CFFStrings(), true);
expect(charset.charset).toEqual(['.notdef', 8, 9]);
});
@ -349,7 +349,7 @@ describe('font', function() { @@ -349,7 +349,7 @@ describe('font', function() {
var parser = new Type1Parser(stream);
expect(parser.readNumberArray()).toEqual([1, 2]);
// Variation on spacing.
var stream = new StringStream('[ 1 2 ]');
stream = new StringStream('[ 1 2 ]');
parser = new Type1Parser(stream);
expect(parser.readNumberArray()).toEqual([1, 2]);
});

Loading…
Cancel
Save