Revert "Merge branch 'jest'"

This reverts commit f76e9e1.

Author: marvingay

.eslintignore

@@ -1,3 +1 @@
-.vscode
-node_modules/
-.DS_Store
+.vscode

.eslintrc.json

@@ -14,8 +14,6 @@ Before you start you should have a few things installed on your machine:
 
 Each exercise includes 3 files: a markdown file with a description of the task, an empty (or mostly empty) JavaScript file, and a set of tests. To complete an exercise, you'll need to go to the exercise directory with `cd exerciseName` in the terminal and run `jasmine exerciseName.spec.js`. This should run the test file and show you the output. When you first run a test, it will fail. This is by design! You must open the exercise file and write the code needed to get the test to pass. Some of the exercises have test conditions defined in their spec file that are defined as 'xit' compared to 'it'. This is purposeful. After you pass your first 'it', you will change the next 'xit' to an 'it' and test your code again. You'll do this until all conditions are satisfied.
 
-**Note**: Due to the way Jest handles failed tests, it may return an exit code of 1 if any tests fail. NPM will interpret this as an error and you may see some `npm ERR!` messages after Jest runs. You can ignore these, or run your test with `npm test exerciseName.spec.js --silent` to supress the errors.
-
 The first exercise, `helloWorld`, will walk you through the process in-depth.
 
 ## Solutions

.gitignore

@@ -1,6 +1,6 @@
-# Exercise 13 - Caesar cipher
+# Exercise XX - caesar cipher
 
-Implement the legendary Caesar cipher:
+Implement the legendary caesar cipher:
 
 > In cryptography, a Caesar cipher, also known as Caesar's cipher, the shift cipher, Caesar's code or Caesar shift, is one of the simplest and most widely known encryption techniques. It is a type of substitution cipher in which each letter in the plaintext is replaced by a letter some fixed number of positions down the alphabet. For example, with a left shift of 3, D would be replaced by A, E would become B, and so on. The method is named after Julius Caesar, who used it in his private correspondence.
 
@@ -31,3 +31,5 @@ negative numbers should work as well:
 ```javascript
 caesar('Mjqqt, Btwqi!', -5) // returns 'Hello, World!'
 ```
+
+

README.md

@@ -1,5 +1,5 @@
 const caesar = function() {
 
-};
+}
 
-module.exports = caesar;
+module.exports = caesar

caesar/README.md

@@ -1,8 +1,6 @@
-# Exercise 08 - Calculator
-
 The goal for this exercise is to create a calculator that does the following:
 
 add, subtract, get the sum, multiply, get the power, and find the factorial
 
-In order to do this please fill out each function with your solution. Make sure to return the value so you can test it in Jest! To see the expected value
-take a look at the spec file that houses the Jest test cases.
+In order to do this please fill out each function with your solution. Make sure to return the value so you can test it in Jasmine! To see the expected value
+take a look at the spec file that houses the Jasmine test cases.

caesar/caesar.js

@@ -1,32 +1,32 @@
-const add = function() {
+function add () {
 
-};
+}
 
-const subtract = function() {
+function subtract () {
 
-};
+}
 
-const sum = function() {
+function sum () {
 
-};
-
-const multiply = function() {
+}
 
-};;
+function multiply () {
+	
+}
 
-const power = function() {
+function power() {
 
-};
+}
 
-const factorial = function() {
+function factorial() {
 
-};
+}
 
 module.exports = {
   add,
   subtract,
   sum,
   multiply,
   power,
-  factorial
+  factorial,
 };

calculator/README.md

@@ -1,56 +1,56 @@
-const calculator = require('./calculator');
+const calculator = require ('./calculator.js');
 
 describe('add', function() {
 	it('adds 0 and 0', function() {
 		expect(calculator.add(0,0)).toEqual(0);
 	});
 
-	test.skip('adds 2 and 2', () => {
-		expect(calculator.add(2,2)).toBe(4);
+	xit('adds 2 and 2', function() {
+		expect(calculator.add(2,2)).toEqual(4);
 	});
 
-	test.skip('adds positive numbers', () => {
-		expect(calculator.add(2,6)).toBe(8);
+	xit('adds positive numbers', function() {
+		expect(calculator.add(2,6)).toEqual(8);
 	});
 });
 
-describe('subtract', () => {
-	test.skip('subtracts numbers', () => {
-		expect(calculator.subtract(10,4)).toBe(6);
+describe('subtract', function() {
+	xit('subtracts numbers', function() {
+		expect(calculator.subtract(10,4)).toEqual(6);
 	});
 });
 
-describe('sum', () => {
-	test.skip('computes the sum of an empty array', () => {
-		expect(calculator.sum([])).toBe(0);
+describe('sum', function() {
+	xit('computes the sum of an empty array', function() {
+		expect(calculator.sum([])).toEqual(0);
 	});
 
-	test.skip('computes the sum of an array of one number', () => {
-		expect(calculator.sum([7])).toBe(7);
+	xit('computes the sum of an array of one number', function() {
+		expect(calculator.sum([7])).toEqual(7);
 	});
 
-	test.skip('computes the sum of an array of two numbers', () => {
-		expect(calculator.sum([7,11])).toBe(18);
+	xit('computes the sum of an array of two numbers', function() {
+		expect(calculator.sum([7,11])).toEqual(18);
 	});
 
-	test.skip('computes the sum of an array of many numbers', () => {
-		expect(calculator.sum([1,3,5,7,9])).toBe(25);
+	xit('computes the sum of an array of many numbers', function() {
+		expect(calculator.sum([1,3,5,7,9])).toEqual(25);
 	});
 });
 
-describe('multiply', () => {
-	test.skip('multiplies two numbers', () => {
-		expect(calculator.multiply([2,4])).toBe(8);
+describe('multiply', function() {
+	xit('multiplies two numbers', function() {
+		expect(calculator.multiply([2,4])).toEqual(8);
 	});
 
-	test.skip('multiplies several numbers', () => {
-		expect(calculator.multiply([2,4,6,8,10,12,14])).toBe(645120);
+	xit('multiplies several numbers', function() {
+		expect(calculator.multiply([2,4,6,8,10,12,14])).toEqual(645120);
 	});
 });
 
-describe('power', () => {
-	test.skip('raises one number to the power of another number', () => {
-		expect(calculator.power(4,3)).toBe(64); // 4 to third power is 64
+describe('power', function() {
+	xit('raises one number to the power of another number', function() {
+		expect(calculator.power(4,3)).toEqual(64); // 4 to third power is 64
 	});
 });
 

calculator/calculator.js

@@ -1,8 +1,8 @@
-# Exercise 10 - Fibonacci
+# Exercise XX - fibonacci
 
-Create a function that returns a specific member of the Fibonacci sequence:
+Create a function that returns a specific member of the fibonacci sequence:
 
-> A series of numbers in which each number ( Fibonacci number ) is the sum of the two preceding numbers. The simplest is the series 1, 1, 2, 3, 5, 8, etc.
+> a series of numbers in which each number ( Fibonacci number ) is the sum of the two preceding numbers. The simplest is the series 1, 1, 2, 3, 5, 8, etc.
 
 ```javascript
 fibonacci(4) // returns the 4th member of the series: 3  (1, 1, 2, 3)

calculator/calculator.spec.js

@@ -1,3 +1,3 @@
 const fibonacci = function () {};
 
-};
+module.exports = fibonacci

fibonacci/README.md

@@ -1,8 +1,9 @@
-# Exercise 12 - Find the Oldest
+# Find the Oldest
 
-Given an array of objects representing people with a birth and death year, return the oldest person.
+given an array of objects representing people with a birth and death year, return the oldest person.
 
 ## Hints
 - You should return the whole person object, but the tests mostly just check to make sure the name is correct.
 - this can be done with a couple of chained array methods, or by using `reduce`.
 - One of the tests checks for people with no death-date.. use JavaScript's Date function to get their age as of today.
+

fibonacci/fibonacci.js

@@ -1,5 +1,3 @@
-const findTheOldest = function() {
-
-};
-
+let findTheOldest = function() {
+}
 module.exports = findTheOldest;

findTheOldest/README.md

@@ -1,5 +1,5 @@
 let <%= title %> = function() {
 
-};
+}
 
-module.exports = <%= title %>;
+module.exports = <%= title %>

findTheOldest/findTheOldest.js

@@ -1,7 +1,7 @@
 let <%= title %> = require('./<%=title%>')
 
 describe('<%=title%>', function() {
-  test('EDITME', function() {
+  it('EDITME', function() {
     expect(<%=title%>()).toEqual(' ');
   });
 

generator-exercise/generators/app/templates/title.js

@@ -1,4 +1,4 @@
-# Exercise 11 - Get the Titles!
+# Get the Titles!
 
 You are given an array of objects that represent books with an author and a title that looks like this:
 
@@ -15,7 +15,7 @@ const books = [
 ]
 ```
 
-Your job is to write a function that takes the array and returns an array of titles:
+your job is to write a function that takes the array and returns an array of titles:
 
 ```javascript
 getTheTitles(books) // ['Book','Book2']

generator-exercise/generators/app/templates/title.spec.js

@@ -1,5 +1,5 @@
 const getTheTitles = function() {
 
-};
+}
 
 module.exports = getTheTitles;

getTheTitles/README.md

@@ -12,7 +12,7 @@ describe('getTheTitles', function() {
       }
     ]
 
-  test('gets titles', () => {
+  it('gets titles', function() {
     expect(getTheTitles(books)).toEqual(['Book','Book2']);
   });
 });

getTheTitles/getTheTitles.js

@@ -1,4 +1,4 @@
-# Exercise 01 - Hello World
+# Exercise 01 - Hello World.
 
 The main purpose of this exercise is to walk you through the process of running the tests and make sure everything is set up and running correctly.
 
@@ -13,16 +13,16 @@ Let's look at the spec file first:
 const helloWorld = require('./helloWorld');
 
 describe('Hello World', function() {
-  test('says hello world', function() {
+  it('says hello world', function() {
     expect(helloWorld()).toEqual('Hello, World!');
   });
 });
 ```
 At the very top of the file we use `require()` to import the code from the javascript file (`helloWorld.js`) so that we can test it.
 
-The next block (`describe()`) is the body of the test.  Basically, all it's doing is running your code and testing to see if the output is correct.  The `test()` function describes what should be happening in plain english and then includes the `expect()` function.  For this simple example it should be pretty simple to read.
+The next block (`describe()`) is the body of the test.  Basically, all it's doing is running your code and testing to see if the output is correct.  The `it()` function describes what should be happening in plain english and then includes the `expect()` function.  For this simple example it should be pretty simple to read.
 
-For now you do not need to worry about how to write tests, but you should try to get comfortable enough with the syntax to figure out what the tests are asking you to do.  Go ahead and run the tests by entering `npm test helloWorld.spec.js` in the terminal and watch it fail.  The output from that command should tell you exactly what went wrong with your code.  In this case, running the `helloWorld()` function should return the phrase 'Hello, World!' but instead it returns an empty string...
+For now you do not need to worry about how to write tests, but you should try to get comfortable enough with the syntax to figure out what the tests are asking you to do.  Go ahead and run the tests by entering `jasmine helloWorld.spec.js` in the terminal and watch it fail.  The output from that command should tell you exactly what went wrong with your code.  In this case, running the `helloWorld()` function should return the phrase 'Hello, World!' but instead it returns an empty string...
 
 so let's look at the javascript file:
 ```javascript

getTheTitles/getTheTitles.spec.js

@@ -1,4 +1,4 @@
-# Exercise 06 - leapYears
+# Exercise XX - leapYears
 
 Create a function that determines whether or not a given year is a leap year. Leap years are determined by the following rules:
 

helloWorld/README.md

@@ -1,5 +1,5 @@
 const leapYears = function() {
 
-};
+}
 
-module.exports = leapYears;
+module.exports = leapYears