diff --git a/src/Yavsc/Controllers/IT/GitController.cs b/src/Yavsc/Controllers/IT/GitController.cs index 0eeb3ee1..8ecbc815 100644 --- a/src/Yavsc/Controllers/IT/GitController.cs +++ b/src/Yavsc/Controllers/IT/GitController.cs @@ -45,7 +45,7 @@ namespace Yavsc.Controllers var accept = Request.Headers["Accept"]; if (accept.Any(v => v.Split(',').Contains("text/html"))) { - return File(AnsiToHtmlEncoder.GetStream(stream),"text/html"); + return File(AnsiToHtmlEncoder.GetStream(stream), "text/html"); } return File(stream,"text/text"); } diff --git a/src/Yavsc/Helpers/Ansi2HtmlEncoder.cs b/src/Yavsc/Helpers/Ansi2HtmlEncoder.cs index 4ff26f85..61f8c51b 100644 --- a/src/Yavsc/Helpers/Ansi2HtmlEncoder.cs +++ b/src/Yavsc/Helpers/Ansi2HtmlEncoder.cs @@ -18,6 +18,7 @@ namespace Yavsc.Helpers public static Stream GetStream(StreamReader reader) { + // FIXME get some more stable alternative var procStart = new ProcessStartInfo("node", "node_modules/ansi-to-html/bin/ansi-to-html") { UseShellExecute = false, diff --git a/src/cli/package.json b/src/cli/package.json index f55f6f38..9664f260 100644 --- a/src/cli/package.json +++ b/src/cli/package.json @@ -1,5 +1,4 @@ { "dependencies": { - "ansi-to-html": "^0.6.11" } } diff --git a/src/cli/yarn.lock b/src/cli/yarn.lock index 1c263b13..d76b894e 100644 --- a/src/cli/yarn.lock +++ b/src/cli/yarn.lock @@ -2,13 +2,6 @@ # yarn lockfile v1 -ansi-to-html@^0.6.11: - version "0.6.11" - resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.11.tgz#5093fc4962186c0e9343dec572a4f71abdc93439" - integrity sha512-88XZtrcwrfkyn6fGstHnkaF1kl7hGtNCYh4vSmItgEV+6JnQHryDBf7udF4f2RhTRQmYvJvPcTtqgaqrxzc9oA== - dependencies: - entities "^1.1.1" - entities@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" diff --git a/src/test/Makefile b/src/test/Makefile index bb79a275..e3a2162a 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -20,10 +20,10 @@ include $(MAKEFILE_DIR)/dnx.mk $(BINTARGET): project.lock.json ../Yavsc/bin/$(CONFIGURATION)/dnx451/Yavsc.dll ../Yavsc.Abstract/bin/$(CONFIGURATION)/dnx451/Yavsc.Abstract.dll ../Yavsc.Server/bin/$(CONFIGURATION)/dnx451/Yavsc.Server.dll dnu build --configuration $(CONFIGURATION) -non-regression: $(BINTARGET) node_modules/ansi-to-html +non-regression: $(BINTARGET) ASPNET_ENV=Development dnx test -maxthreads 1 -trait regression=non -regression: $(BINTARGET) node_modules/ansi-to-html +regression: $(BINTARGET) ASPNET_ENV=Development dnx test -maxthreads 1 -trait regression=oui test: non-regression @@ -31,9 +31,6 @@ test: non-regression testdev: $(BINTARGET) ASPNET_ENV=Development dnx test -maxthreads 1 -trait dev=wip -node_modules/ansi-to-html: - npm install ansi-to-html - clean: rm -rf bin obj testingrepo diff --git a/src/test/NonRegression/NodeTests.cs b/src/test/NonRegression/NodeTests.cs index 0fa67b73..0a1d236b 100755 --- a/src/test/NonRegression/NodeTests.cs +++ b/src/test/NonRegression/NodeTests.cs @@ -13,7 +13,6 @@ namespace test [Trait("regression", "oui")] public class NodeTests { - [Fact] void TestNodeJsForAnsitohtml () { var procStart = new ProcessStartInfo("node", "node_modules/ansi-to-html/bin/ansi-to-html") @@ -32,7 +31,6 @@ namespace test } } - [Fact] void AnsiToHtml() { var procStart = new ProcessStartInfo("ls", "-l --color=always")