Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@akiyatomohiro
akiyatomohiro committed Dec 23, 2024
1 parent fb0e535 commit 06545d7
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 21 deletions.
17 changes: 11 additions & 6 deletions api/e2e/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,18 +120,18 @@ type GraphQLRequest struct {
Variables map[string]any `json:"variables"`
}

func StartGQLServer(t *testing.T, cfg *config.Config, useMongo bool, seeder Seeder) (*httpexpect.Expect, *accountrepo.Container) {
e, r := StartGQLServerAndRepos(t, cfg, useMongo, seeder)
func StartGQLServer(t *testing.T, cfg *config.Config, useMongo bool, seeder Seeder, allowPermission bool) (*httpexpect.Expect, *accountrepo.Container) {
e, r := StartGQLServerAndRepos(t, cfg, useMongo, seeder, allowPermission)
return e, r
}

func StartGQLServerAndRepos(t *testing.T, cfg *config.Config, useMongo bool, seeder Seeder) (*httpexpect.Expect, *accountrepo.Container) {
func StartGQLServerAndRepos(t *testing.T, cfg *config.Config, useMongo bool, seeder Seeder, allowPermission bool) (*httpexpect.Expect, *accountrepo.Container) {
repos := initRepos(t, useMongo, seeder)
acRepos := repos.AccountRepos()
return StartGQLServerWithRepos(t, cfg, repos, acRepos), acRepos
return StartGQLServerWithRepos(t, cfg, repos, acRepos, allowPermission), acRepos
}

func StartGQLServerWithRepos(t *testing.T, cfg *config.Config, repos *repo.Container, accountrepos *accountrepo.Container) *httpexpect.Expect {
func StartGQLServerWithRepos(t *testing.T, cfg *config.Config, repos *repo.Container, accountrepos *accountrepo.Container, allowPermission bool) *httpexpect.Expect {
t.Helper()

if testing.Short() {
Expand All @@ -145,6 +145,10 @@ func StartGQLServerWithRepos(t *testing.T, cfg *config.Config, repos *repo.Conta
t.Fatalf("server failed to listen: %v", err)
}

// mockPermissionChecker
mockPermissionChecker := gateway.NewMockPermissionChecker()
mockPermissionChecker.Allow = allowPermission

srv := app.NewServer(ctx, &app.ServerConfig{
Config: cfg,
Repos: repos,
Expand All @@ -155,7 +159,8 @@ func StartGQLServerWithRepos(t *testing.T, cfg *config.Config, repos *repo.Conta
AccountGateways: &accountgateway.Container{
Mailer: mailer.New(ctx, &mailer.Config{}),
},
Debug: true,
Debug: true,
PermissionChecker: mockPermissionChecker,
})

ch := make(chan error)
Expand Down
2 changes: 1 addition & 1 deletion api/e2e/gql_param_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func TestDeclareParameter(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)

// Create a test project first
projectID := createTestProject(t, e)
Expand Down
4 changes: 2 additions & 2 deletions api/e2e/gql_project_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestProjectWorkflows(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)

projectId := testCreateProject(t, e)

Expand Down Expand Up @@ -228,7 +228,7 @@ func TestListProjects(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)

query := fmt.Sprintf(`{
projects(
Expand Down
12 changes: 6 additions & 6 deletions api/e2e/gql_user_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func TestUpdateMe(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)
query := `mutation { updateMe(input: {name: "updated", email: "hoge@test.com", lang: "ja", password: "Ajsownndww1", passwordConfirmation: "Ajsownndww1"}){ me { id name email lang auths myWorkspaceId } }}`
request := GraphQLRequest{
Query: query,
Expand All @@ -127,7 +127,7 @@ func TestRemoveMyAuth(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)
u, err := r.User.FindByID(context.Background(), uId1)
assert.Nil(t, err)
assert.Equal(t, &user.Auth{Provider: "reearth", Sub: "reearth|" + uId1.String()}, u.Auths().GetByProvider("reearth"))
Expand Down Expand Up @@ -157,7 +157,7 @@ func TestDeleteMe(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)
u, err := r.User.FindByID(context.Background(), uId1)
assert.Nil(t, err)
assert.NotNil(t, u)
Expand Down Expand Up @@ -186,7 +186,7 @@ func TestSearchUser(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)
query := fmt.Sprintf(` { searchUser(nameOrEmail: "%s"){ id name email } }`, "e2e")
request := GraphQLRequest{
Query: query,
Expand Down Expand Up @@ -226,7 +226,7 @@ func TestNode(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)
query := fmt.Sprintf(` { node(id: "%s", type: USER){ id } }`, uId1.String())
request := GraphQLRequest{
Query: query,
Expand All @@ -249,7 +249,7 @@ func TestNodes(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)
query := fmt.Sprintf(` { nodes(id: "%s", type: USER){ id } }`, uId1.String())
request := GraphQLRequest{
Query: query,
Expand Down
12 changes: 6 additions & 6 deletions api/e2e/gql_workspace_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestCreateWorkspace(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)
query := `mutation { createWorkspace(input: {name: "test"}){ workspace{ id name } }}`
request := GraphQLRequest{
Query: query,
Expand All @@ -43,7 +43,7 @@ func TestDeleteWorkspace(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)
_, err := r.Workspace.FindByID(context.Background(), wId1)
assert.Nil(t, err)
query := fmt.Sprintf(`mutation { deleteWorkspace(input: {workspaceId: "%s"}){ workspaceId }}`, wId1)
Expand Down Expand Up @@ -85,7 +85,7 @@ func TestUpdateWorkspace(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)

w, err := r.Workspace.FindByID(context.Background(), wId1)
assert.Nil(t, err)
Expand Down Expand Up @@ -132,7 +132,7 @@ func TestAddMemberToWorkspace(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)

w, err := r.Workspace.FindByID(context.Background(), wId1)
assert.Nil(t, err)
Expand Down Expand Up @@ -179,7 +179,7 @@ func TestRemoveMemberFromWorkspace(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)

w, err := r.Workspace.FindByID(context.Background(), wId2)
assert.Nil(t, err)
Expand Down Expand Up @@ -217,7 +217,7 @@ func TestUpdateMemberOfWorkspace(t *testing.T) {
AuthSrv: config.AuthSrvConfig{
Disabled: true,
},
}, true, baseSeederUser)
}, true, baseSeederUser, true)

w, err := r.Workspace.FindByID(context.Background(), wId2)
assert.Nil(t, err)
Expand Down

0 comments on commit 06545d7

Please sign in to comment.