Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sharedLinks struct should be exported #1080

Merged
merged 3 commits into from Sep 11, 2022
Merged

sharedLinks struct should be exported #1080

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c734cf8
sharedLinks struct should be exported
pmenglund Jun 25, 2022
672bb14
add tests
pmenglund Jun 25, 2022
62ab20d
revert test to not use _test package
pmenglund Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions slackevents/inner_events.go
View file
Open in desktop
Expand Up @@ -178,11 +178,11 @@ type LinkSharedEvent struct {
// compose text area.
MessageTimeStamp string `json:"message_ts"`
ThreadTimeStamp string `json:"thread_ts"`
Links []sharedLinks `json:"links"`
Links []SharedLinks `json:"links"`
EventTimestamp string `json:"event_ts"`
}

type sharedLinks struct {
type SharedLinks struct {
Domain string `json:"domain"`
URL string `json:"url"`
}
Expand Down
69 changes: 49 additions & 20 deletions slackevents/inner_events_test.go
View file
Open in desktop
@@ -1,7 +1,8 @@
package slackevents
package slackevents_test
pmenglund marked this conversation as resolved.
Show resolved Hide resolved

import (
"encoding/json"
"github.com/slack-go/slack/slackevents"
"testing"
)

Expand All @@ -20,7 +21,7 @@ func TestAppMention(t *testing.T) {
"blah": "test"
}
`)
err := json.Unmarshal(rawE, &AppMentionEvent{})
err := json.Unmarshal(rawE, &slackevents.AppMentionEvent{})
if err != nil {
t.Error(err)
}
Expand All @@ -32,7 +33,7 @@ func TestAppUninstalled(t *testing.T) {
"type": "app_uninstalled"
}
`)
err := json.Unmarshal(rawE, &AppUninstalledEvent{})
err := json.Unmarshal(rawE, &slackevents.AppUninstalledEvent{})
if err != nil {
t.Error(err)
}
Expand All @@ -45,7 +46,7 @@ func TestGridMigrationFinishedEvent(t *testing.T) {
"enterprise_id": "EXXXXXXXX"
}
`)
err := json.Unmarshal(rawE, &GridMigrationFinishedEvent{})
err := json.Unmarshal(rawE, &slackevents.GridMigrationFinishedEvent{})
if err != nil {
t.Error(err)
}
Expand All @@ -66,7 +67,7 @@ func TestGridMigrationStartedEvent(t *testing.T) {
"event_time": 1234567890
}
`)
err := json.Unmarshal(rawE, &GridMigrationStartedEvent{})
err := json.Unmarshal(rawE, &slackevents.GridMigrationStartedEvent{})
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -97,12 +98,40 @@ func TestLinkSharedEvent(t *testing.T) {
]
}
`)
err := json.Unmarshal(rawE, &LinkSharedEvent{})
err := json.Unmarshal(rawE, &slackevents.LinkSharedEvent{})
if err != nil {
t.Error(err)
}
}

func TestLinkSharedEvent_struct(t *testing.T) {
e := slackevents.LinkSharedEvent{
Type: "link_shared",
User: "Uxxxxxxx",
TimeStamp: "123456789.9876",
Channel: "Cxxxxxx",
MessageTimeStamp: "123456789.9875",
ThreadTimeStamp: "123456789.9876",
Links: []slackevents.SharedLinks{
{Domain: "example.com", URL: "https://example.com/12345"},
{Domain: "example.com", URL: "https://example.com/67890"},
{Domain: "another-example.com", URL: "https://yet.another-example.com/v/abcde"},
},
EventTimestamp: "123456789.9876",
}
rawE, err := json.Marshal(e)
if err != nil {
t.Error(err)
}
expected := `{"type":"link_shared","user":"Uxxxxxxx","ts":"123456789.9876","channel":"Cxxxxxx",` +
`"message_ts":"123456789.9875","thread_ts":"123456789.9876","links":[{"domain":"example.com",` +
`"url":"https://example.com/12345"},{"domain":"example.com","url":"https://example.com/67890"},` +
`{"domain":"another-example.com","url":"https://yet.another-example.com/v/abcde"}],"event_ts":"123456789.9876"}`
if string(rawE) != expected {
t.Errorf("expected %s, but got %s", expected, string(rawE))
}
}

func TestLinkSharedComposerEvent(t *testing.T) {
rawE := []byte(`
{
Expand All @@ -129,7 +158,7 @@ func TestLinkSharedComposerEvent(t *testing.T) {
]
}
`)
err := json.Unmarshal(rawE, &LinkSharedEvent{})
err := json.Unmarshal(rawE, &slackevents.LinkSharedEvent{})
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -160,7 +189,7 @@ func TestMessageEvent(t *testing.T) {
}
}
`)
err := json.Unmarshal(rawE, &MessageEvent{})
err := json.Unmarshal(rawE, &slackevents.MessageEvent{})
if err != nil {
t.Error(err)
}
Expand All @@ -178,7 +207,7 @@ func TestBotMessageEvent(t *testing.T) {
"icons": {}
}
`)
err := json.Unmarshal(rawE, &MessageEvent{})
err := json.Unmarshal(rawE, &slackevents.MessageEvent{})
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -214,7 +243,7 @@ func TestThreadBroadcastEvent(t *testing.T) {
}
`)

var me MessageEvent
var me slackevents.MessageEvent
if err := json.Unmarshal(rawE, &me); err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -243,7 +272,7 @@ func TestMemberJoinedChannelEvent(t *testing.T) {
"inviter": "U123456789"
}
`)
err := json.Unmarshal(rawE, &MemberJoinedChannelEvent{})
err := json.Unmarshal(rawE, &slackevents.MemberJoinedChannelEvent{})
if err != nil {
t.Error(err)
}
Expand All @@ -259,7 +288,7 @@ func TestMemberLeftChannelEvent(t *testing.T) {
"team": "T024BE7LD"
}
`)
err := json.Unmarshal(rawE, &MemberLeftChannelEvent{})
err := json.Unmarshal(rawE, &slackevents.MemberLeftChannelEvent{})
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -287,7 +316,7 @@ func TestPinAdded(t *testing.T) {
"event_ts": "1515449522000016"
}
`)
err := json.Unmarshal(rawE, &PinAddedEvent{})
err := json.Unmarshal(rawE, &slackevents.PinAddedEvent{})
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -315,7 +344,7 @@ func TestPinRemoved(t *testing.T) {
"event_ts": "1515449522000016"
}
`)
err := json.Unmarshal(rawE, &PinRemovedEvent{})
err := json.Unmarshal(rawE, &slackevents.PinRemovedEvent{})
if err != nil {
t.Error(err)
}
Expand All @@ -335,7 +364,7 @@ func TestTokensRevoked(t *testing.T) {
}
}
`)
tre := TokensRevokedEvent{}
tre := slackevents.TokensRevokedEvent{}
err := json.Unmarshal(rawE, &tre)
if err != nil {
t.Error(err)
Expand All @@ -356,7 +385,7 @@ func TestTokensRevoked(t *testing.T) {

func TestEmojiChanged(t *testing.T) {
var (
ece EmojiChangedEvent
ece slackevents.EmojiChangedEvent
err error
)

Expand All @@ -370,7 +399,7 @@ func TestEmojiChanged(t *testing.T) {
"event_ts" : "1361482916.000004"
}
`)
ece = EmojiChangedEvent{}
ece = slackevents.EmojiChangedEvent{}
err = json.Unmarshal(rawAddE, &ece)
if err != nil {
t.Error(err)
Expand All @@ -391,7 +420,7 @@ func TestEmojiChanged(t *testing.T) {
"event_ts" : "1361482916.000004"
}
`)
ece = EmojiChangedEvent{}
ece = slackevents.EmojiChangedEvent{}
err = json.Unmarshal(rawRemoveE, &ece)
if err != nil {
t.Error(err)
Expand All @@ -417,7 +446,7 @@ func TestEmojiChanged(t *testing.T) {
"event_ts" : "1361482916.000004"
}
`)
ece = EmojiChangedEvent{}
ece = slackevents.EmojiChangedEvent{}
err = json.Unmarshal(rawRenameE, &ece)
if err != nil {
t.Error(err)
Expand Down Expand Up @@ -457,7 +486,7 @@ func TestWorkflowStepExecute(t *testing.T) {
}
`)

wse := WorkflowStepExecuteEvent{}
wse := slackevents.WorkflowStepExecuteEvent{}
err := json.Unmarshal(rawE, &wse)
if err != nil {
t.Error(err)
Expand Down