Merge e7b4507 into 3a2eb25

andela · Jul 16, 2018 · c39fc38 · c39fc38
2 parents 3a2eb25 + e7b4507
commit c39fc38
Show file tree

Hide file tree

Showing 26 changed files with 3,721 additions and 4,376 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -7,7 +7,6 @@
     "mocha": true,
     "jasmine": true
   },
-  "parser": "babel-eslint",
   "parserOptions": {
     "sourceType": "module"
 },

diff --git a/app/controllers/users.js b/app/controllers/users.js
@@ -36,7 +36,7 @@ const authCallback = (req, res) => {
  */
 const signin = (req, res) => {
   if (!req.user) {
-    res.redirect('/#!/signin?error=invalid');
+    res.redirect('/#!/signin');
   } else {
     res.redirect('/#!/app');
   }

diff --git a/backend-test/user/model.js b/backend-test/user/model.js
@@ -8,14 +8,14 @@ const User = mongoose.model('User');
 let user;
 
 // The tests
-describe('<Unit Test>', () => {
+describe('Unit Test', () => {
   describe('Model User:', () => {
     before((done) => {
       user = new User({
         name: 'Full name',
         email: 'test@test.com',
-        username: 'user',
-        password: 'password'
+        username: 'userd',
+        password: 'testing'
       });
 
       done();