diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-04 11:54:52 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-04 11:54:52 -0400 |
| commit | c7bdce8a6641ed8d361a43b6004a351535c78423 (patch) | |
| tree | f42d32d8a4d0cd4f702644dcb6a594f905f3f771 /app/notification_test.go | |
| parent | 3a79e451ffe3ffe618311ee15b02dbebde6a77b0 (diff) | |
| download | chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.gz chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.bz2 chat-c7bdce8a6641ed8d361a43b6004a351535c78423.zip | |
PLT-5900 Removed automatic configuration of SiteURL (#5952)
* Revert "PLT-5765 Passed SiteURL to SendNotifications (#5705)"
This reverts commit a8e68bd8905972ae59de90fa33d5b3e3c274dc47.
* Removed automatic configuration of SiteURL
* Reverted unintentional config changes
* Updated help text
* Added link to docs in Site URL warning
* Fixed merge conflict
Diffstat (limited to 'app/notification_test.go')
| -rw-r--r-- | app/notification_test.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/notification_test.go b/app/notification_test.go index fd8c4bf57..3768a95c7 100644 --- a/app/notification_test.go +++ b/app/notification_test.go @@ -7,7 +7,6 @@ import ( "testing" "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" ) func TestSendNotifications(t *testing.T) { @@ -19,13 +18,13 @@ func TestSendNotifications(t *testing.T) { UserId: th.BasicUser.Id, ChannelId: th.BasicChannel.Id, Message: "@" + th.BasicUser2.Username, - }, th.BasicTeam.Id, true, utils.GetSiteURL()) + }, th.BasicTeam.Id, true) if postErr != nil { t.Fatal(postErr) } - mentions, err := SendNotifications(post1, th.BasicTeam, th.BasicChannel, th.BasicUser, utils.GetSiteURL()) + mentions, err := SendNotifications(post1, th.BasicTeam, th.BasicChannel, th.BasicUser) if err != nil { t.Fatal(err) } else if mentions == nil { |