teams: test refactorings.

pkg/services/teams/team.go

@@ -23,7 +23,6 @@ func canUpdateTeam(orgId int64, teamId int64, user *m.SignedInUser) error {
 	}
 
 	if err := bus.Dispatch(&cmd); err != nil {
-		// TODO: look into how we want to do logging
 		return err
 	}
 

pkg/services/teams/teams_test.go

@@ -11,58 +11,44 @@ import (
 func TestUpdateTeam(t *testing.T) {
 	Convey("Updating a team", t, func() {
 		bus.ClearBusHandlers()
-		Convey("Given an editor and a team he isn't a member of", func() {
+
-			editor := m.SignedInUser{
+		admin := m.SignedInUser{
 			UserId:  1,
 			OrgId:   1,
+			OrgRole: m.ROLE_ADMIN,
+		}
+		editor := m.SignedInUser{
+			UserId:  2,
+			OrgId:   1,
 			OrgRole: m.ROLE_EDITOR,
 		}
-
-			Convey("Should not be able to update the team", func() {
-				cmd := m.UpdateTeamCommand{
-					Id:    1,
-					OrgId: editor.OrgId,
-				}
-
-				bus.AddHandler("test", func(cmd *m.UpdateTeamCommand) error {
-					return errors.New("Editor not allowed to update team.")
-				})
-				bus.AddHandler("test", func(cmd *m.GetTeamMembersQuery) error {
-					cmd.Result = []*m.TeamMemberDTO{}
-					return nil
-				})
-
-				err := UpdateTeam(&editor, &cmd)
-
-				So(err, ShouldEqual, m.ErrNotAllowedToUpdateTeam)
-			})
-		})
-
-		Convey("Given an editor and a team he is a member of", func() {
-			editor := m.SignedInUser{
-				UserId:  1,
-				OrgId:   1,
-				OrgRole: m.ROLE_EDITOR,
-			}
-
 		testTeam := m.Team{
 			Id:    1,
 			OrgId: 1,
 		}
 
-			Convey("Should be able to update the team", func() {
+		updateTeamCmd := m.UpdateTeamCommand{
-				cmd := m.UpdateTeamCommand{
 			Id:    testTeam.Id,
 			OrgId: testTeam.OrgId,
 		}
 
-				teamUpdated := false
+		Convey("Given an editor and a team he isn't a member of", func() {
-
+			Convey("Should not be able to update the team", func() {
-				bus.AddHandler("test", func(cmd *m.UpdateTeamCommand) error {
+				shouldNotUpdateTeam()
-					teamUpdated = true
+				bus.AddHandler("test", func(cmd *m.GetTeamMembersQuery) error {
+					cmd.Result = []*m.TeamMemberDTO{}
 					return nil
 				})
 
+				err := UpdateTeam(&editor, &updateTeamCmd)
+				So(err, ShouldEqual, m.ErrNotAllowedToUpdateTeam)
+			})
+		})
+
+		Convey("Given an editor and a team he is a member of", func() {
+			Convey("Should be able to update the team", func() {
+				teamUpdatedCallback := updateTeamCalled()
+
 				bus.AddHandler("test", func(cmd *m.GetTeamMembersQuery) error {
 					cmd.Result = []*m.TeamMemberDTO{{
 						OrgId:      testTeam.OrgId,
@@ -73,38 +59,29 @@ func TestUpdateTeam(t *testing.T) {
 					return nil
 				})
 
-				err := UpdateTeam(&editor, &cmd)
+				err := UpdateTeam(&editor, &updateTeamCmd)
-
+				So(teamUpdatedCallback(), ShouldBeTrue)
-				So(teamUpdated, ShouldBeTrue)
 				So(err, ShouldBeNil)
 			})
 		})
 
 		Convey("Given an editor and a team in another org", func() {
-			editor := m.SignedInUser{
+			testTeamOtherOrg := m.Team{
-				UserId:  1,
-				OrgId:   1,
-				OrgRole: m.ROLE_EDITOR,
-			}
-
-			testTeam := m.Team{
 				Id:    1,
 				OrgId: 2,
 			}
 
 			Convey("Shouldn't be able to update the team", func() {
 				cmd := m.UpdateTeamCommand{
-					Id:    testTeam.Id,
+					Id:    testTeamOtherOrg.Id,
-					OrgId: testTeam.OrgId,
+					OrgId: testTeamOtherOrg.OrgId,
 				}
 
-				bus.AddHandler("test", func(cmd *m.UpdateTeamCommand) error {
+				shouldNotUpdateTeam()
-					return errors.New("Can't update a team in a different org.")
-				})
 				bus.AddHandler("test", func(cmd *m.GetTeamMembersQuery) error {
 					cmd.Result = []*m.TeamMemberDTO{{
-						OrgId:      testTeam.OrgId,
+						OrgId:      testTeamOtherOrg.OrgId,
-						TeamId:     testTeam.Id,
+						TeamId:     testTeamOtherOrg.Id,
 						UserId:     editor.UserId,
 						Permission: int64(m.PERMISSION_ADMIN),
 					}}
@@ -112,41 +89,35 @@ func TestUpdateTeam(t *testing.T) {
 				})
 
 				err := UpdateTeam(&editor, &cmd)
-
 				So(err, ShouldEqual, m.ErrNotAllowedToUpdateTeamInDifferentOrg)
 			})
 		})
 
 		Convey("Given an org admin and a team", func() {
-			editor := m.SignedInUser{
-				UserId:  1,
-				OrgId:   1,
-				OrgRole: m.ROLE_ADMIN,
-			}
-
-			testTeam := m.Team{
-				Id:    1,
-				OrgId: 1,
-			}
-
 			Convey("Should be able to update the team", func() {
-				cmd := m.UpdateTeamCommand{
+				teamUpdatedCallback := updateTeamCalled()
-					Id:    testTeam.Id,
+				err := UpdateTeam(&admin, &updateTeamCmd)
-					OrgId: testTeam.OrgId,
-				}
 
-				teamUpdated := false
+				So(teamUpdatedCallback(), ShouldBeTrue)
-
-				bus.AddHandler("test", func(cmd *m.UpdateTeamCommand) error {
-					teamUpdated = true
-					return nil
-				})
-
-				err := UpdateTeam(&editor, &cmd)
-
-				So(teamUpdated, ShouldBeTrue)
 				So(err, ShouldBeNil)
 			})
 		})
 	})
 }
+
+func updateTeamCalled() func() bool {
+	wasCalled := false
+	bus.AddHandler("test", func(cmd *m.UpdateTeamCommand) error {
+		wasCalled = true
+		return nil
+	})
+
+	return func() bool { return wasCalled }
+}
+
+func shouldNotUpdateTeam() {
+	bus.AddHandler("test", func(cmd *m.UpdateTeamCommand) error {
+		return errors.New("UpdateTeamCommand not expected.")
+	})
+
+}