opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  Update es6-promise polyfill to 3.3.0
  Fix duplicate lineWrapping
  Adds a new pref config called lineWrapping to Edit and Diff

Change-Id: I71434f0c54a4c72eda3a7e9e7b228d2027cd9ed8
This commit is contained in:
Paladox
2016-09-13 23:52:23 +01:00
parent e80c294223 151527a283
commit 7cf7426461
16 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/DiffPreferencesIT.java
View File

@@ -99,6 +99,7 @@ public class DiffPreferencesIT extends AbstractDaemonTest {
i.renderEntireFile ^= true;
i.hideEmptyPane ^= true;
i.matchBrackets ^= true;
i.lineWrapping ^= true;
DiffPreferencesInfo o = gApi.accounts()
.id(admin.getId().toString())

3
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/EditPreferencesIT.java
View File

@@ -42,6 +42,7 @@ public class EditPreferencesIT extends AbstractDaemonTest {
assertThat(out.syntaxHighlighting).isTrue();
assertThat(out.hideLineNumbers).isNull();
assertThat(out.matchBrackets).isTrue();
assertThat(out.lineWrapping).isNull();
assertThat(out.autoCloseBrackets).isNull();
assertThat(out.showBase).isNull();
assertThat(out.theme).isEqualTo(Theme.DEFAULT);
@@ -58,6 +59,7 @@ public class EditPreferencesIT extends AbstractDaemonTest {
out.syntaxHighlighting = false;
out.hideLineNumbers = true;
out.matchBrackets = false;
out.lineWrapping = true;
out.autoCloseBrackets = true;
out.showBase = true;
out.theme = Theme.TWILIGHT;
@@ -93,6 +95,7 @@ public class EditPreferencesIT extends AbstractDaemonTest {
assertThat(out.syntaxHighlighting).isNull();
assertThat(out.hideLineNumbers).isEqualTo(in.hideLineNumbers);
assertThat(out.matchBrackets).isNull();
assertThat(out.lineWrapping).isEqualTo(in.lineWrapping);
assertThat(out.autoCloseBrackets).isEqualTo(in.autoCloseBrackets);
assertThat(out.showBase).isEqualTo(in.showBase);
assertThat(out.theme).isEqualTo(in.theme);