Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 19:18:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use "global." instead of "g." as the prefix for global config options.

Browse Source
This commit is contained in:
Jon Chambers
2020-08-11 11:48:47 -04:00
committed by Jon Chambers
parent 9be6af8481
commit 31a215d4d6
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/RemoteConfigControllerTest.java
View File

@@ -100,7 +100,7 @@ public class RemoteConfigControllerTest {
assertThat(configuration.getConfig().get(7).getName()).isEqualTo("linked.config.0");
assertThat(configuration.getConfig().get(8).getName()).isEqualTo("linked.config.1");
assertThat(configuration.getConfig().get(9).getName()).isEqualTo("unlinked.config");
assertThat(configuration.getConfig().get(10).getName()).isEqualTo("g.maxGroupSize");
assertThat(configuration.getConfig().get(10).getName()).isEqualTo("global.maxGroupSize");
}
@Test
@@ -134,7 +134,7 @@ public class RemoteConfigControllerTest {
assertThat(configuration.getConfig().get(7).getName()).isEqualTo("linked.config.0");
assertThat(configuration.getConfig().get(8).getName()).isEqualTo("linked.config.1");
assertThat(configuration.getConfig().get(9).getName()).isEqualTo("unlinked.config");
assertThat(configuration.getConfig().get(10).getName()).isEqualTo("g.maxGroupSize");
assertThat(configuration.getConfig().get(10).getName()).isEqualTo("global.maxGroupSize");
}
@Test
@@ -305,7 +305,7 @@ public class RemoteConfigControllerTest {
.target("/v1/config")
.request()
.header("Config-Token", "foo")
.put(Entity.entity(new RemoteConfig("g.maxGroupSize", 88, Set.of(), "FALSE", "TRUE", null), MediaType.APPLICATION_JSON_TYPE));
.put(Entity.entity(new RemoteConfig("global.maxGroupSize", 88, Set.of(), "FALSE", "TRUE", null), MediaType.APPLICATION_JSON_TYPE));
assertThat(response.getStatus()).isEqualTo(403);
verifyNoMoreInteractions(remoteConfigsManager);
}
@@ -340,7 +340,7 @@ public class RemoteConfigControllerTest {
@Test
public void testDeleteGlobalConfig() {
Response response = resources.getJerseyTest()
.target("/v1/config/g.maxGroupSize")
.target("/v1/config/global.maxGroupSize")
.request()
.header("Config-Token", "foo")
.delete();