ft 164489793 user nofication settings

andela · Apr 30, 2019 · a6abeb3 · a6abeb3
1 parent c785941
commit a6abeb3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/migrations/20190403114111-user.js b/migrations/20190403114111-user.js
@@ -48,6 +48,14 @@ module.exports = {
       type: Sequelize.BOOLEAN,
       defaultValue: false
     },
+    inapp_notifications: {
+      type: Sequelize.BOOLEAN,
+      defaultValue: true
+    },
+    email_notifications: {
+      type: Sequelize.BOOLEAN,
+      defaultValue: true
+    },
     createdAt: {
       allowNull: false,
       type: Sequelize.DATE,

diff --git a/models/user.js b/models/user.js
@@ -36,7 +36,9 @@ const UserModel = (Sequelize, DataTypes) => {
     },
     provider: { type: DataTypes.STRING, allowNull: true, defaultValue: '' },
     provideruserid: { type: DataTypes.STRING, allowNull: true, },
-    verified: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false }
+    verified: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false },
+    inapp_notifications: { type: DataTypes.BOOLEAN, defaultValue: true },
+    email_notifications: { type: DataTypes.BOOLEAN, defaultValue: true }
   });
   User.socialUsers = async (userProfile) => {
     const result = await User.findOrCreate({

diff --git a/test/article.js b/test/article.js
@@ -83,13 +83,12 @@ describe('Test the body', () => {
       title: faker.random.words(),
       description: faker.lorem.paragraph(),
       body: '',
-      authorid: 100
     };
     chai.request(index).post('/api/articles').send(newArticle).set('x-access-token', `${userToken}`)
       .then((res) => {
         res.should.have.status(400);
         res.body.should.be.a('object');
-        res.body.should.have.property('error').eql('The body can\'t be empty');
+        res.body.should.have.property('error').eql('body can not be null');
         done();
       })
       .catch(error => logError(error));
@@ -113,10 +112,9 @@ describe('Test the body', () => {
 describe('Test the title', () => {
   it('should substring a long title to only 40 characters', (done) => {
     const longTitleArticle = {
-      title: faker.lorem.sentences(),
+      title: faker.lorem.words(),
       body: faker.lorem.paragraphs(),
       description: faker.lorem.paragraph(),
-      authorid: 100
     };
     chai.request(index).post('/api/articles').send(longTitleArticle).set('x-access-token', `${userToken}`)
       .then((res) => {
@@ -135,12 +133,13 @@ describe('Test description', () => {
     authorid: 100
   };
   it('should provide a description if not provided', (done) => {
-    chai.request(index).post('/api/articles').send(newArticle).then((res) => {
-      res.should.have.status(201);
-      res.body.should.have.property('article');
-      res.body.article.should.have.property('description');
-      done();
-    })
+    chai.request(index).post('/api/articles').send(newArticle).set('x-access-token', `${userToken}`)
+      .then((res) => {
+        res.should.have.status(201);
+        res.body.should.have.property('article');
+        res.body.article.should.have.property('description');
+        done();
+      })
       .catch(error => error);
   });
 });