Remove DefaultOrganization Name in tests mock store

pull/10616/head
Michael Desa 2017-11-02 19:41:57 -04:00
parent 1c48601792
commit f75de68607
2 changed files with 33 additions and 66 deletions

View File

@ -120,7 +120,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -173,7 +172,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -226,7 +224,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -279,7 +276,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -332,7 +328,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -385,7 +380,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -438,7 +432,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -491,7 +484,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -544,7 +536,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -592,7 +583,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -640,7 +630,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -688,7 +677,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -740,7 +728,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -838,7 +825,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -891,7 +877,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -944,7 +929,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -997,7 +981,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -1051,7 +1034,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -1105,7 +1087,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -1159,7 +1140,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -1213,7 +1193,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -1266,7 +1245,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -1315,7 +1293,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -1367,7 +1344,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -1420,7 +1396,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -1483,7 +1458,6 @@ func TestAuthorizedUser(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {

View File

@ -51,7 +51,6 @@ func TestService_Me(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -103,7 +102,6 @@ func TestService_Me(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -153,7 +151,6 @@ func TestService_Me(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -312,7 +309,6 @@ func TestService_MeOrganizations(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -372,7 +368,6 @@ func TestService_MeOrganizations(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -424,7 +419,6 @@ func TestService_MeOrganizations(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {
@ -485,7 +479,6 @@ func TestService_MeOrganizations(t *testing.T) {
DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) { DefaultOrganizationF: func(ctx context.Context) (*chronograf.Organization, error) {
return &chronograf.Organization{ return &chronograf.Organization{
ID: 0, ID: 0,
Name: "The Bad Place",
}, nil }, nil
}, },
GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) { GetF: func(ctx context.Context, q chronograf.OrganizationQuery) (*chronograf.Organization, error) {