add unit tests

3 files changed, 66 insertions, 2 deletions

diff --git a/model/preference.go b/model/preference.go
index 892ae82aa..4f2ba0099 100644
--- a/model/preference.go
+++ b/model/preference.go
@@ -12,6 +12,7 @@ import (
 const (
 	PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW = "direct_channel_show"
 	PREFERENCE_CATEGORY_TUTORIAL_STEPS      = "tutorial_step"
+	PREFERENCE_CATEGORY_ADVANCED_SETTINGS   = "advanced_settings"
 )
 
 type Preference struct {
diff --git a/store/sql_preference_store.go b/store/sql_preference_store.go
index 63561a509..09546c872 100644
--- a/store/sql_preference_store.go
+++ b/store/sql_preference_store.go
@@ -52,7 +52,7 @@ func (s SqlPreferenceStore) DeleteUnusedFeatures() {
 	AND Name LIKE '` + FEATURE_TOGGLE_PREFIX + `%'`
 
 	queryParams := map[string]string{
-		"Category": "advanced_settings",
+		"Category": model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS,
 		"Value":    "false",
 	}
 	s.GetMaster().Exec(sql, queryParams)
@@ -292,7 +292,7 @@ func (s SqlPreferenceStore) FeatureToggle(feature, userId string) StoreChannel {
 			WHERE
 				UserId = :UserId
 				AND Category = :Category
-				AND Name = :Name`, map[string]interface{}{"UserId": userId, "Category": "advanced_settings", "Name": FEATURE_TOGGLE_PREFIX + feature}); err != nil {
+				AND Name = :Name`, map[string]interface{}{"UserId": userId, "Category": model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS, "Name": FEATURE_TOGGLE_PREFIX + feature}); err != nil {
 			result.Err = model.NewAppError("SqlPreferenceStore.featureToggle", "We encountered an error while finding a pre release feature preference", err.Error())
 		} else {
 			result.Data = value == "true"
diff --git a/store/sql_preference_store_test.go b/store/sql_preference_store_test.go
index 77da71fd6..5aed7dba3 100644
--- a/store/sql_preference_store_test.go
+++ b/store/sql_preference_store_test.go
@@ -232,3 +232,66 @@ func TestPreferenceDelete(t *testing.T) {
 		t.Fatal(result.Err)
 	}
 }
+
+func TestDeleteUnusedFeatures(t *testing.T) {
+	Setup()
+
+	userId1 := model.NewId()
+	userId2 := model.NewId()
+	category := model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS
+	feature1 := "feature1"
+	feature2 := "feature2"
+
+	features := model.Preferences{
+		{
+			UserId:   userId1,
+			Category: category,
+			Name:     FEATURE_TOGGLE_PREFIX + feature1,
+			Value:    "true",
+		},
+		{
+			UserId:   userId2,
+			Category: category,
+			Name:     FEATURE_TOGGLE_PREFIX + feature1,
+			Value:    "false",
+		},
+		{
+			UserId:   userId1,
+			Category: category,
+			Name:     FEATURE_TOGGLE_PREFIX + feature2,
+			Value:    "false",
+		},
+		{
+			UserId:   userId2,
+			Category: category,
+			Name:     FEATURE_TOGGLE_PREFIX + feature2,
+			Value:    "true",
+		},
+	}
+
+	Must(store.Preference().Save(&features))
+
+	store.(*SqlStore).preference.(*SqlPreferenceStore).DeleteUnusedFeatures()
+
+	//make sure features with value "false" have actually been deleted from the database
+	if val, err := store.(*SqlStore).preference.(*SqlPreferenceStore).GetReplica().SelectInt(`SELECT COUNT(*)
+			FROM Preferences
+		WHERE Category = :Category
+		AND Value = :Val
+		AND Name LIKE '`+FEATURE_TOGGLE_PREFIX+`%'`, map[string]interface{}{"Category": model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS, "Val": "false"}); err != nil {
+		t.Fatal(err)
+	} else if val != 0 {
+		t.Fatalf("Found %d features with value 'false', expected all to be deleted", val)
+	}
+	//
+	// make sure features with value "true" remain saved
+	if val, err := store.(*SqlStore).preference.(*SqlPreferenceStore).GetReplica().SelectInt(`SELECT COUNT(*)
+			FROM Preferences
+		WHERE Category = :Category
+		AND Value = :Val
+		AND Name LIKE '`+FEATURE_TOGGLE_PREFIX+`%'`, map[string]interface{}{"Category": model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS, "Val": "true"}); err != nil {
+		t.Fatal(err)
+	} else if val == 0 {
+		t.Fatalf("Found %d features with value 'true', expected to find at least %d features", val, 2)
+	}
+}