Merge branch 'migrate/tests' into feature/0.1.9

Author: baumgaertnerd

.gitattributes

@@ -1,3 +1,3 @@
 * text=auto
-/src/test/testfiles/nix/**/*.confluence	text eol=lf
-/src/test/testfiles/win/**/*.confluence	text eol=crlf
+**/nix/**/*.confluence	text eol=lf
+**/win/**/*.confluence	text eol=crlf

media/css/confluence.css

@@ -1,15 +1,5 @@
 body {
-	font-family: -apple-system,
-		BlinkMacSystemFont,
-		"Segoe UI",
-		Roboto,
-		Helvetica,
-		Arial,
-		sans-serif,
-		"Apple Color Emoji",
-		"Segoe UI Emoji",
-		"Segoe UI Symbol";
-	font-size: 14px;
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
 	padding: 0 26px;
 	line-height: 1em;
 	word-wrap: break-word;
@@ -24,11 +14,7 @@ a {
 	color: #4080D0;
 	text-decoration: none;
 }
-
-a:focus,
-input:focus,
-select:focus,
-textarea:focus {
+a:focus, input:focus, select:focus, textarea:focus {
 	outline: 1px solid -webkit-focus-ring-color;
 	outline-offset: -1px;
 }
@@ -46,9 +32,7 @@ h1 {
 	border-bottom-style: solid;
 }
 
-h1,
-h2,
-h3 {
+h1, h2, h3 {
 	font-weight: normal;
 }
 
@@ -58,24 +42,21 @@ blockquote {
 	border-left: 5px solid;
 }
 
-table,
-th,
-td {
+table, th, td {
 	border: 1px solid;
 	border-collapse: collapse;
 	padding: 7px;
 }
 
-pre>code {
-	display: inline-block;
-	width: 90%;
-	color: white;
+pre > code {
+	display: block;
+	background:rgba(0, 0, 0, 0.15);
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+	word-break: break-all;
+	white-space: normal;
 	margin: 0px 5px;
-	font-size: 14px;
-	background-color: black;
-	cursor: pointer;
 	padding: 5px 1em;
-	box-shadow: 1px 1px 1px rgba(0, 0, 0, .25);
 	line-height: 1.5em;
 }
 
@@ -103,7 +84,7 @@ pre>code {
 
 
 pre > code > p {
-	margin: 0px
+	margin: 0px;
 }
 
 ul {
@@ -118,10 +99,10 @@ ol.initial {
 	list-style: decimal;
 }
 
-ol.initial>ol {
+ol.initial > ol {
 	list-style-type: lower-alpha;
 }
 
-ol.initial>ol>ol {
+ol.initial > ol > ol {
 	list-style-type: lower-roman;
-}
+}

package.json

@@ -124,20 +124,26 @@
 		"vscode:prepublish": "npm run compile",
 		"compile": "tsc -p ./",
 		"watch": "tsc -watch -p ./",
-		"postinstall": "node ./node_modules/vscode/bin/install",
-		"test": "npm run clean && npm run compile && node ./node_modules/vscode/bin/test",
+		"pretest": "npm run clean && npm run compile",
+		"test": "node ./out/test/runTest.js",
+		"prepackage": "npm run clean && npm run compile",
 		"package": "./node_modules/.bin/vsce package",
 		"clean": "rm -rf ./out",
 		"clean-all": "rm -f ./confluence-markup*.vsix; rm -rf ./.vscode-test; rm -rf ./out; rm -rf ./node_modules"
 	},
 	"devDependencies": {
+		"@types/glob": "^7.1.1",
 		"@types/mocha": "^5.2.7",
-		"@types/node": "^12.12.7",
-		"html-formatter": "^0.1.9",
+		"@types/node": "^12.12.8",
+		"@types/vscode": "^1.40.0",
 		"tslint": "^5.18.0",
 		"typescript": "^3.5.3",
 		"vsce": "^1.66.0",
-		"vscode": "^1.1.36"
+		"vscode-test": "^1.2.3",
+		"glob": "^7.1.4",
+		"mocha": "^6.1.4",
+		"source-map-support": "^0.5.12",
+		"html-formatter": "^0.1.9"
 	},
 	"__metadata": {
 		"publisherDisplayName": "denco"

src/test/index.ts

@@ -0,0 +1,24 @@
+
+import * as path from 'path';
+
+import { runTests } from 'vscode-test';
+
+async function main() {
+	try {
+		// The folder containing the Extension Manifest package.json
+		// Passed to `--extensionDevelopmentPath`
+		const extensionDevelopmentPath = path.resolve(__dirname, '../../');
+
+		// The path to the extension test script
+		// Passed to --extensionTestsPath
+		const extensionTestsPath = path.resolve(__dirname, './suite/index');
+
+		// Download VS Code, unzip it and run the integration test
+		await runTests({ extensionDevelopmentPath, extensionTestsPath });
+	} catch (err) {
+		console.error('Failed to run tests');
+		process.exit(1);
+	}
+}
+
+main();