Merge branch '5mb_attachment'

2 files changed, 5 insertions, 5 deletions

diff --git a/web-ui/app/js/mail_view/ui/attachment_list.js b/web-ui/app/js/mail_view/ui/attachment_list.js
index fc4c0544..4ef64960 100644
--- a/web-ui/app/js/mail_view/ui/attachment_list.js
+++ b/web-ui/app/js/mail_view/ui/attachment_list.js
@@ -42,7 +42,7 @@ define(
             });
 
             var ONE_MEGABYTE = 1024*1024;
-            var ATTACHMENT_SIZE_LIMIT = ONE_MEGABYTE;
+            var ATTACHMENT_SIZE_LIMIT = 5*ONE_MEGABYTE;
 
             this.showAttachment = function (ev, data) {
                 this.trigger(document, events.mail.appendAttachment, data);
diff --git a/web-ui/test/spec/mail_view/ui/attachment_list.spec.js b/web-ui/test/spec/mail_view/ui/attachment_list.spec.js
index c0e2a5ef..2b430c28 100644
--- a/web-ui/test/spec/mail_view/ui/attachment_list.spec.js
+++ b/web-ui/test/spec/mail_view/ui/attachment_list.spec.js
@@ -106,15 +106,15 @@ describeMixin('mail_view/ui/attachment_list', function () {
 
             describe('File size check', function (){
                 var ONE_MEGABYTE = 1024*1024;
-                var largeAttachment = {originalFiles: [{size: ONE_MEGABYTE+1}]};
+                var largeAttachment = {originalFiles: [{size: 5*ONE_MEGABYTE+1}]};
 
-                it('should reject files larger than 1MB', function () {
+                it('should reject files larger than 5MB', function () {
                     var uploadAccepted = this.component.performPreUploadCheck(null, largeAttachment);
                     expect(uploadAccepted).toBe(false);
                 });
 
-                it('should accept files less or equal 1MB', function () {
-                    var smallAttachment = {originalFiles: [{size: ONE_MEGABYTE}]};
+                it('should accept files less or equal 5MB', function () {
+                    var smallAttachment = {originalFiles: [{size: 5*ONE_MEGABYTE}]};
                     var uploadAccepted = this.component.performPreUploadCheck(null, smallAttachment);
 
                     expect(uploadAccepted).toBe(true);