1 files changed, 0 insertions, 32 deletions
diff --git a/model/user_test.go b/model/user_test.go
index ac075a8..e7bcb1e 100644
--- a/model/user_test.go
+++ b/model/user_test.go
@@ -59,35 +59,3 @@ func TestValidateUserModification(t *testing.T) {
 		t.Error(`An invalid password should generate an error`)
 	}
 }
-
-func TestMergeUsername(t *testing.T) {
-	user1 := &User{ID: 42, Username: "user1", Password: "secret", Theme: "default"}
-	user2 := &User{ID: 42, Username: "user2"}
-	user1.Merge(user2)
-
-	if user1.Username != "user2" {
-		t.Fatal(`The username should be merged into user1`)
-	}
-
-	if user1.Theme != "default" {
-		t.Fatal(`The theme should not be merged into user1`)
-	}
-}
-
-func TestMergeIsAdmin(t *testing.T) {
-	user1 := &User{ID: 42, Username: "user1", Password: "secret", Theme: "default"}
-	user2 := &User{ID: 42, IsAdmin: true}
-	user1.Merge(user2)
-
-	if !user1.IsAdmin {
-		t.Fatal(`The is_admin flag should be merged into user1`)
-	}
-
-	user1 = &User{ID: 42, Username: "user1", Password: "secret", Theme: "default"}
-	user2 = &User{ID: 42}
-	user1.Merge(user2)
-
-	if user1.IsAdmin {
-		t.Fatal(`The is_admin flag should not be merged into user1`)
-	}
-}