Skip to content

Glasgow | 25-ITP-Sep | Fares Bakhet | Sprint 3 | coursework/sprint-3-implement-and-rewrite #755

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Glasgow | 25-ITP-Sep | Fares Bakhet | Sprint 3 | coursework/sprint-3-implement-and-rewrite #755

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8738ad1
Editing the getAngleType Code
Fares-Bakhet Oct 12, 2025
ed40750
Editing isProoerFraction Code
Fares-Bakhet Oct 12, 2025
e6d384c
Editing getCardValue Code
Fares-Bakhet Oct 12, 2025
a2b2e06
Passed the test for getAngleType code
Fares-Bakhet Oct 12, 2025
11efcb1
Passed getCardvalue test
Fares-Bakhet Oct 12, 2025
d440aaf
Passed isProperFraction test
Fares-Bakhet Oct 12, 2025
07685f8
Deleted angle>90
Fares-Bakhet Oct 23, 2025
283fe06
Editing the code
Fares-Bakhet Oct 23, 2025
7139e24
Generalise test case3
Fares-Bakhet Oct 23, 2025
29b1e29
Editing
Fares-Bakhet Oct 23, 2025
4c6b2b2
Re-write the tests
Fares-Bakhet Oct 23, 2025
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
2 changes: 1 addition & 1 deletion Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function getAngleType(angle) {
if (angle < 90 && angle > 0) {
return "Acute angle";
}
if (angle > 90 && angle < 180) {
if (angle < 180) {
Copy link
Contributor

@cjyuan cjyuan Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you find all places where you can remove redundant checks and update the code accordingly?

Copy link
Author

@Fares-Bakhet Fares-Bakhet Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cjyuan, okay.

Copy link
Author

@Fares-Bakhet Fares-Bakhet Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cjyuan,
If I want to rearrange this again, I will end up in this way:

  • 0 & < 90 >> covers 1-89

  • ==90 >> covers 90

  • 90 & <180 >>covers 91-179

  • ==180>>covers 180

  • 180 & <360 >> covers 181-359

  • invalid if sth else

Right??

Copy link
Contributor

@cjyuan cjyuan Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't tell. 180 & < 360 is not exactly JS code.

Copy link
Author

@Fares-Bakhet Fares-Bakhet Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cjyuan,
I was shortcutting
if( angle > 180 && angle <360)

Copy link
Contributor

@cjyuan cjyuan Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still don't know wat you try to expressed:
image

I suspect part of the code is misinterpreted as Markdown code. Here is the GitHub Markdown guide:
https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax

return "Obtuse angle";
}
if (angle === 180) {
Expand Down
1 change: 1 addition & 0 deletions Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,4 @@ console.log(getCardValue("10♣"));
console.log(getCardValue("J♦"));
console.log(getCardValue("A♥"));
console.log(getCardValue("11♠"));
console.log(getCardValue("J"));
17 changes: 6 additions & 11 deletions Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,12 @@ test("should return 5 for Five of Hearts", () => {
expect(fiveofHearts).toEqual(5);
});
// Case 3: Handle Face Cards (J, Q, K):
test("should return 10 for Jack of Diamonds", () => {
const jackofDiamonds = getCardValue("J♦");
expect(jackofDiamonds).toEqual(10);
});
test("should return 10 for Queen of Clubs", () => {
const queenofClubs = getCardValue("Q♣");
expect(queenofClubs).toEqual(10);
});
test("should return 10 for King of Hearts", () => {
const kingofHearts = getCardValue("K♥");
expect(kingofHearts).toEqual(10);
test("should return 10 for all face cards (J, Q, K)", () => {
const faceCards = ["J♦", "Q♣", "K♥"];
faceCards.forEach((card) => {
const value = getCardValue(card);
expect(value).toEqual(10);
});
});
Copy link
Contributor

@cjyuan cjyuan Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great.

// Case 4: Handle Ace (A):
test("should return 11 for Ace of Spades", () => {
Expand Down