Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

graphql: Minor delete mutation msg fix #5316

Merged
merged 6 commits into from
May 12, 2020
Merged

graphql: Minor delete mutation msg fix #5316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
666acd4
Minor delete mutation msg fix
vardhanapoorv Apr 28, 2020
f5b27f2
fix tests
abhimanyusinghgaur Apr 28, 2020
d97a219
Merge branch 'master' of github.com:dgraph-io/dgraph into apoorv/dele…
abhimanyusinghgaur May 8, 2020
97999c7
fix ACL tests
abhimanyusinghgaur May 8, 2020
8715e44
Merge branch 'master' of github.com:dgraph-io/dgraph into apoorv/dele…
abhimanyusinghgaur May 12, 2020
39adea5
fix tests
abhimanyusinghgaur May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 13 additions & 34 deletions ee/acl/acl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func checkUserCount(t *testing.T, resp []byte, expected int) {
require.Equal(t, expected, len(r.AddUser.User))
}

func deleteUser(t *testing.T, accessToken, username string) {
func deleteUser(t *testing.T, accessToken, username string, confirmDeletion bool) {
// TODO - Verify that only one uid got deleted once numUids are returned as part of the payload.
delUser := `
mutation deleteUser($name: String!) {
Expand All @@ -104,7 +104,9 @@ func deleteUser(t *testing.T, accessToken, username string) {
resp := makeRequest(t, accessToken, params)
resp.RequireNoGraphQLErrors(t)

require.JSONEq(t, `{"deleteUser":{"msg":"Deleted"}}`, string(resp.Data))
if confirmDeletion {
require.JSONEq(t, `{"deleteUser":{"msg":"Deleted"}}`, string(resp.Data))
}
}

func deleteGroup(t *testing.T, accessToken, name string) {
Expand Down Expand Up @@ -164,20 +166,14 @@ func TestPasswordReturn(t *testing.T) {
}

func TestGetCurrentUser(t *testing.T) {
accessJwt, _, err := testutil.HttpLogin(&testutil.LoginParams{
Endpoint: adminEndpoint,
UserID: "groot",
Passwd: "password",
})
require.NoError(t, err, "login failed")

accessJwt, _ := testutil.GrootHttpLogin(adminEndpoint)
currentUser := getCurrentUser(t, accessJwt)
currentUser.RequireNoGraphQLErrors(t)
require.Equal(t, string(currentUser.Data), `{"getCurrentUser":{"name":"groot"}}`)

// clean up the user to allow repeated running of this test
userid := "hamilton"
deleteUser(t, accessJwt, userid)
deleteUser(t, accessJwt, userid, false)
glog.Infof("cleaned up db user state")

resp := createUser(t, accessJwt, userid, userpassword)
Expand All @@ -197,31 +193,19 @@ func TestGetCurrentUser(t *testing.T) {
}

func TestCreateAndDeleteUsers(t *testing.T) {
accessJwt, _, err := testutil.HttpLogin(&testutil.LoginParams{
Endpoint: adminEndpoint,
UserID: "groot",
Passwd: "password",
})
require.NoError(t, err, "login failed")

// clean up the user to allow repeated running of this test
deleteUser(t, accessJwt, userid)
glog.Infof("cleaned up db user state")

resp := createUser(t, accessJwt, userid, userpassword)
resp.RequireNoGraphQLErrors(t)
checkUserCount(t, resp.Data, 1)
resetUser(t)

// adding the user again should fail
resp = createUser(t, accessJwt, userid, userpassword)
accessJwt, _ := testutil.GrootHttpLogin(adminEndpoint)
resp := createUser(t, accessJwt, userid, userpassword)
require.Equal(t, x.GqlErrorList{{
Message: "couldn't rewrite query for mutation addUser because id alice already exists" +
" for type User",
}}, resp.Errors)
checkUserCount(t, resp.Data, 0)

// delete the user
deleteUser(t, accessJwt, userid)
deleteUser(t, accessJwt, userid, true)

resp = createUser(t, accessJwt, userid, userpassword)
resp.RequireNoGraphQLErrors(t)
Expand All @@ -230,15 +214,10 @@ func TestCreateAndDeleteUsers(t *testing.T) {
}

func resetUser(t *testing.T) {
accessJwt, _, err := testutil.HttpLogin(&testutil.LoginParams{
Endpoint: adminEndpoint,
UserID: "groot",
Passwd: "password",
})
require.NoError(t, err, "login failed")
accessJwt, _ := testutil.GrootHttpLogin(adminEndpoint)

// clean up the user to allow repeated running of this test
deleteUser(t, accessJwt, userid)
deleteUser(t, accessJwt, userid, false)
glog.Infof("deleted user")

resp := createUser(t, accessJwt, userid, userpassword)
Expand Down Expand Up @@ -1599,7 +1578,7 @@ func TestDeleteUserShouldDeleteUserFromGroup(t *testing.T) {
})
require.NoError(t, err, "login failed")

deleteUser(t, accessJwt, userid)
deleteUser(t, accessJwt, userid, true)

gqlQuery := `
query {
Expand Down
4 changes: 2 additions & 2 deletions graphql/e2e/auth/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ func TestDeleteAuthRule(t *testing.T) {
"anyofterms": "Sensitive information",
},
},
result: `{"deleteUserSecret":{"msg":"Deleted","numUids":0}}`,
result: `{"deleteUserSecret":{"msg":"No nodes were deleted","numUids":0}}`,
},
}
query := `
Expand Down Expand Up @@ -666,7 +666,7 @@ func TestDeleteDeepAuthRule(t *testing.T) {
"anyofterms": "Ticket2",
},
},
result: `{"deleteTicket":{"msg":"Deleted","numUids":0}}`,
result: `{"deleteTicket":{"msg":"No nodes were deleted","numUids":0}}`,
},
{
name: "ticket with edit permission",
Expand Down
Loading