ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Utilize test skipping to reduce merge conflicts (#6937)

Browse Source 
* utilize test skipping to reduce merge conflicts

* fix compile error
This commit is contained in:
Anthony Dresser
2019-08-26 13:05:19 -07:00
committed by GitHub
parent 83567d1a51
commit 323e62c967
15 changed files with 3662 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/editor/test/common/config/commonEditorConfig.test.ts
View File

@@ -87,16 +87,14 @@ suite('Common Editor Config', () => {
let config = new TestWrappingConfiguration({
wordWrap: <any>true
});
// {{SQL CARBON EDIT}}
assertWrapping(config, true, 88);
assertWrapping(config, true, 88); // {{SQL CARBON EDIT}} modify expected value
});
test('wordWrap on', () => {
let config = new TestWrappingConfiguration({
wordWrap: 'on'
});
// {{SQL CARBON EDIT}}
assertWrapping(config, true, 88);
assertWrapping(config, true, 88); // {{SQL CARBON EDIT}} modify expected value
});
test('wordWrap on without minimap', () => {
@@ -114,8 +112,7 @@ suite('Common Editor Config', () => {
wordWrap: 'on',
wordWrapColumn: 10
});
// {{SQL CARBON EDIT}}
assertWrapping(config, true, 88);
assertWrapping(config, true, 88); // {{SQL CARBON EDIT}} modify expected value
});
test('wordWrap off', () => {