Skip to content

Commit

Permalink
tests fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaykAkifovski
MaykAkifovski committed Dec 4, 2020
1 parent 2e42ac9 commit 1f1eb90
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 27 deletions.
18 changes: 9 additions & 9 deletions backend/src/security/rules.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@ const bcrypt = require('bcrypt');

const isAuthenticated = rule({ cache: 'contextual' })(
async (parent, args, { token, dataSources }) => {
const user = dataSources.usersApi.getUserById(token.uId);
const user = await dataSources.usersApi.getUserById(token.uId);
return user !== undefined;
}
)
);

const canSeeEmail = rule({ cache: 'strict' })(
async (parent, args, { token }) => {
return token.uId === parent.id;
}
)
);

const emailIsTaken = rule({ cache: 'strict' })(
async(parent, args, { token, dataSources }) => {
const user = await dataSources.usersApi.getUserByEmail(args.email);
return user !== undefined;
}
)
);

const passwordIsTooShort = rule({ cache: 'strict' })(
async(parent, args, { token, dataSources }) => {
return args.password.length < 8;
}
)
);

const passwordIsValid = rule({ cache: 'strict' })(
async (parent, args, { dataSources }) => {
const user = await dataSources.usersApi.getUserByEmail(args.email);
return user !== undefined && bcrypt.compareSync(args.password, user.password);
}
)
);

const isPostWithTitlePresent = rule({ cache: 'strict'})(
async (parent, args, { dataSources }) => {
Expand All @@ -48,19 +48,19 @@ const isPostWithTitlePresent = rule({ cache: 'strict'})(
const post = await dataSources.postsApi.getPost(title);
return post !== undefined;
}
)
);

const isPostUpvoted = rule({ cache: 'strict'})(
async (parent, args, { dataSources, token }) => {
const title = args.title;
const post = await dataSources.postsApi.getPost(title);
return post.upvoters.includes(token.uId);
}
)
);

exports.isAuthenticated = isAuthenticated;
exports.isPostUpvoted = isPostUpvoted;
exports.isPostWithTitlePresent = isPostWithTitlePresent
exports.isPostWithTitlePresent = isPostWithTitlePresent;
exports.passwordIsValid = passwordIsValid;
exports.passwordIsTooShort = passwordIsTooShort;
exports.emailIsTaken = emailIsTaken;
Expand Down
53 changes: 35 additions & 18 deletions backend/src/tests/tests.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ beforeEach(async () => {
atanas_auth_token = await authApi.createToken(userIds[1]);

postsApi.posts = [
{ title: "Mike's Post 1", votes: 0, author: userIds[0] },
{ title: "Mike's Post 2", votes: 0, author: userIds[0] },
{ title: "Atanas's Post 1", votes: 0, author: userIds[1] },
{ title: "Atanas's Post 2", votes: 0, author: userIds[1] },
{ title: "Mike's Post 1", votes: 0, upvoters:[], author: userIds[0] },
{ title: "Mike's Post 2", votes: 0, upvoters:[], author: userIds[0] },
{ title: "Atanas's Post 1", votes: 0, upvoters:[], author: userIds[1] },
{ title: "Atanas's Post 2", votes: 0, upvoters:[], author: userIds[1] },
];

usersApi.users = [
Expand Down Expand Up @@ -214,53 +214,70 @@ describe("write(post: $postInput)", () => {
})
});

/*
describe("upvote(title: String, voter: UserInput!)", () => {

let UPVOTE_POST;
beforeEach(() => {
UPVOTE_POST = gql`
mutation UpvotePost($title: ID!, $voter: UserInput!) {
upvote(title: $title, voter: $voter) {
mutation UpvotePost($title: ID!) {
upvote(title: $title) {
title,
votes
}
}
`;
});

it("upvotes a post", async () => {
it("upvotes a post - not authorized", async () => {
const {
data: {upvote}
} = await mutate({ mutation: UPVOTE_POST, variables: { title: "The Nothing", voter: { name: "Max" } } });
errors:[ error ]
} = await mutate({ mutation: UPVOTE_POST, variables: { title: "Atanas's Post 1" } });

expect(upvote).toMatchObject({ title: "The Nothing", votes: 1 });
expect(error.message).toEqual('Not Authorised!');
});

it("upvotes a post - authorized", async () => {
reqMock.headers = {authorization: 'Bearer ' + atanas_auth_token};

const {
data:{upvote},
} = await mutate({ mutation: UPVOTE_POST, variables: { title: "Atanas's Post 1" } });

expect(upvote).toMatchObject({ title: "Atanas's Post 1", votes: 1 });
});

it("throws error because post does not exist", async () => {
reqMock.headers = {authorization: 'Bearer ' + atanas_auth_token};

const {
errors: [error]
} = await mutate({ mutation: UPVOTE_POST, variables: { title: "nosuchpost", voter: { name: "Max" } } });
} = await mutate({ mutation: UPVOTE_POST, variables: { title: "nosuchpost" } });

expect(error.message).toEqual("Post with this title doesn't exist");
expect(error.message).toEqual("Not Authorised!");
});

it("throws error because voter does not exist", async () => {
unvalidAuthToken = await authApi.createToken(uuidv4());
reqMock.headers = {authorization: 'Bearer ' + unvalidAuthToken};

const {
errors: [error]
} = await mutate({ mutation: UPVOTE_POST, variables: { title: "The Nothing", voter: { name: "bro" } } });
} = await mutate({ mutation: UPVOTE_POST, variables: { title: "Atanas's Post 1", voter: { name: "bro" } } });

expect(error.message).toEqual("No such voter.");
expect(error.message).toEqual("Not Authorised!");
});

it("throws error because voter already voted on this post", async () => {
reqMock.headers = {authorization: 'Bearer ' + atanas_auth_token};
const {
data:{upvote},
} = await mutate({ mutation: UPVOTE_POST, variables: { title: "Atanas's Post 1" } });

const {
errors: [error]
} = await mutate({ mutation: UPVOTE_POST, variables: { title: "The Nothing", voter: { name: "Max" } } });
} = await mutate({ mutation: UPVOTE_POST, variables: { title: "Atanas's Post 1" } });

expect(error.message).toEqual("This voter has already upvoted this article");
expect(error.message).toEqual("You've already upvoted this post");
})
});
*/

0 comments on commit 1f1eb90

Please sign in to comment.