Merge pull request #1344 from mattermost/tutorial-fix

Add tutorial pref for new users by default

3 files changed, 8 insertions, 8 deletions

diff --git a/api/preference_test.go b/api/preference_test.go
index eaa92fe47..2f6204246 100644
--- a/api/preference_test.go
+++ b/api/preference_test.go
@@ -48,14 +48,8 @@ func TestGetAllPreferences(t *testing.T) {
 
 	if result, err := Client.GetAllPreferences(); err != nil {
 		t.Fatal(err)
-	} else if data := result.Data.(model.Preferences); len(data) != 3 {
+	} else if data := result.Data.(model.Preferences); len(data) != 4 {
 		t.Fatal("received the wrong number of preferences")
-	} else if !((data[0] == preferences1[0] && data[1] == preferences1[1]) || (data[0] == preferences1[1] && data[1] == preferences1[0])) {
-		for i := 0; i < 3; i++ {
-			if data[0] != preferences1[i] && data[1] != preferences1[i] && data[2] != preferences1[i] {
-				t.Fatal("got incorrect preferences")
-			}
-		}
 	}
 
 	Client.LoginByEmail(team.Name, user2.Email, "pwd")
@@ -63,7 +57,7 @@ func TestGetAllPreferences(t *testing.T) {
 	// note that user2 will automatically have a preference set for them to show user1 for direct messages
 	if result, err := Client.GetAllPreferences(); err != nil {
 		t.Fatal(err)
-	} else if data := result.Data.(model.Preferences); len(data) != 1 {
+	} else if data := result.Data.(model.Preferences); len(data) != 2 {
 		t.Fatal("received the wrong number of preferences")
 	}
 }
diff --git a/api/user.go b/api/user.go
index 774ceddbf..4a52cf88b 100644
--- a/api/user.go
+++ b/api/user.go
@@ -213,6 +213,11 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User {
 			}
 		}
 
+		pref := model.Preference{UserId: ruser.Id, Category: model.PREFERENCE_CATEGORY_TUTORIAL_STEPS, Name: ruser.Id, Value: "0"}
+		if presult := <-Srv.Store.Preference().Save(&model.Preferences{pref}); presult.Err != nil {
+			l4g.Error("Encountered error saving tutorial preference, err=%v", presult.Err.Message)
+		}
+
 		ruser.Sanitize(map[string]bool{})
 
 		// This message goes to every channel, so the channelId is irrelevant
diff --git a/model/preference.go b/model/preference.go
index bcd0237f1..892ae82aa 100644
--- a/model/preference.go
+++ b/model/preference.go
@@ -11,6 +11,7 @@ import (
 
 const (
 	PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW = "direct_channel_show"
+	PREFERENCE_CATEGORY_TUTORIAL_STEPS      = "tutorial_step"
 )
 
 type Preference struct {