From 5a06e99643357312b4f52c96f7ff8b8c7b5cd848 Mon Sep 17 00:00:00 2001 From: Jake Date: Wed, 11 Feb 2015 18:25:56 -0600 Subject: [PATCH] Why does only one test seem to be processed --- routes/avatars.js | 5 ++ test/test.js | 219 +++++++++++++++++++++++----------------------- 2 files changed, 114 insertions(+), 110 deletions(-) diff --git a/routes/avatars.js b/routes/avatars.js index 09f0561..814580a 100644 --- a/routes/avatars.js +++ b/routes/avatars.js @@ -45,8 +45,12 @@ module.exports = function(req, res) { userId = userId.replace(/-/g, ""); logging.log(rid + "userid: " + userId); + console.log("THIS WAS CALLED") + try { + console.log("TRIED") 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]); if (err) { logging.error(rid + err); @@ -72,6 +76,7 @@ module.exports = function(req, res) { } }); } catch(e) { + console.log("FAILED") logging.error(rid + "error: " + e.stack); handle_default(rid, 500, -1, userId); } diff --git a/test/test.js b/test/test.js index d1ad371..c632c1e 100644 --- a/test/test.js +++ b/test/test.js @@ -1,6 +1,5 @@ var assert = require("assert"); var fs = require("fs"); - var networking = require("../modules/networking"); var helpers = require("../modules/helpers"); var logging = require("../modules/logging"); @@ -32,10 +31,10 @@ function getRandomInt(min, max) { } var ids = [ -uuid.toLowerCase(), -name.toLowerCase(), -uuid.toUpperCase(), -name.toUpperCase(), + uuid.toLowerCase(), + name.toLowerCase(), + name.toUpperCase(), + uuid.toUpperCase(), ]; describe("Crafatar", function() { @@ -102,7 +101,7 @@ describe("Crafatar", function() { }); }); }); -describe("Avatar", function() { + describe("Avatar", function() { // profile "Alex" - hoping it'll never have a skin var alex_uuid = "ec561538f3fd461daff5086b22154bce"; // profile "Steven" (Steve doesn't exist) - hoping it'll never have a skin @@ -126,62 +125,62 @@ describe("Avatar", function() { done(); }); }); -describe("Errors", function() { - it("should time out on uuid info download", function(done) { - var original_timeout = config.http_timeout; - config.http_timeout = 1; - networking.get_profile(rid, "069a79f444e94726a5befca90e38aaf5", function(err, profile) { - assert.strictEqual(err.code, "ETIMEDOUT"); - config.http_timeout = original_timeout; - done(); + describe("Errors", function() { + it("should time out on uuid info download", function(done) { + var original_timeout = config.http_timeout; + config.http_timeout = 1; + networking.get_profile(rid, "069a79f444e94726a5befca90e38aaf5", function(err, profile) { + assert.strictEqual(err.code, "ETIMEDOUT"); + config.http_timeout = original_timeout; + done(); + }); }); - }); - it("should time out on username info download", function(done) { - var original_timeout = config.http_timeout; - config.http_timeout = 1; - networking.get_username_url(rid, "jomo", 0, function(err, url) { - assert.strictEqual(err.code, "ETIMEDOUT"); - config.http_timeout = original_timeout; - done(); + it("should time out on username info download", function(done) { + var original_timeout = config.http_timeout; + config.http_timeout = 1; + networking.get_username_url(rid, "jomo", 0, function(err, url) { + assert.strictEqual(err.code, "ETIMEDOUT"); + config.http_timeout = original_timeout; + done(); + }); }); - }); - it("should time out on skin download", function(done) { - var original_timeout = config.http_timeout; - config.http_timeout = 1; - networking.get_from(rid, "http://textures.minecraft.net/texture/477be35554684c28bdeee4cf11c591d3c88afb77e0b98da893fd7bc318c65184", function(body, res, error) { - assert.strictEqual(error.code, "ETIMEDOUT"); - config.http_timeout = original_timeout; - done(); + it("should time out on skin download", function(done) { + var original_timeout = config.http_timeout; + config.http_timeout = 1; + networking.get_from(rid, "http://textures.minecraft.net/texture/477be35554684c28bdeee4cf11c591d3c88afb77e0b98da893fd7bc318c65184", function(body, res, error) { + assert.strictEqual(error.code, "ETIMEDOUT"); + config.http_timeout = original_timeout; + done(); + }); }); - }); - it("should not find the skin", function(done) { - assert.doesNotThrow(function() { - networking.get_from(rid, "http://textures.minecraft.net/texture/this-does-not-exist", function(img, response, err) { + it("should not find the skin", function(done) { + assert.doesNotThrow(function() { + networking.get_from(rid, "http://textures.minecraft.net/texture/this-does-not-exist", function(img, response, err) { assert.strictEqual(err, null); // no error here, but it shouldn't throw exceptions done(); }); + }); }); - }); - it("should ignore file updates on invalid files", function(done) { - assert.doesNotThrow(function() { - cache.update_timestamp(rid, "0123456789abcdef0123456789abcdef", "invalid-file.png"); - }); - done(); - }); - it("should not find the file", function(done) { - skins.open_skin(rid, "non/existant/path", function(err, img) { - assert.notStrictEqual(err, null); + it("should ignore file updates on invalid files", function(done) { + assert.doesNotThrow(function() { + cache.update_timestamp(rid, "0123456789abcdef0123456789abcdef", "invalid-file.png"); + }); done(); }); + it("should not find the file", function(done) { + skins.open_skin(rid, "non/existant/path", function(err, img) { + assert.notStrictEqual(err, null); + done(); + }); + }); }); -}); -describe("Server", function() { - before(function(done) { - server.boot(function() { - done(); + describe("Server", function() { + before(function(done) { + server.boot(function() { + done(); + }); }); - }); // Test the home page it("should return a 200 (home page)", function(done) { @@ -241,6 +240,12 @@ describe("Server", function() { var locations = ["avatars", "capes", "skins", "renders/head"] for (var l in locations) { var location = locations[l]; + it("should return a 200 (valid input " + location + ")", function(done) { + request.get("http://localhost:3000/" + location + "/Jake0oo0", function(error, res, body) { + assert.equal(200, res.statusCode); + done(); + }); + }); it("should return a 422 (invalid id " + location + ")", function(done) { request.get("http://localhost:3000/" + location + "/thisisaninvaliduuid", function(error, res, body) { assert.equal(422, res.statusCode); @@ -248,12 +253,6 @@ describe("Server", function() { }); }); - it("should return a 200 (valid input " + location + ")", function(done) { - request.get("http://localhost:3000/" + location + "/Jake0oo0", function(error, res, body) { - assert.equal(200, res.statusCode); - done(); - }); - }); } // testing all paths for default images @@ -380,61 +379,61 @@ describe("Server", function() { } }); -describe("Networking: Skin", function() { - it("should not fail (uuid)", function(done) { - helpers.get_skin(rid, id, function(err, hash, img) { - assert.strictEqual(err, null); - done(); - }); - }); -}); - -describe("Networking: Render", function() { - it("should not fail (full body)", function(done) { - helpers.get_render(rid, id, 6, true, true, function(err, hash, img) { - assert.strictEqual(err, null); - done(); - }); - }); - it("should not fail (only head)", function(done) { - helpers.get_render(rid, id, 6, true, false, function(err, hash, img) { - assert.strictEqual(err, null); - done(); - }); - }); -}); - -describe("Networking: Cape", function() { - it("should not fail (possible cape)", function(done) { - helpers.get_cape(rid, id, function(err, hash, img) { - assert.strictEqual(err, null); - done(); - }); - }); -}); - - -describe("Errors", function() { - before(function() { - cache.get_redis().flushall(); - }); - - if (id_type == "uuid") { - it("uuid should be rate limited", function(done) { - networking.get_profile(rid, id, function(err, profile) { - assert.strictEqual(profile.error, "TooManyRequestsException"); - done(); + describe("Networking: Skin", function() { + it("should not fail (uuid)", function(done) { + helpers.get_skin(rid, id, function(err, hash, img) { + assert.strictEqual(err, null); + done(); + }); + }); }); - }); - } else { - it("username should NOT be rate limited (username)", function(done) { - helpers.get_avatar(rid, id, false, 160, function(err, status, image) { - assert.strictEqual(err, null); - done(); + + describe("Networking: Render", function() { + it("should not fail (full body)", function(done) { + helpers.get_render(rid, id, 6, true, true, function(err, hash, img) { + assert.strictEqual(err, null); + done(); + }); + }); + it("should not fail (only head)", function(done) { + helpers.get_render(rid, id, 6, true, false, function(err, hash, img) { + assert.strictEqual(err, null); + done(); + }); + }); }); - }); + + describe("Networking: Cape", function() { + it("should not fail (possible cape)", function(done) { + helpers.get_cape(rid, id, function(err, hash, img) { + assert.strictEqual(err, null); + done(); + }); + }); + }); + + + describe("Errors", function() { + before(function() { + cache.get_redis().flushall(); + }); + + if (id_type == "uuid") { + it("uuid should be rate limited", function(done) { + networking.get_profile(rid, id, function(err, profile) { + assert.strictEqual(profile.error, "TooManyRequestsException"); + done(); + }); + }); + } else { + it("username should NOT be rate limited (username)", function(done) { + helpers.get_avatar(rid, id, false, 160, function(err, status, image) { + assert.strictEqual(err, null); + done(); + }); + }); + } + }); + })(id, id_type); } -}); -})(id, id_type); -} }); \ No newline at end of file