Davina scott assignment

assignment/01/exercise.test.js → davina-scott-assignment/01/exercise.test.js

@@ -6,6 +6,15 @@ describe('Exercise 01', () => {
 
         function multipleOf5Or9(positiveNumber) {
             // Your code here
+            const x = positiveNumber/5
+            const y = positiveNumber/9
+            if (Number.isInteger(x) ){
+                return true;
+            } else if (Number.isInteger(y)){
+                return true;
+            } else {
+                return false;
+            }
 
         }
 

assignment/02/exercise.test.js → davina-scott-assignment/02/exercise.test.js

@@ -8,6 +8,14 @@ describe('02', () => {
 
         function lastThree(str) {
             // Your code here
+            if (str.length >= 3){
+                const lastThreeChar = str.slice(-3)
+                const newString = lastThreeChar + str + lastThreeChar
+                return newString
+
+            } else {
+                return false;
+            }
 
         }
 

assignment/03/exercise.test.js → davina-scott-assignment/03/exercise.test.js

@@ -3,6 +3,19 @@ describe('03', () => {
 
         function isSix(x, y) {
             // Your code here
+            const sum = x + y
+            const xDifference = x - y
+            const yDifference = y - x
+
+            if ((x == 6) || (y == 6)){
+                return true;
+            } else if ((xDifference == 6) || (yDifference == 6)){
+                return true;
+            } else if (sum == 6){
+                return true;
+            } else {
+                return false;
+            }
 
         }
 

assignment/04/exercise.test.js → davina-scott-assignment/04/exercise.test.js

@@ -3,6 +3,13 @@ describe('04', () => {
 
         const arrayIncludes5Or2 = (array) => {
             // Your code here
+            for (let i = 0; i < array.length; i++){
+                const arrayElement = array[i]
+                if ((arrayElement == 5) || (arrayElement === 2)){
+                    return true;
+                } 
+            } return false;
+
 
         }
 

assignment/05/exercise.test.js → davina-scott-assignment/05/exercise.test.js

@@ -4,7 +4,11 @@ describe('05', () => {
 
         const sum = (array) => {
             // Your code here
-
+            var sum = 0;
+            for (let i = 0; i < array.length; i++){
+                sum = sum + array[i];               
+            }
+            return sum;
         }
 
         // Test cases

assignment/06/exercise.test.js → davina-scott-assignment/06/exercise.test.js

@@ -9,6 +9,14 @@ describe('06', () => {
             markPaper: () => {
                 // add a promise here that resolves after 2 seconds
                 // and print "Maths paper marked"
+                    return new Promise((resolve, reject) => {
+                    setTimeout(() => {
+                        resolve('Maths paper marked');
+                        reject('Paper was not marked');
+                    }, 2000);
+                    // return myPromise
+                });
+
             }
         },
         {
@@ -17,6 +25,14 @@ describe('06', () => {
             markPaper: () => {
                 // add a promise here that resolves after 2 seconds
                 // and print "Geology paper marked"
+                return new Promise((resolve, reject) => {
+                    setTimeout(() => {
+                        resolve('Geology paper marked');
+                        reject('Paper was not marked');
+                    }, 2000);
+                });
+                // return myPromise
+
             }
         },
         {
@@ -25,6 +41,14 @@ describe('06', () => {
             markPaper: () => {
                 // add a promise here that resolves after 2 seconds
                 // and print "Social Studies paper marked"
+                return new Promise((resolve, reject) => {
+                    setTimeout(() => {
+                        resolve('Social Studies paper marked');
+                        reject('Paper was not marked');
+                    }, 2000);
+
+                });
+                // return myPromise
             }
         },
     ]
@@ -33,6 +57,17 @@ describe('06', () => {
         const spyOnLog = vi.spyOn(console, 'log');
 
         // Your code here
+        listOfPapers.forEach(element => {
+            const arrayResult = element.markPaper()
+            console.log(arrayResult)
+            if (element.wasSubmitted = true){
+                arrayResult.then((value) => {
+                    console.log(value);
+                }).catch((error) => {
+                        expect(error).toBe('Promise rejected');
+                })
+            }
+        });
 
 
         expect(spyOnLog).toHaveBeenCalledWith("Maths paper marked");

assignment/07/exercise.test.js → davina-scott-assignment/07/exercise.test.js

@@ -12,6 +12,10 @@ describe('07', () => {
         const array = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 
         // Your code here
+        array.forEach(element => {
+            const outputString = 'The current element is' + ' ' + element
+            console.log(outputString);
+        });
 
         // Test cases
         expect(spyOnLog).toHaveBeenCalledWith('The current element is 1');

assignment/08/exercise.test.js → davina-scott-assignment/08/exercise.test.js

@@ -16,7 +16,35 @@ describe('08', () => {
 
     test('Create a Vehicle class, and create different type of vehicles that extends', () => {
         // Your code here
+        class Car {
+            constructor(color, wheels, bodyType) {
+                this.wheels = wheels;
+                this.bodyType = bodyType;
+                this.color = color;
+            }
 
+            whatIsMyName() {
+                return this.carBodyType();
+            }
+
+            carBodyType() {
+                const stringBodyType = 'I am a' + ' ' + this.bodyType
+                return stringBodyType;
+            }
+        }
+
+        class Truck extends Car{
+            constructor(color, wheels, bodyType){
+                super(color,wheels,bodyType);
+
+            }
+        }
+
+        class Motorcycle extends Car{
+            constructor(color, wheels, bodyType){
+                super(color,wheels,bodyType);
+            }
+        }
 
         // Expected outcome for the child classes
         const car = new Car('red', 4, 'sedan');

assignment/package.json → davina-scott-assignment/package.json

@@ -5,7 +5,8 @@
   "main": "index.js",
   "scripts": {
     "test": "vitest run",
-    "exercise": "node ../setup/scripts.js"
+    "exercise": "node ../setup/scripts.js",
+    "ex": "npm run exercise --"
   },
   "author": "Dimitri Harding",
   "license": "ISC",