fixed: json flag + unit tests

petersirka · petersirka · commit eccc73ffe45c · 2014-12-20T20:36:19.000+01:00
diff --git a/index.js b/index.js
@@ -127,7 +127,7 @@ function Framework() {
 
     this.id = null;
     this.version = 1700;
-    this.version_header = '1.7.0 (build: 29)';
+    this.version_header = '1.7.0 (build: 30)';
     this.versionNode = parseInt(process.version.replace('v', '').replace(/\./g, ''), 10);
 
     this.config = {
@@ -7285,7 +7285,7 @@ Subscribe.prototype.doEnd = function() {
     if (route.isJSON) {
         try {
 
-            if ((req.headers['content-type'] || '').match(/\/json$/)) {
+            if (!((req.headers['content-type'] || '').match(/\/json$/))) {
                 self.route400(new Error('The request validation (The content-type is not application/json).'));
                 return self;
             }
diff --git a/test/controllers/default.js b/test/controllers/default.js
@@ -186,7 +186,7 @@ function plain_put_xml() {
 function plain_upload() {
     var self = this;
     var file = self.files[0];
-    self.json({ name: file.filename, length: file.length, type: file.contentType });
+    self.json({ name: file.filename, length: file.length, type: file.type });
 }
 
 function file_plain(req, res, isValidation) {
diff --git a/test/views/fromURL.html b/test/views/fromURL.html
@@ -0,0 +1 @@
+@{config.name}

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ function plain_put_xml() {`
`186`	`186`	`function plain_upload() {`
`187`	`187`	`var self = this;`
`188`	`188`	`var file = self.files[0];`
`189`		`- self.json({ name: file.filename, length: file.length, type: file.contentType });`
	`189`	`+ self.json({ name: file.filename, length: file.length, type: file.type });`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`function file_plain(req, res, isValidation) {`