summaryrefslogtreecommitdiffstats
path: root/mattermost.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-07-19 10:16:44 -0400
committerGitHub <noreply@github.com>2016-07-19 10:16:44 -0400
commit1641370fbedc42e07f7a9b7758286d341f13b624 (patch)
tree0571746e175c7b6da2a5587bda1b8aaca033cc03 /mattermost.go
parent2b0fcd378ce96277f393b89cac1a98d70e1c480f (diff)
downloadchat-1641370fbedc42e07f7a9b7758286d341f13b624.tar.gz
chat-1641370fbedc42e07f7a9b7758286d341f13b624.tar.bz2
chat-1641370fbedc42e07f7a9b7758286d341f13b624.zip
Moving javascript driver back to platform (#3613)
Diffstat (limited to 'mattermost.go')
-rw-r--r--mattermost.go20
1 files changed, 6 insertions, 14 deletions
diff --git a/mattermost.go b/mattermost.go
index c07c38b2b..ef3d37241 100644
--- a/mattermost.go
+++ b/mattermost.go
@@ -363,6 +363,11 @@ type TeamForUpgrade struct {
func setupClientTests() {
*utils.Cfg.TeamSettings.EnableOpenServer = true
+ *utils.Cfg.ServiceSettings.EnableCommands = false
+ *utils.Cfg.ServiceSettings.EnableOnlyAdminIntegrations = false
+ *utils.Cfg.ServiceSettings.EnableCustomEmoji = true
+ utils.Cfg.ServiceSettings.EnableIncomingWebhooks = false
+ utils.Cfg.ServiceSettings.EnableOutgoingWebhooks = false
}
func executeTestCommand(cmd *exec.Cmd) {
@@ -391,24 +396,11 @@ func runWebClientTests() {
executeTestCommand(cmd)
}
-func runJavascriptClientTests() {
- os.Chdir("../mattermost-driver-javascript")
- cmd := exec.Command("npm", "test")
- executeTestCommand(cmd)
-}
-
func cmdRunClientTests() {
if flagCmdRunWebClientTests {
- api.StartServer()
setupClientTests()
- runWebClientTests()
- api.StopServer()
- }
-
- if flagCmdRunJavascriptClientTests {
api.StartServer()
- setupClientTests()
- runJavascriptClientTests()
+ runWebClientTests()
api.StopServer()
}
}