Renata Estes

README.md

@@ -9,7 +9,7 @@
 ### Add Calculation Tests
 * subtracts 4 from 5 to equal 1
 * multiply 4 by 5 to equal 20
-* device 100 by 4 to equal 25
+* divide 100 by 4 to equal 25
 
 ### Add Function Tests
 * Implement the tests as described in the comments
@@ -48,13 +48,10 @@
 ### Hopefully at this point you can see there is a pattern to making the tests
 
 ### ChangeTemperatureContainer.js
-* Create a test file for this container to ensure that when the text box changes, the state currentTemp changes 
+* Create a test file for this container to ensure that when the text box changes, the state currentTemp changes
 
 ### CityDropDownContainer.js
 * Create a test file to ensure that when the drop down changes, the state currentCity changes
 
 ### CurrentCityContainer.js
 * Create a test file to ensure that when the state currentCity is change, the text of the div changes to “CurrentCity: whatever city”
-
-
-

src/services/array-functions.js

@@ -1,40 +1,63 @@
 
-//in the function map, create a new array and store in a variable
-//loop theArray and call the fnc for each thing in the array, 
+//in the function map, create a new array and store in a variable - []
+//loop theArray and call the fnc for each thing in the array, - fnc()
 //     passing in the item from the current loop into the call to fnc
-//add the returned value from fnc to the new array
+//add the returned value from fnc to the new array -push
 //return the new array
 export function map(theArray, fnc){
-
+  var newArray = [];
+  for(var i = 0; i < theArray.length; i++){
+      var currentItem = theArray[i];
+      var returnedItem = fnc(currentItem);
+      newArray.push(returnedItem);
+  }
+  return newArray;
 }
 
 //create a new array
-//loop theArray and call the fnc for each thing in the array, 
+//loop theArray and call the fnc for each thing in the array,
 //     passing in the item from the current loop
 //fnc will return true or false, if true add the item to the new array else do not
 //return the new array
 export function filter(theArray, fnc){
-
-}
-
-
-//loop theArray and call the fnc for each thing in the array, 
+  var newArray = [];
+  for(var i = 0; i < theArray.length; i++){
+      var currentItem = theArray[i];
+      var returnedItem = fnc(currentItem);
+      if(returnedItem){
+        newArray.push(theArray[i]);
+     }
+  }
+  return newArray;
+  }
+
+
+//loop theArray and call the fnc for each thing in the array,
 //     passing in the item from the current loop
-//fnc will return true or false, if true return the item 
+//fnc will return true or false, if true return the item
 //return null
 export function find(theArray, fnc){
-
+  var newArray = [];
+  for(var i = 0; i < theArray.length; i++){
+      var currentItem = theArray[i];
+      var returnedItem = fnc(currentItem);
+        if(returnedItem){
+          return theArray[i];
+       }
+     }
+     return null;
+    }
 }
 
 
 //return the last item in theArray
 export function findLast(theArray){
-
+  return theArray[theArray.length - 1];
 }
 
 //return the first element of the array
 export function head(theArray){
-
+  return theArray[0];
 }
 
 //create a new array
@@ -65,4 +88,4 @@ export function tail(theArray){
 //if false return theArray
 export function sort(theArray){
 
-}
+}

src/services/calculations.js

@@ -4,9 +4,9 @@ export function add(num1, num2){
 export function subtract(num1, num2){
   return num1 - num2;
 }
-export function multiple(num1, num2){
+export function multiply(num1, num2){
   return num1 * num2;
 }
 export function divide(num1, num2){
   return num1 / num2;
-}
+}

src/tests/array-functions.test.js

@@ -18,6 +18,17 @@ describe("head", () => {
   });
 });
 
+describe("find", () => {
+  it("should find the single name 'Barney'", () => {
+    expect(find(names, findBarney)).toEqual("Barney");
+  });
+});
+
+describe("filter", () => {
+  it("should find the single name 'Barney'", () => {
+    expect(filter(names, findThree)).toEqual("Barney");
+  });
+});
 
 describe("map", () => {
   it("should prepend Hello to each name", () => {
@@ -37,11 +48,12 @@ describe("map", () => {
 describe("sort", () => {
   it("should return an array with numbers in order", () => {
     expect(sort(myNumbers)).toEqual([
-      1,2,3,4,5,7,22,55,99,1913
+      1,2,3,4,4,5,7,22,55,99,1913
     ]);
   });
 });
 
+
 //filter should return an array with names of length 3
 //["Jon","Bob","Ted","Axe"]
 
@@ -53,5 +65,3 @@ describe("sort", () => {
 //["Axe","Saul","Robin","Lilly","Barney","Ted","Bob","Jon"]
 //tail should return all elements in an array except the first one
 //[Bob","Ted","Barney","Lilly","Robin","Saul","Axe"];
-
-

src/tests/calculations.test.js

@@ -1,7 +1,29 @@
-import {add, subtract, multiply,divide} from "../services/calculations";
+import {add, subtract, multiply, divide} from "../services/calculations";
 
 describe("add", () => {
   it("should add 1 and 2 and return 3", () => {
-    expect(add(1, 2)).toBe(3);
+    var result = add(1, 2);
+    expect(result).toBe(3);
+  });
+});
+
+describe("subtract", () => {
+  it("should subtract 1 from 2 and return 1", () => {
+    var result = subtract(2, 1);
+    expect(result).toBe(1);
+  });
+});
+
+describe("multiply", () => {
+  it("should multiply 1 by 2 and return 2", () => {
+    var result = multiply(1, 2);
+    expect(result).toBe(2);
+  });
+});
+
+describe("divide", () => {
+  it("should divide 2 by 1 and return 2", () => {
+    var result = divide(2, 1);
+    expect(result).toBe(2);
   });
 });