summaryrefslogtreecommitdiffstats
path: root/manualtesting
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-01-20 10:04:17 -0600
committer=Corey Hulen <corey@hulen.com>2016-01-20 10:04:17 -0600
commit11c035aef45fbc6dfbc360123611108a199eca79 (patch)
treee0edabe17ad251a029214ed98a9f7ea66d880a91 /manualtesting
parent640d3018c9a75e7c85da55c3483396e31a6de994 (diff)
downloadchat-11c035aef45fbc6dfbc360123611108a199eca79.tar.gz
chat-11c035aef45fbc6dfbc360123611108a199eca79.tar.bz2
chat-11c035aef45fbc6dfbc360123611108a199eca79.zip
PLT-7 adding loc db calls for oauth table
Diffstat (limited to 'manualtesting')
-rw-r--r--manualtesting/manual_testing.go14
-rw-r--r--manualtesting/test_autolink.go3
2 files changed, 10 insertions, 7 deletions
diff --git a/manualtesting/manual_testing.go b/manualtesting/manual_testing.go
index c1e474027..d1dd16b28 100644
--- a/manualtesting/manual_testing.go
+++ b/manualtesting/manual_testing.go
@@ -4,16 +4,18 @@
package manualtesting
import (
- l4g "github.com/alecthomas/log4go"
- "github.com/mattermost/platform/api"
- "github.com/mattermost/platform/model"
- "github.com/mattermost/platform/utils"
"hash/fnv"
"math/rand"
"net/http"
"net/url"
"strconv"
"time"
+
+ l4g "github.com/alecthomas/log4go"
+ "github.com/mattermost/platform/api"
+ "github.com/mattermost/platform/model"
+ "github.com/mattermost/platform/utils"
+ goi18n "github.com/nicksnyder/go-i18n/i18n"
)
type TestEnvironment struct {
@@ -149,9 +151,9 @@ func manualTest(c *api.Context, w http.ResponseWriter, r *http.Request) {
}
}
-func getChannelID(channelname string, teamid string, userid string) (id string, err bool) {
+func getChannelID(T goi18n.TranslateFunc, channelname string, teamid string, userid string) (id string, err bool) {
// Grab all the channels
- result := <-api.Srv.Store.Channel().GetChannels(teamid, userid)
+ result := <-api.Srv.Store.Channel().GetChannels(T, teamid, userid)
if result.Err != nil {
l4g.Debug("Unable to get channels")
return "", false
diff --git a/manualtesting/test_autolink.go b/manualtesting/test_autolink.go
index 16d2d713a..a44b247b7 100644
--- a/manualtesting/test_autolink.go
+++ b/manualtesting/test_autolink.go
@@ -6,6 +6,7 @@ package manualtesting
import (
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
+ "github.com/mattermost/platform/utils"
)
const LINK_POST_TEXT = `
@@ -21,7 +22,7 @@ https://medium.com/@slackhq/11-useful-tips-for-getting-the-most-of-slack-5dfb3d1
func testAutoLink(env TestEnvironment) *model.AppError {
l4g.Info("Manual Auto Link Test")
- channelID, err := getChannelID(model.DEFAULT_CHANNEL, env.CreatedTeamId, env.CreatedUserId)
+ channelID, err := getChannelID(utils.T, model.DEFAULT_CHANNEL, env.CreatedTeamId, env.CreatedUserId)
if err != true {
return model.NewAppError("/manualtest", "Unable to get channels", "")
}