Added a timeout of 1000 to mocha

SanaMobile · Mar 1, 2016 · 0b0571d · 0b0571d
1 parent 575fb0f
commit 0b0571d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src-backbone/app/js/views/auth/resetPasswordCompleteView.js b/src-backbone/app/js/views/auth/resetPasswordCompleteView.js
@@ -66,4 +66,4 @@ module.exports = Marionette.ItemView.extend({
         });
     },
 
-});
+});
diff --git a/src-backbone/app/js/views/auth/resetPasswordView.js b/src-backbone/app/js/views/auth/resetPasswordView.js
@@ -60,4 +60,4 @@ module.exports = Marionette.ItemView.extend({
         });
     },
 
-});
+});
diff --git a/src-backbone/gulpfile.js b/src-backbone/gulpfile.js
@@ -246,6 +246,7 @@ gulp.task('js-unit-test', ['js-lint', 'js-config'], function() {
     gulp.src(Config.javascripts)
         .pipe(filter('**/**_test.js'))
         .pipe(mocha({
+            timeout: 10000,
             require: [
                 './test/unit/setup/globals',
             ],

diff --git a/src-django/api/templates/password_reset_template b/src-django/api/templates/password_reset_template
@@ -6,4 +6,4 @@ You requested your password to be reset. Please follow the link provided in orde
 
 If you didn't request the password reset, just ignore this message.
 
-Thanks
+Thanks
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,4 +66,4 @@ module.exports = Marionette.ItemView.extend({ @@
             });
         },
-    });
+    });
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ You requested your password to be reset. Please follow the link provided in orde

		If you didn't request the password reset, just ignore this message.

		Thanks
		Thanks