Merge branch 'master' into patch-1

Author: alesanchezr

exercises/19-And-One-and-a-Two-and-a-Three/app.js

@@ -6,3 +6,4 @@ let contact = {
 for(let key in contact){
     // Code goes here
 }
+

exercises/21.3-Filter-list/test.js

@@ -26,7 +26,7 @@ test('The output in the console should match the one in the instructions!', func
 
     //declare your function here
     function _filterByName(theArray, theString){
-      let filteredArray = theArray.filter(item => item.includes(theString))
+      let filteredArray = theArray.filter(item => item.toLowerCase().includes(theString.toLowerCase()))
       return filteredArray
     }
 

exercises/22-Matrix-Builder/README.md

@@ -11,9 +11,9 @@ This number represents the amount of rows and columns for the matrix. Example:
 This function should return an array of arrays that represents the matrix. Example: 3 should return:
 ```md
 [
-  [1, 1, 1],
-  [1, 1, 1],
-  [1, 1, 1]
+  [0, 1, 1],
+  [1, 0, 1],
+  [0, 0, 0]
 ]
 ```
 

exercises/22-Matrix-Builder/test.js

@@ -8,7 +8,7 @@ global.console.log = console.log = jest.fn((text) => _buffer += text + "\n");
 
 const app_content = fs.readFileSync(path.resolve(__dirname, './app.js'), 'utf8');
 
-test("You should create a function named matrixBuilder", function(){
+test("You should create a function named matrixBuilder.", function(){
   const file = rewire("./app.js");
   const myFunc = file.__get__('matrixBuilder');
   expect(myFunc).toBeTruthy();
@@ -19,25 +19,28 @@ test('You have to use the console.log function to print the correct output.', fu
     expect(console.log.mock.calls.length > 0).toBe(true);
 });
 
-test('The output in the console should match the one in the instructions!', function () {
-    const _app = rewire('./app.js');
-    
-    function matrixBuilder(matrix){
-      let newMatrix = [];
-      let newArray = [];
-      for (let x =0; x < matrix; x++){
-        newMatrix.push(newArray)
-      }
-      for (let i =0; i < matrix; i++){
-        newArray.push(1) 
-      }
-      return newMatrix
-    }
-    
-    let _test = matrixBuilder(5)
-    expect(_buffer).toMatch(_test.map(n => n).join(","));
-  });
-
-
+test('The matrix should have the ammount of rows and columns required as parameter.', function () {
+    const file = rewire("./app.js");
+    const myFunc = file.__get__('matrixBuilder');
 
+    let _test = myFunc(5);
+    expect(_test.length.toString()).toMatch("5");
+    expect(_test[0].length.toString()).toMatch("5");
+});
 
+test('The matrix should only have 0 or 1 as values.', function(){
+    const file = rewire("./app.js");
+    const myFunc = file.__get__('matrixBuilder');
+    let _test = myFunc(5);
+    let findCero = false;
+    let findOne = false;
+    _test.forEach(row => {
+        row.forEach(item => {
+            if(item == 0) findCero = true;
+            else if(item == 1) findOne = true;
+            else throw new Exception("The matrix contains other items rather than 0 and 1")
+        })
+    })
+    expect(findCero).toBe(true);
+    expect(findOne).toBe(true);
+});

exercises/25-Techno-beat/test.js

@@ -36,7 +36,7 @@ test('The output in the console should match the one in the instructions!', func
             }
           }
         }
-      return string
+      return string.trim()
     }
 
 
@@ -45,11 +45,11 @@ test('The output in the console should match the one in the instructions!', func
     let _test3 = _lyricsGenerator([0,0,0])
     let _test4 = _lyricsGenerator([1,0,1])
     let _test5 = _lyricsGenerator([1,1,1])
-    expect(console.log).toHaveBeenCalledWith(_test1);
-    expect(console.log).toHaveBeenCalledWith(_test2);
-    expect(console.log).toHaveBeenCalledWith(_test3);
-    expect(console.log).toHaveBeenCalledWith(_test4);
-    expect(console.log).toHaveBeenCalledWith(_test5);
+    expect(console.log.trim()).toHaveBeenCalledWith(_test1);
+    expect(console.log.trim()).toHaveBeenCalledWith(_test2);
+    expect(console.log.trim()).toHaveBeenCalledWith(_test3);
+    expect(console.log.trim()).toHaveBeenCalledWith(_test4);
+    expect(console.log.trim()).toHaveBeenCalledWith(_test5);
   });