From d9c6b95c877e40bb3a3b4562f9e4db5a1b6e2787 Mon Sep 17 00:00:00 2001 From: Miguel Pereira Date: Thu, 31 May 2018 18:49:38 +0100 Subject: [PATCH] test --- test/index.Test.dev.js | 2 - test/index.Test.js | 2 + .../posts/all/routes.posts.all.ranked.Test.js | 2 +- test/units/projects/createProjects.Unit.js | 47 ++++---- ...alDendroTimelineWithPostsAndShares.Unit.js | 19 +++- .../social/createTimelineInMySQL.Unit.js | 101 ++++++++++++++++++ test/units/social/createTimelineInMySQL.js | 46 -------- 7 files changed, 148 insertions(+), 71 deletions(-) create mode 100644 test/units/social/createTimelineInMySQL.Unit.js delete mode 100644 test/units/social/createTimelineInMySQL.js diff --git a/test/index.Test.dev.js b/test/index.Test.dev.js index b1f1e3e4..a7fbf8d5 100644 --- a/test/index.Test.dev.js +++ b/test/index.Test.dev.js @@ -162,8 +162,6 @@ require(Pathfinder.absPathInTestsFolder("/routes/interactions/fill_in_inherited_ // /interactions/delete_all require(Pathfinder.absPathInTestsFolder("/routes/interactions/delete_all/routes.interactions.deleteAll.Test.js")); -return; - // Import projects tests require(Pathfinder.absPathInTestsFolder("/routes/projects/import/route.projects.import.Test.js")); diff --git a/test/index.Test.js b/test/index.Test.js index 68c4f67d..518c4487 100644 --- a/test/index.Test.js +++ b/test/index.Test.js @@ -19,6 +19,8 @@ global.Config = Config; global.tests = {}; +return; + require(Pathfinder.absPathInTestsFolder("/init/loadOntologiesCache.Test.js")); // TODO diff --git a/test/routes/posts/all/routes.posts.all.ranked.Test.js b/test/routes/posts/all/routes.posts.all.ranked.Test.js index 00a8cbc7..5d798679 100644 --- a/test/routes/posts/all/routes.posts.all.ranked.Test.js +++ b/test/routes/posts/all/routes.posts.all.ranked.Test.js @@ -11,7 +11,7 @@ const socialDendroUtils = require(Pathfinder.absPathInTestsFolder("/utils/social const createSocialDendroTimelineWithPostsAndSharesUnit = appUtils.requireUncached(Pathfinder.absPathInTestsFolder("units/social/createSocialDendroTimelineWithPostsAndShares.Unit.js")); const pageNumber = 1; -const useRank = 0; +const useRank = 1; describe("Get all posts URIs with pagination tests", function () { diff --git a/test/units/projects/createProjects.Unit.js b/test/units/projects/createProjects.Unit.js index 4272076d..61835e2b 100644 --- a/test/units/projects/createProjects.Unit.js +++ b/test/units/projects/createProjects.Unit.js @@ -66,29 +66,40 @@ module.exports.setup = function (finish) } else { - appUtils.registerStartTimeForUnit(path.basename(__filename)); - async.mapSeries(projectsData, function (projectData, cb) + let createTimelineInMySQL = requireUncached(Pathfinder.absPathInTestsFolder("units/social/createTimelineInMySQL.Unit.js")); + createTimelineInMySQL.setup(function (err, results) { - userUtils.loginUser(demouser1.username, demouser1.password, function (err, agent) + if (err) { - if (err) - { - end(); - cb(err, agent); - } - else + finish(err, results); + } + else + { + appUtils.registerStartTimeForUnit(path.basename(__filename)); + async.mapSeries(projectsData, function (projectData, cb) { - projectUtils.createNewProject(true, agent, projectData, function (err, res) + userUtils.loginUser(demouser1.username, demouser1.password, function (err, agent) { - end(); - cb(err, res); + if (err) + { + end(); + cb(err, agent); + } + else + { + projectUtils.createNewProject(true, agent, projectData, function (err, res) + { + end(); + cb(err, res); + }); + } }); - } - }); - }, function (err, results) - { - appUtils.registerStopTimeForUnit(path.basename(__filename)); - finish(err, results); + }, function (err, results) + { + appUtils.registerStopTimeForUnit(path.basename(__filename)); + finish(err, results); + }); + } }); } }); diff --git a/test/units/social/createSocialDendroTimelineWithPostsAndShares.Unit.js b/test/units/social/createSocialDendroTimelineWithPostsAndShares.Unit.js index 88763fd3..d3a3f81c 100644 --- a/test/units/social/createSocialDendroTimelineWithPostsAndShares.Unit.js +++ b/test/units/social/createSocialDendroTimelineWithPostsAndShares.Unit.js @@ -23,9 +23,20 @@ function requireUncached (module) module.exports.setup = function (finish) { - let commentSomePostsUnit = requireUncached(Pathfinder.absPathInTestsFolder("units/social/commentSomePosts.Unit.js")); - commentSomePostsUnit.setup(function (err, results) + /* let createTimelineInMySQL = requireUncached(Pathfinder.absPathInTestsFolder("units/social/createTimelineInMySQL.Unit.js")); + createTimelineInMySQL.setup(function (err, results) { - finish(err, results); - }); + if (err) + { + finish(err, results); + } + else + {*/ + let commentSomePostsUnit = requireUncached(Pathfinder.absPathInTestsFolder("units/social/commentSomePosts.Unit.js")); + commentSomePostsUnit.setup(function (err, results) + { + finish(err, results); + }); + /* } + });*/ }; diff --git a/test/units/social/createTimelineInMySQL.Unit.js b/test/units/social/createTimelineInMySQL.Unit.js new file mode 100644 index 00000000..a34374cd --- /dev/null +++ b/test/units/social/createTimelineInMySQL.Unit.js @@ -0,0 +1,101 @@ +process.env.NODE_ENV = "test"; + +const Pathfinder = global.Pathfinder; + +const chai = require("chai"); +chai.use(require("chai-http")); + +const userUtils = require(Pathfinder.absPathInTestsFolder("utils/user/userUtils.js")); +const socialDendroUtils = require(Pathfinder.absPathInTestsFolder("/utils/social/socialDendroUtils")); + +const demouser1 = require(Pathfinder.absPathInTestsFolder("mockdata/users/demouser1")); +const demouser2 = require(Pathfinder.absPathInTestsFolder("mockdata/users/demouser2")); +const demouser3 = require(Pathfinder.absPathInTestsFolder("mockdata/users/demouser3")); + +module.exports.setup = function (finish) +{ + userUtils.loginUser(demouser1.username, demouser1.password, function (err, agent) + { + if (err) + { + finish(err, agent); + } + else + { + socialDendroUtils.getPostsURIsForUser(true, agent, 1, 0, function (err, res) + { + if (err) + { + finish(err, res); + } + else + { + socialDendroUtils.getPostsURIsForUser(true, agent, 1, 1, function (err, res) + { + if (err) + { + finish(err, res); + } + else + { + userUtils.loginUser(demouser2.username, demouser2.password, function (err, agent) + { + if (err) + { + finish(err, agent); + } + else + { + socialDendroUtils.getPostsURIsForUser(true, agent, 1, 0, function (err, res) + { + if (err) + { + finish(err, res); + } + else + { + socialDendroUtils.getPostsURIsForUser(true, agent, 1, 1, function (err, res) + { + if (err) + { + finish(err, res); + } + else + { + userUtils.loginUser(demouser3.username, demouser3.password, function (err, agent) + { + if (err) + { + finish(err, agent); + } + else + { + socialDendroUtils.getPostsURIsForUser(true, agent, 1, 0, function (err, res) + { + if (err) + { + finish(err, res); + } + else + { + socialDendroUtils.getPostsURIsForUser(true, agent, 1, 1, function (err, res) + { + finish(err, res); + }); + } + }); + } + }); + } + }); + } + }); + } + }); + } + }); + } + }); + } + }); +}; diff --git a/test/units/social/createTimelineInMySQL.js b/test/units/social/createTimelineInMySQL.js deleted file mode 100644 index f7ef2853..00000000 --- a/test/units/social/createTimelineInMySQL.js +++ /dev/null @@ -1,46 +0,0 @@ -process.env.NODE_ENV = "test"; - -const Pathfinder = global.Pathfinder; - -const chai = require("chai"); -chai.use(require("chai-http")); - -const userUtils = require(Pathfinder.absPathInTestsFolder("utils/user/userUtils.js")); -const socialDendroUtils = require(Pathfinder.absPathInTestsFolder("/utils/social/socialDendroUtils")); - -const demouser1 = require(Pathfinder.absPathInTestsFolder("mockdata/users/demouser1")); -const demouser2 = require(Pathfinder.absPathInTestsFolder("mockdata/users/demouser2")); -const demouser3 = require(Pathfinder.absPathInTestsFolder("mockdata/users/demouser3")); - -module.exports.setup = function (finish) -{ - userUtils.loginUser(demouser1.username, demouser1.password, function (err, agent) - { - if (err) - { - finish(err, agent); - } - else - { - // create unranked timeline - socialDendroUtils.getPostsURIsForUser(true, agent, 1, 0, function (err, res) - { - if (err) - { - finish(err, agent); - } - else - { - // create ranked timeline - socialDendroUtils.getPostsURIsForUser(true, agent, 1, 1, function (err, res) - { - if (err) - { - finish(err, agent); - } - }); - } - }); - } - }); -};