small changes

petersirka · petersirka · commit fc7a94b761d2 · 2014-06-17T08:12:12.000+02:00
diff --git a/assertion-testing/test.js b/assertion-testing/test.js
@@ -2,11 +2,4 @@ var framework = require('total.js');
 var http = require('http');
 
 framework.run(http, true, parseInt(process.argv[2]));
-
-framework.test(true, function() {
-	console.log('');
-	console.log('====================================================');
-	console.log('Congratulations, the test was successful!');
-	console.log('====================================================');
-	console.log('');
-});
+framework.test();
diff --git a/controller-proxy/proxy-user/controllers/default.js b/controller-proxy/proxy-user/controllers/default.js
@@ -1,11 +1,12 @@
 exports.install = function(framework) {
+	framework.route('/users/', json_users);
 	framework.route('/', json_users, ['proxy']);
 };
 
 function json_users() {
-	
+
 	var self = this;
-	
+
 	var users = [
 		{ name: 'Peter', age: 30 },
 		{ name: 'Jano', age: 23 },
@@ -22,5 +23,5 @@ function json_users() {
 	});
 
 	self.json(output);
-	
+
 };
diff --git a/cors/controllers/default.js b/cors/controllers/default.js
@@ -8,7 +8,7 @@ function cors_time_preflight() {
 	var self = this;
 
 	if (!self.cors('*', ['GET'])) {
-		self.plain('Not allowed');
+		self.plain('NOT ALLOWED - OPTIONS - PREFLIGHT');
 		return;
 	}
 
diff --git a/websocket/views/_layout.html b/websocket/views/_layout.html
@@ -4,7 +4,6 @@
     @{meta}
     <meta charset="utf-8" />
 	<meta http-equiv="content-language" content="sk" />
-	<meta http-equiv="X-UA-Compatible" content="IE=10" />
 	<meta name="format-detection" content="telephone=no"/>
 	<meta name="viewport" content="width=1024, user-scalable=yes" />
 	<meta name="robots" content="all,follow" />

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ function cors_time_preflight() {`
`8`	`8`	`var self = this;`
`9`	`9`
`10`	`10`	`if (!self.cors('*', ['GET'])) {`
`11`		`- self.plain('Not allowed');`
	`11`	`+ self.plain('NOT ALLOWED - OPTIONS - PREFLIGHT');`
`12`	`12`	`return;`
`13`	`13`	`}`
`14`	`14`