Skip to content

Commit 515e513

Browse files
committed
Updated the test to match how slack messages are now sent.
1 parent f4aed83 commit 515e513

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

server/src/test/java/com/objectcomputing/checkins/services/SlackSenderReplacement.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,14 @@ public boolean send(List<String> userIds, String slackBlocks) {
3333
}
3434
return true;
3535
}
36+
37+
@Override
38+
public boolean send(String channelId, String slackBlocks) {
39+
if (!sent.containsKey(channelId)) {
40+
sent.put(channelId, new ArrayList<String>());
41+
}
42+
sent.get(channelId).add(slackBlocks);
43+
return true;
44+
}
3645
}
3746

server/src/test/java/com/objectcomputing/checkins/services/kudos/KudosControllerTest.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.objectcomputing.checkins.configuration.CheckInsConfiguration;
44
import com.objectcomputing.checkins.notifications.email.MailJetFactory;
55
import com.objectcomputing.checkins.services.MailJetFactoryReplacement;
6-
import com.objectcomputing.checkins.services.SlackPosterReplacement;
6+
import com.objectcomputing.checkins.services.SlackSenderReplacement;
77
import com.objectcomputing.checkins.services.TestContainersSuite;
88
import com.objectcomputing.checkins.services.fixture.KudosFixture;
99
import com.objectcomputing.checkins.services.fixture.TeamFixture;
@@ -60,14 +60,14 @@
6060
// when attempting to post public Kudos to Slack.
6161
@DisabledInNativeImage
6262
@Property(name = "replace.mailjet.factory", value = StringUtils.TRUE)
63-
@Property(name = "replace.slackposter", value = StringUtils.TRUE)
63+
@Property(name = "replace.slacksender", value = StringUtils.TRUE)
6464
class KudosControllerTest extends TestContainersSuite implements KudosFixture, TeamFixture, RoleFixture {
6565
@Inject
6666
@Named(MailJetFactory.HTML_FORMAT)
6767
private MailJetFactoryReplacement.MockEmailSender emailSender;
6868

6969
@Inject
70-
private SlackPosterReplacement slackPoster;
70+
private SlackSenderReplacement slackSender;
7171

7272
@Inject
7373
@Client("/services/kudos")
@@ -110,7 +110,7 @@ void setUp() {
110110

111111
message = "Kudos!";
112112
emailSender.reset();
113-
slackPoster.reset();
113+
slackSender.reset();
114114
}
115115

116116
@ParameterizedTest
@@ -252,15 +252,16 @@ void testApproveKudos() throws JsonProcessingException {
252252
);
253253

254254
// Check the posted slack block
255-
assertEquals(1, slackPoster.posted.size());
255+
assertEquals(1, slackSender.sent.size());
256256
ObjectMapper mapper = new ObjectMapper();
257-
JsonNode posted = mapper.readTree(slackPoster.posted.get(0));
257+
String channelId = checkInsConfiguration.getApplication()
258+
.getSlack().getKudosChannel();
259+
List<String> sent = slackSender.sent.get(channelId);
260+
JsonNode posted = mapper.readTree(sent.get(0));
258261

259-
assertEquals(JsonNodeType.OBJECT, posted.getNodeType());
260-
JsonNode blocks = posted.get("blocks");
261-
assertEquals(JsonNodeType.ARRAY, blocks.getNodeType());
262+
assertEquals(JsonNodeType.ARRAY, posted.getNodeType());
262263

263-
var iter = blocks.elements();
264+
var iter = posted.elements();
264265
assertTrue(iter.hasNext());
265266
JsonNode block = iter.next();
266267

0 commit comments

Comments
 (0)