Skip to content

Commit 65071c7

Browse files
committed
Fixed tests and made the Pulse POST to slack non-blocking.
1 parent e5938e1 commit 65071c7

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

server/src/main/java/com/objectcomputing/checkins/services/pulse/PulseSlackPoster.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@ public void send() {
3939
.getSlack().getWebhookUrl();
4040
if (slackWebHook != null && !slackBlocks.isEmpty()) {
4141
// POST it to Slack.
42-
BlockingHttpClient client = slackClient.toBlocking();
4342
HttpRequest<String> request = HttpRequest.POST(slackWebHook,
4443
slackBlocks);
45-
client.exchange(request);
44+
slackClient.exchange(request);
4645
}
4746
}
4847

server/src/test/java/com/objectcomputing/checkins/services/pulse/PulseServicesTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void testBiWeeklySendEmail() {
9797
final Setting setting = new Setting(pulseSettingName, pulseBiWeekly);
9898
settingsServices.save(setting);
9999

100-
pulseServices.sendPendingEmail(biWeeklyDate);
100+
pulseServices.notifyUsers(biWeeklyDate);
101101
assertEquals(1, emailSender.events.size());
102102

103103
EmailHelper.validateEmail("SEND_EMAIL", "null", "null",
@@ -112,7 +112,7 @@ void testWeeklySendEmail() {
112112
final Setting setting = new Setting(pulseSettingName, pulseWeekly);
113113
settingsServices.save(setting);
114114

115-
pulseServices.sendPendingEmail(weeklyDate);
115+
pulseServices.notifyUsers(weeklyDate);
116116
assertEquals(1, emailSender.events.size());
117117

118118
EmailHelper.validateEmail("SEND_EMAIL", "null", "null",
@@ -127,7 +127,7 @@ void testMonthlySendEmail() {
127127
final Setting setting = new Setting(pulseSettingName, pulseMonthly);
128128
settingsServices.save(setting);
129129

130-
pulseServices.sendPendingEmail(monthlyDate);
130+
pulseServices.notifyUsers(monthlyDate);
131131
assertEquals(1, emailSender.events.size());
132132

133133
EmailHelper.validateEmail("SEND_EMAIL", "null", "null",
@@ -142,7 +142,7 @@ void testDuplicateSendEmail() {
142142
final Setting setting = new Setting(pulseSettingName, pulseMonthly);
143143
settingsServices.save(setting);
144144

145-
pulseServices.sendPendingEmail(monthlyDate);
145+
pulseServices.notifyUsers(monthlyDate);
146146
// This should be zero because email was already sent on this date.
147147
assertEquals(0, emailSender.events.size());
148148
}
@@ -152,13 +152,13 @@ void testNoSendEmail() {
152152
final Setting setting = new Setting(pulseSettingName, pulseBiWeekly);
153153
settingsServices.save(setting);
154154

155-
pulseServices.sendPendingEmail(weeklyDate);
155+
pulseServices.notifyUsers(weeklyDate);
156156
// This should be zero because, when set to bi-weekly, email is sent on
157157
// the first, third, and fifth Monday of the month.
158158
assertEquals(0, emailSender.events.size());
159159

160160
final LocalDate nonMonday = weeklyDate.plus(1, ChronoUnit.DAYS);
161-
pulseServices.sendPendingEmail(nonMonday);
161+
pulseServices.notifyUsers(nonMonday);
162162
// This should be zero because the date is not a Monday.
163163
assertEquals(0, emailSender.events.size());
164164
}

server/src/test/resources/application-test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,13 @@ check-ins:
4545
slack:
4646
webhook-url: https://bogus.objectcomputing.com/slack
4747
bot-token: BOGUS_TOKEN
48+
pulse-response:
49+
slack:
50+
signing-secret: BOGUS_SIGNING_SECRET
51+
webhook-url: https://bogus.objectcomputing.com/slack
4852
---
4953
aes:
5054
key: BOGUS_TEST_KEY
5155
---
5256
github-credentials:
53-
github_token: "test github token"
57+
github_token: "test github token"

0 commit comments

Comments
 (0)