minor fixes, make tests pass

Author: iliakan

handlers/auth/controller/disconnect.js

@@ -7,9 +7,6 @@ var config = require('config');
 exports.post = function* (next) {
 
   var user = this.user;
-//  var user = this.req.user;
-
-  yield function(callback) {};
 
   for (var i = 0; i < user.providers.length; i++) {
     var provider = user.providers[i];

handlers/auth/out.js

@@ -1,3 +1,4 @@
+// deprecated, not used
 exports.get = function*(next) {
   this.logout();
   this.redirect('/');

handlers/auth/test/fixtures/db.js

@@ -11,10 +11,11 @@ const assert = require('better-assert');
 describe('Authorization', function() {
 
   var server;
-  before(function * () {
+  before(function* () {
+
     yield* db.loadModels(fixtures);
 
-    // app.listen() uses a random port,
+    // APP.LISTEN() USES A RANDOM PORT,
     // which superagent gets as server.address().port
     // so that every run will get it's own port
     server = app.listen();
@@ -27,7 +28,7 @@ describe('Authorization', function() {
       request(server)
         .post('/auth/login/local')
         .send({
-          login:    fixtures.User[2].email,
+          email:    fixtures.User[2].email,
           password: fixtures.User[2].password
         })
         .expect(401, done);
@@ -45,7 +46,7 @@ describe('Authorization', function() {
       agent
         .post('/auth/login/local')
         .send({
-          login:    fixtures.User[0].email,
+          email:    fixtures.User[0].email,
           password: fixtures.User[0].password
         })
         .expect(200, done);
@@ -74,9 +75,9 @@ describe('Authorization', function() {
     });
 
     var userData = {
-      email: Math.random() + "@gmail.com",
+      email:       Math.random() + "@gmail.com",
       displayName: "Random guy",
-      password: "somepass"
+      password:    "somepass"
     };
 
     it('should create a new user', function(done) {
@@ -99,13 +100,13 @@ describe('Authorization', function() {
      res.body.displayName.should.be.eql(userData.displayName);
      done(err);
      });
-    it('should be log in the new user', function(done) {
-      request(server)
-        .post('/auth/login/local')
-        .send({email: userData.email, password: userData.password})
-        .expect(200, done);
-    });
-*/
+     it('should be log in the new user', function(done) {
+     request(server)
+     .post('/auth/login/local')
+     .send({email: userData.email, password: userData.password})
+     .expect(200, done);
+     });
+     */
 
     it('should fail to create a new user with same email', function(done) {
       request(server)

handlers/auth/test/server/local.js

@@ -40,7 +40,7 @@ exports.get = function* (next) {
     };
   });
 
-  if (quizResults) {
+  if (quizResults.length) {
     this.locals.tabs.quiz = {
       url: `/profile/${user.profileName}/quiz`,
       title: 'Тесты'

handlers/profileGuest/controller/index.js

@@ -77,25 +77,26 @@ var UserSchema = new mongoose.Schema({
   },
   profileName:               {
     type:     String,
-    required: true,
     validate: [
       {
         validator: function(value) {
-          return this.deleted || /^[a-z0-9-]*$/.test(value);
+          // also checks required
+          return this.deleted || value && value.length >= 2;
         },
-        msg:       "В имени профиля допустимы только буквы a-z, цифры и дефис."
+        msg:       "Минимальная длина имени профиля: 2 символа."
       },
       {
         validator: function(value) {
-          return this.deleted || value.length <= 64;
+          return this.deleted || /^[a-z0-9-]*$/.test(value);
         },
-        msg:       "Максимальная длина имени профиля: 64 символа."
+        msg:       "В имени профиля допустимы только буквы a-z, цифры и дефис."
       },
       {
         validator: function(value) {
-          return this.deleted || value.length >= 2;
+          // if no value, this validator passes (another one triggers the error)
+          return this.deleted || !value || value.length <= 64;
         },
-        msg:       "Минимальная длина имени профиля: 2 символа."
+        msg:       "Максимальная длина имени профиля: 64 символа."
       }
     ],
 

handlers/users/models/user.js

@@ -2,6 +2,7 @@ exports.User = [
   { "_id": "000000000000000000000001",
     "created": new Date(2014,0,1),
     "displayName": "ilya kantor",
+    "profileName": "iliakan",
     "email": "iliakan@gmail.com",
     "password": "1234",
     "verifiedEmail": true
@@ -10,12 +11,14 @@ exports.User = [
     "created": new Date(2014,0,1),
     "displayName": "tester",
     "email": "tester@mail.com",
+    "profileName": "tester",
     "password": "1234",
     "verifiedEmail": true
   },
   { "_id": "000000000000000000000003",
     "created": new Date(2014,0,1),
     "displayName": "vasya",
+    "profileName": "vasya",
     "email": "vasya@mail.com",
     "password": "1234",
     "verifiedEmail": false

handlers/users/test/fixtures/db.js

@@ -15,6 +15,7 @@ describe('User', function() {
     var user = new User({
       email: "BAD",
       displayName: "John",
+      profileName: "bad",
       password: "1234"
     });
 
@@ -27,13 +28,16 @@ describe('User', function() {
 
   // TEST FAILS, @see https://github.com/LearnBoost/mongoose/issues/2446
   // does not require password, because social login does not use it
-  it('requires email & displayName', function() {
+  it('requires email & displayName & profileName', function() {
     [
       {
         email: "my@gmail.com"
       },
       {
         displayName: "John"
+      },
+      {
+        profileName: "profile"
       }
     ].map(function(data) {
         var user = new User(data);

handlers/users/test/unit/model/user.js

@@ -21,11 +21,16 @@ function *createEmptyDb() {
 
   function *clearDatabase() {
 
-    var collections = yield thunk(db.collectionNames)();
+    var collections = yield new Promise(function(resolve, reject) {
+      db.listCollections().toArray(function(err, items) {
+        if (err) return reject(err);
+        resolve(items);
+      });
+    });
 
     var collectionNames = collections
       .map(function(collection) {
-        console.log(collection.name);
+        //console.log(collection.name);
         //var collectionName = collection.name.slice(db.databaseName.length + 1);
         if (collection.name.indexOf('system.') === 0) {
           return null;

modules/lib/dataUtil.js

@@ -19,22 +19,22 @@
     "angular-ui-router": "*",
     "assert-plus": "*",
     "async": "*",
-    "autoprefixer-loader": "^1.2.0",
+    "autoprefixer-loader": "*",
     "babel-core": "*",
     "babel-loader": "*",
     "bem-jade": "*",
     "bluebird": "*",
     "browser-pack": "*",
     "bunyan": "*",
     "co": "*",
-    "css-loader": "^0.9.1",
+    "css-loader": "*",
     "del": "*",
-    "docxtemplater": "^1.0.5",
+    "docxtemplater": "*",
     "elasticsearch": "*",
     "escape-html": "*",
     "event-stream": "*",
-    "extract-text-webpack-plugin": "^0.5.0",
-    "file-loader": "^0.8.1",
+    "extract-text-webpack-plugin": "*",
+    "file-loader": "*",
     "fs-extra": "*",
     "glob": "*",
     "glob-stream": "*",
@@ -62,7 +62,7 @@
     "koa-request": "*",
     "koa-router": "*",
     "koa-send": "*",
-    "koa-session-mongoose": "*",
+    "koa-session-mongoose": "git://github.com/iliakan/koa-session-mongoose#mongoose-4.0",
     "koa-views": "*",
     "lodash": "*",
     "lru-cache": "*",
@@ -73,8 +73,8 @@
     "minimatch": "*",
     "moment": "*",
     "money": "*",
-    "mongoose": "~3.8.0",
-    "mongoose-auto-increment": "3.2.2",
+    "mongoose": "~4.0.0",
+    "mongoose-auto-increment": "*",
     "mongoose-troop": "git://github.com/iliakan/mongoose-troop",
     "mongoose-unique-validator": "git://github.com/iliakan/mongoose-unique-validator",
     "multiparty": "*",
@@ -100,18 +100,17 @@
     "sanitize-html": "*",
     "send": "*",
     "sha256": "*",
-    "style-loader": "^0.9.0",
+    "style-loader": "*",
     "styliner": "*",
     "stylus": "*",
-    "stylus-loader": "^1.0.0",
+    "stylus-loader": "*",
     "svgutils": "*",
-    "thenify": "^3.1.0",
+    "thenify": "*",
     "through": "*",
     "through2": "*",
     "thunkify": "*",
-    "uglify-js": "^2.4.17",
-    "uglifyify": "*",
-    "url-loader": "^0.5.5",
+    "uglify-js": "*",
+    "url-loader": "*",
     "vinyl": "*",
     "vinyl-fs": "*",
     "vinyl-source-stream": "*",
@@ -154,7 +153,7 @@
     "js-beautify": "*",
     "lazypipe": "*",
     "mocha": "*",
-    "mysql": "^2.5.5",
+    "mysql": "*",
     "ng-annotate-webpack-plugin": "*",
     "node-notifier": "*",
     "nodemailer-stub-transport": "*",
@@ -168,9 +167,7 @@
     "sinon": "*",
     "superagent": "*",
     "supertest": "*",
-    "time-require": "*",
-    "trace": "*",
-    "webpack-dev-server": "^1.8.0"
+    "time-require": "*"
   },
   "engines": {
     "node": ">=0.12"