azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-21 23:41:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests with new default code

Browse Source
This commit is contained in:
Jake 2015-06-24 15:08:05 -05:00
parent 8c39d0c017
commit d2ab7b87ad
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/routes/avatars.js
View File

@ -101,6 +101,6 @@ module.exports = function(req, callback) {
}); });
} catch (e) { } catch (e) {
logging.error(req.id, "error:", e.stack); logging.error(req.id, "error:", e.stack);
handle_default(-1, userId, size, def, e, callback); handle_default(-1, userId, size, def, req, e, callback);
} }
}; };

4
lib/routes/renders.js
View File

@ -114,11 +114,11 @@ module.exports = function(req, callback) {
}); });
} else { } else {
logging.log(rid, "image not found, using default."); logging.log(rid, "image not found, using default.");
handle_default(rid, scale, helm, body, status, userId, scale, def, err, callback); handle_default(rid, scale, helm, body, status, userId, scale, def, req, err, callback);
} }
}); });
} catch(e) { } catch(e) {
logging.error(rid, "error:", e.stack); logging.error(rid, "error:", e.stack);
handle_default(rid, scale, helm, body, -1, userId, scale, def, e, callback); handle_default(rid, scale, helm, body, -1, userId, scale, def, req, e, callback);
} }
}; };

6
lib/routes/skins.js
View File

@ -4,7 +4,7 @@ var skins = require("../skins");
var path = require("path"); var path = require("path");
var lwip = require("lwip"); var lwip = require("lwip");
function handle_default(img_status, userId, size, def, req, err, callback) { function handle_default(img_status, userId, def, req, err, callback) {
def = def || skins.default_skin(userId); def = def || skins.default_skin(userId);
if (def !== "steve" && def !== "alex") { if (def !== "steve" && def !== "alex") {
if (helpers.id_valid(def)) { if (helpers.id_valid(def)) {
@ -93,11 +93,11 @@ module.exports = function(req, callback) {
err: err err: err
}); });
} else { } else {
handle_default(2, userId, def, err, callback); handle_default(2, userId, def, req, err, callback);
} }
}); });
} catch(e) { } catch(e) {
logging.error(rid, "error:", e.stack); logging.error(rid, "error:", e.stack);
handle_default(-1, userId, def, e, callback); handle_default(-1, userId, def, req, e, callback);
} }
}; };

5
test/test.js
View File

@ -640,6 +640,11 @@ describe("Crafatar", function() {
etag: '"alex"', etag: '"alex"',
crc32: [737759773, 66512449] crc32: [737759773, 66512449]
}, },
"helm body render with non-existent uuid defaulting to userId": {
url: "http://localhost:3000/renders/body/00000000000000000000000000000000?scale=2&helm&default=alex",
etag: '"alex"',
crc32: [737759773, 66512449]
},
"helm body render with non-existent uuid defaulting to url": { "helm body render with non-existent uuid defaulting to url": {
url: "http://localhost:3000/renders/body/00000000000000000000000000000000?scale=2&helm&default=http://example.com", url: "http://localhost:3000/renders/body/00000000000000000000000000000000?scale=2&helm&default=http://example.com",
crc32: 0, crc32: 0,