fix integration tests

nexes · Mar 7, 2018 · 55ea9fe · 55ea9fe
1 parent 195747e
commit 55ea9fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -39,5 +39,6 @@
 		}
 	],
 	"typescript.tsdk": "node_modules/typescript/lib",
-	"npm.exclude": "**/extensions/**"
+	"npm.exclude": "**/extensions/**",
+	"emmet.excludeLanguages": []
 }
diff --git a/extensions/html/server/src/test/formatting.test.ts b/extensions/html/server/src/test/formatting.test.ts
@@ -46,8 +46,8 @@ suite('HTML Embedded Formatting', () => {
 	}
 
 	function assertFormatWithFixture(fixtureName: string, expectedPath: string, options?: any, formatOptions?: FormattingOptions): void {
-		let input = fs.readFileSync(path.join(__dirname, 'fixtures', 'inputs', fixtureName)).toString();
-		let expected = fs.readFileSync(path.join(__dirname, 'fixtures', 'expected', expectedPath)).toString();
+		let input = fs.readFileSync(path.join(__dirname, 'fixtures', 'inputs', fixtureName)).toString().replace(/\r\n/mg, '\n');
+		let expected = fs.readFileSync(path.join(__dirname, 'fixtures', 'expected', expectedPath)).toString().replace(/\r\n/mg, '\n');
 		assertFormat(input, expected, options, formatOptions, expectedPath);
 	}