Merge commit '5563c220db4164fdc6d7b75656a5dad33d7bd475' into HEAD

Jenkins Continuous Integration Server · Jenkins Continuous Integration Server · commit fb215dee7548 · 2016-04-05T23:48:03.000Z
diff --git a/app/directives/tc-file-input/tc-file-input.directive.js b/app/directives/tc-file-input/tc-file-input.directive.js
@@ -49,7 +49,7 @@ import _ from 'lodash'
           }
 
           var fileSize = file.size
-          var isAllowedFileSize = fileSize < '500000000'
+          var isAllowedFileSize = fileSize < '524288000'
 
           var selectedFileType = file.type.slice(file.type.lastIndexOf('/') + 1)
           var isAllowedFileFormat = _.some(fileTypes, _.matches(selectedFileType))
diff --git a/app/directives/tc-file-input/tc-file-input.spec.js b/app/directives/tc-file-input/tc-file-input.spec.js
@@ -163,7 +163,7 @@ describe('Topcoder File Input Directive', function() {
 
     describe('with a file that\'s greater than 500MB', function() {
       beforeEach(function() {
-        fileList[0].size = 500000001
+        fileList[0].size = 524288001
 
         $(fileInput).triggerHandler({
           type: 'change',

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ import _ from 'lodash'`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`var fileSize = file.size`
`52`		`- var isAllowedFileSize = fileSize < '500000000'`
	`52`	`+ var isAllowedFileSize = fileSize < '524288000'`
`53`	`53`
`54`	`54`	`var selectedFileType = file.type.slice(file.type.lastIndexOf('/') + 1)`
`55`	`55`	`var isAllowedFileFormat = _.some(fileTypes, _.matches(selectedFileType))`