Merge pull request #451 from NativeScript/plamen5kov/jasmine_output

Plamen5kov · Plamen5kov · commit e4c0d36b7cc4 · 2016-05-14T07:50:25.000+03:00
enable jasmin report in console
diff --git a/test-app/assets/app/Infrastructure/Jasmine/jasmine-reporters/junit_reporter.js b/test-app/assets/app/Infrastructure/Jasmine/jasmine-reporters/junit_reporter.js
@@ -44,11 +44,10 @@
         return path + filename;
     }
     function log(str) {
-    	__log(str);
-//        var con = global.console || console;
-//        if (con && con.log) {
-//            con.log(str);
-//        }
+       var con = global.console || console;
+       if (con && con.log) {
+           con.log(str);
+       }
     }
 
 
diff --git a/test-app/assets/app/Infrastructure/Jasmine/jasmine-reporters/terminal_reporter.js b/test-app/assets/app/Infrastructure/Jasmine/jasmine-reporters/terminal_reporter.js
@@ -20,11 +20,7 @@
         return dupe;
     }
     function log(str) {
-    	__log(str);
-//        var con = global.console || console;
-//        if (con && con.log && str) {
-//            con.log(str);
-//        }
+        android.util.Log.d("TNS.Jasmine", str);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,10 @@`
`44`	`44`	`return path + filename;`
`45`	`45`	`}`
`46`	`46`	`function log(str) {`
`47`		`- __log(str);`
`48`		`-// var con = global.console \|\| console;`
`49`		`-// if (con && con.log) {`
`50`		`-// con.log(str);`
`51`		`-// }`
	`47`	`+ var con = global.console \|\| console;`
	`48`	`+ if (con && con.log) {`
	`49`	`+ con.log(str);`
	`50`	`+ }`
`52`	`51`	`}`
`53`	`52`
`54`	`53`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,7 @@`
`20`	`20`	`return dupe;`
`21`	`21`	`}`
`22`	`22`	`function log(str) {`
`23`		`- __log(str);`
`24`		`-// var con = global.console \|\| console;`
`25`		`-// if (con && con.log && str) {`
`26`		`-// con.log(str);`
`27`		`-// }`
	`23`	`+ android.util.Log.d("TNS.Jasmine", str);`
`28`	`24`	`}`
`29`	`25`
`30`	`26`