welp..fix

This commit is contained in:
Jake 2015-02-11 19:31:05 -06:00
parent 5a06e99643
commit 20d8b281bd
3 changed files with 135 additions and 136 deletions

View File

@ -1,7 +1,6 @@
language: node_js language: node_js
node_js: node_js:
- "0.10" - "0.10"
- "0.12"
before_script: before_script:
- cp "modules/config.example.js" "modules/config.js" - cp "modules/config.example.js" "modules/config.js"
before_install: before_install:

View File

@ -45,12 +45,9 @@ module.exports = function(req, res) {
userId = userId.replace(/-/g, ""); userId = userId.replace(/-/g, "");
logging.log(rid + "userid: " + userId); logging.log(rid + "userid: " + userId);
console.log("THIS WAS CALLED")
try { try {
console.log("TRIED")
helpers.get_avatar(rid, userId, helm, size, function(err, status, image, hash) { helpers.get_avatar(rid, userId, helm, size, function(err, status, image, hash) {
console.log("I DID RUN COVERALLS!!")
logging.log(rid + "storage type: " + human_status[status]); logging.log(rid + "storage type: " + human_status[status]);
if (err) { if (err) {
logging.error(rid + err); logging.error(rid + err);
@ -76,7 +73,6 @@ module.exports = function(req, res) {
} }
}); });
} catch(e) { } catch(e) {
console.log("FAILED")
logging.error(rid + "error: " + e.stack); logging.error(rid + "error: " + e.stack);
handle_default(rid, 500, -1, userId); handle_default(rid, 500, -1, userId);
} }

View File

@ -31,10 +31,10 @@ function getRandomInt(min, max) {
} }
var ids = [ var ids = [
uuid.toLowerCase(), uuid.toLowerCase(),
name.toLowerCase(), name.toLowerCase(),
name.toUpperCase(), name.toUpperCase(),
uuid.toUpperCase(), uuid.toUpperCase(),
]; ];
describe("Crafatar", function() { describe("Crafatar", function() {
@ -101,7 +101,7 @@ describe("Crafatar", function() {
}); });
}); });
}); });
describe("Avatar", function() { describe("Avatar", function() {
// profile "Alex" - hoping it'll never have a skin // profile "Alex" - hoping it'll never have a skin
var alex_uuid = "ec561538f3fd461daff5086b22154bce"; var alex_uuid = "ec561538f3fd461daff5086b22154bce";
// profile "Steven" (Steve doesn't exist) - hoping it'll never have a skin // profile "Steven" (Steve doesn't exist) - hoping it'll never have a skin
@ -125,7 +125,7 @@ describe("Crafatar", function() {
done(); done();
}); });
}); });
describe("Errors", function() { describe("Errors", function() {
it("should time out on uuid info download", function(done) { it("should time out on uuid info download", function(done) {
var original_timeout = config.http_timeout; var original_timeout = config.http_timeout;
config.http_timeout = 1; config.http_timeout = 1;
@ -173,9 +173,9 @@ describe("Crafatar", function() {
done(); done();
}); });
}); });
}); });
describe("Server", function() { describe("Server", function() {
before(function(done) { before(function(done) {
server.boot(function() { server.boot(function() {
done(); done();
@ -240,38 +240,42 @@ describe("Crafatar", function() {
var locations = ["avatars", "capes", "skins", "renders/head"] var locations = ["avatars", "capes", "skins", "renders/head"]
for (var l in locations) { for (var l in locations) {
var location = locations[l]; var location = locations[l];
(function(location) {
if (location !== "capes") {
it("should return a 200 (valid input " + location + ")", function(done) { it("should return a 200 (valid input " + location + ")", function(done) {
request.get("http://localhost:3000/" + location + "/Jake0oo0", function(error, res, body) { request.get("http://localhost:3000/" + location + "/Jake0oo0", function(error, res, body) {
assert.equal(200, res.statusCode); assert.equal(200, res.statusCode);
done(); done();
}); });
}); })
}
it("should return a 422 (invalid id " + location + ")", function(done) { it("should return a 422 (invalid id " + location + ")", function(done) {
request.get("http://localhost:3000/" + location + "/thisisaninvaliduuid", function(error, res, body) { request.get("http://localhost:3000/" + location + "/thisisaninvaliduuid", function(error, res, body) {
assert.equal(422, res.statusCode); assert.equal(422, res.statusCode);
done(); done();
}); });
}); });
})(location);
} }
// testing all paths for default images //testing all paths for default images
locations = ["avatars", "capes", "skins"] locations = ["avatars", "skins"]
for (var l in locations) { for (var l in locations) {
var location = locations[l]; var location = locations[l];
(function(location) {
it("should return a 404 (default steve image " + location + ")", function(done) { it("should return a 404 (default steve image " + location + ")", function(done) {
request.get("http://localhost:3000/" + location + "/invalidjsvns?default=steve", function(error, res, body) { request.get("http://localhost:3000/" + location + "/invalidjsvns?default=steve", function(error, res, body) {
assert.equal(404, res.statusCode); assert.equal(404, res.statusCode);
done(); done();
}); });
}); });
it("should return a 200 (default external image " + location + ")", function(done) { it("should return a 200 (default external image " + location + ")", function(done) {
request.get("http://localhost:3000/" + location + "/invalidjsvns?default=https%3A%2F%2Fi.imgur.com%2FocJVWAc.png", function(error, res, body) { request.get("http://localhost:3000/" + location + "/invalidjsvns?default=https%3A%2F%2Fi.imgur.com%2FocJVWAc.png", function(error, res, body) {
assert.equal(200, res.statusCode); assert.equal(200, res.statusCode);
done(); done();
}); });
}); });
})(location);
} }
after(function(done) { after(function(done) {
@ -379,16 +383,16 @@ describe("Crafatar", function() {
} }
}); });
describe("Networking: Skin", function() { describe("Networking: Skin", function() {
it("should not fail (uuid)", function(done) { it("should not fail (uuid)", function(done) {
helpers.get_skin(rid, id, function(err, hash, img) { helpers.get_skin(rid, id, function(err, hash, img) {
assert.strictEqual(err, null); assert.strictEqual(err, null);
done(); done();
}); });
}); });
}); });
describe("Networking: Render", function() { describe("Networking: Render", function() {
it("should not fail (full body)", function(done) { it("should not fail (full body)", function(done) {
helpers.get_render(rid, id, 6, true, true, function(err, hash, img) { helpers.get_render(rid, id, 6, true, true, function(err, hash, img) {
assert.strictEqual(err, null); assert.strictEqual(err, null);
@ -401,19 +405,19 @@ describe("Crafatar", function() {
done(); done();
}); });
}); });
}); });
describe("Networking: Cape", function() { describe("Networking: Cape", function() {
it("should not fail (possible cape)", function(done) { it("should not fail (possible cape)", function(done) {
helpers.get_cape(rid, id, function(err, hash, img) { helpers.get_cape(rid, id, function(err, hash, img) {
assert.strictEqual(err, null); assert.strictEqual(err, null);
done(); done();
}); });
}); });
}); });
describe("Errors", function() { describe("Errors", function() {
before(function() { before(function() {
cache.get_redis().flushall(); cache.get_redis().flushall();
}); });
@ -433,7 +437,7 @@ describe("Crafatar", function() {
}); });
}); });
} }
}); });
})(id, id_type); })(id, id_type);
} }
}); });