+
From 2a1a9f28fdcf4e0c3c89a20b0f3e4131dcfe3bff Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 15 Jul 2025 15:43:55 +0000
Subject: [PATCH 3/3] Add modulo operator functionality
Co-authored-by: haslam93 <36418598+haslam93@users.noreply.github.com>
---
api/controller.js | 1 +
public/client.js | 5 +++-
public/index.html | 1 +
test/arithmetic.test.js | 51 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/api/controller.js b/api/controller.js
index 797d0f7..86ff203 100644
--- a/api/controller.js
+++ b/api/controller.js
@@ -16,6 +16,7 @@ exports.calculate = function(req, res) {
'subtract': function(a, b) { return a - b },
'multiply': function(a, b) { return a * b },
'divide': function(a, b) { return a / b },
+ 'modulo': function(a, b) { return a % b },
};
if (!req.query.operation) {
diff --git a/public/client.js b/public/client.js
index 25a148d..50aff35 100644
--- a/public/client.js
+++ b/public/client.js
@@ -65,6 +65,9 @@ function calculate(operand1, operand2, operation) {
case '/':
uri += "?operation=divide";
break;
+ case '%':
+ uri += "?operation=modulo";
+ break;
default:
setError();
return;
@@ -170,7 +173,7 @@ document.addEventListener('keypress', (event) => {
numberPressed(event.key);
} else if (event.key == '.') {
decimalPressed();
- } else if (event.key.match(/^[-*+/]$/)) {
+ } else if (event.key.match(/^[-*+/%]$/)) {
operationPressed(event.key);
} else if (event.key == '=') {
equalPressed();
diff --git a/public/index.html b/public/index.html
index fc62fa4..639644a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -19,6 +19,7 @@
+
diff --git a/test/arithmetic.test.js b/test/arithmetic.test.js
index deded48..5dcb36e 100644
--- a/test/arithmetic.test.js
+++ b/test/arithmetic.test.js
@@ -96,6 +96,57 @@ describe('Arithmetic', function () {
// TODO: Challenge #1
+ describe('Modulo', function () {
+ it('calculates modulo of two positive integers', function (done) {
+ request.get('/arithmetic?operation=modulo&operand1=10&operand2=3')
+ .expect(200)
+ .end(function (err, res) {
+ expect(res.body).to.eql({ result: 1 });
+ done();
+ });
+ });
+ it('calculates modulo with zero dividend', function (done) {
+ request.get('/arithmetic?operation=modulo&operand1=0&operand2=5')
+ .expect(200)
+ .end(function (err, res) {
+ expect(res.body).to.eql({ result: 0 });
+ done();
+ });
+ });
+ it('calculates modulo with negative dividend', function (done) {
+ request.get('/arithmetic?operation=modulo&operand1=-10&operand2=3')
+ .expect(200)
+ .end(function (err, res) {
+ expect(res.body).to.eql({ result: -1 });
+ done();
+ });
+ });
+ it('calculates modulo with negative divisor', function (done) {
+ request.get('/arithmetic?operation=modulo&operand1=10&operand2=-3')
+ .expect(200)
+ .end(function (err, res) {
+ expect(res.body).to.eql({ result: 1 });
+ done();
+ });
+ });
+ it('calculates modulo with floating point numbers', function (done) {
+ request.get('/arithmetic?operation=modulo&operand1=5.5&operand2=2')
+ .expect(200)
+ .end(function (err, res) {
+ expect(res.body).to.eql({ result: 1.5 });
+ done();
+ });
+ });
+ it('calculates modulo by zero', function (done) {
+ request.get('/arithmetic?operation=modulo&operand1=10&operand2=0')
+ .expect(200)
+ .end(function (err, res) {
+ expect(res.body).to.eql({ result: null });
+ done();
+ });
+ });
+ });
+
describe('Multiplication', function () {
it('multiplies two positive integers', function (done) {
request.get('/arithmetic?operation=multiply&operand1=21&operand2=2')