Skip to content

Commit d511e11

Browse files
Test with Zulip 11.5
1 parent abc8bd6 commit d511e11

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/test/java/com/github/jamesnetherton/zulip/client/api/integration/invitation/ZulipInvitationIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void reusableInvitationCrudOperations() throws Exception {
4141
.withWelcomeMessageCustomText("Hello and welcome to this test Zulip server")
4242
.execute();
4343

44-
assertTrue(invitationLink.matches("https://localhost/join/.*/"));
44+
assertTrue(invitationLink.matches("https://localhost\\.localdomain/join/.*/"));
4545

4646
List<Invitation> invitations = zulip.invitations().getAllInvitations().execute();
4747
assertEquals(1, invitations.size());
@@ -53,7 +53,7 @@ public void reusableInvitationCrudOperations() throws Exception {
5353
assertTrue(invitation.getInvited().getEpochSecond() > 0);
5454
assertTrue(invitation.getExpiryDate().getEpochSecond() > 0);
5555
assertNull(invitation.getEmail());
56-
assertTrue(invitation.getLinkUrl().matches("https://localhost/join/.*/"));
56+
assertTrue(invitation.getLinkUrl().matches("https://localhost\\.localdomain/join/.*/"));
5757
assertFalse(invitation.isNotifyReferrerOnJoin());
5858
assertTrue(invitation.isMultiuse());
5959

src/test/java/com/github/jamesnetherton/zulip/client/api/integration/user/ZulipUserIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public void userAttachments() throws Exception {
207207
String url = zulip.messages().fileUpload(file).execute();
208208

209209
long messageId = zulip.messages()
210-
.sendStreamMessage("File " + configuration.getZulipUrl() + url, streamName, "File Topic")
210+
.sendStreamMessage("[File](" + url + ")", streamName, "File Topic")
211211
.execute();
212212

213213
List<UserAttachment> attachments = zulip.users().getUserAttachments().execute();

src/test/resources/docker/docker-compose.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ services:
4141
environment:
4242
REDIS_PASSWORD: 'REPLACE_WITH_SECURE_REDIS_PASSWORD'
4343
zulip:
44-
image: 'zulip/docker-zulip:11.4-0'
44+
image: 'ghcr.io/zulip/zulip-server:11.5-2'
4545
ports:
4646
- '80:80'
4747
- '443:443'
4848
environment:
49-
DB_HOST: 'database'
50-
DB_HOST_PORT: '5432'
51-
DB_USER: 'zulip'
52-
SSL_CERTIFICATE_GENERATION: 'self-signed'
49+
SETTING_REMOTE_POSTGRES_HOST: 'database'
50+
SETTING_REMOTE_POSTGRES_PORT: '5432'
51+
CONFIG_postgresql__database_user: 'zulip'
52+
CERTIFICATES: 'self-signed'
5353
SETTING_MEMCACHED_LOCATION: 'memcached:11211'
5454
SETTING_RABBITMQ_HOST: 'rabbitmq'
5555
SETTING_REDIS_HOST: 'redis'
@@ -61,7 +61,7 @@ services:
6161
SECRETS_memcached_password: 'REPLACE_WITH_SECURE_MEMCACHED_PASSWORD'
6262
SECRETS_redis_password: 'REPLACE_WITH_SECURE_REDIS_PASSWORD'
6363
SECRETS_secret_key: 'REPLACE_WITH_SECURE_SECRET_KEY'
64-
SETTING_EXTERNAL_HOST: 'localhost'
64+
SETTING_EXTERNAL_HOST: 'localhost.localdomain'
6565
SETTING_ZULIP_ADMINISTRATOR: 'admin@example.com'
6666
SETTING_EMAIL_HOST: '' # e.g. smtp.example.com
6767
SETTING_EMAIL_HOST_USER: 'noreply@example.com'

0 commit comments

Comments
 (0)