Update

sunjieming · sunjieming · commit e55ab2763fb8 · 2017-07-03T08:44:09.000-07:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -11,6 +11,11 @@
       "linebreak-style": 0,
       "consistent-return": 0,
       "no-useless-return": 0,
-      "no-return-assign": 0
+      "no-return-assign": 0,
+      "comma-dangle": 0,
+      "arrow-body-style": 0,
+      "max-len": 0,
+      "no-unused-vars": 0,
+      "no-useless-constructor": 0
     }
 }
diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@
 ## Instructions
 
 Fork and clone this repo.
-		
+
 	* Run the command `npm i` to install needed node packages.
 	* Run the command `npm test` to run the tests.
 	* Work through the files and make the tests pass.
-	* Suggested order: `es6.js`, `arrays.js`, `objects.js`, `this.js`, `closure.js`, and then `recursion.js`.
+	* Suggested order: `es6.js`, `arrays.js`, `objects.js`, `this.js`, `class.js`, `closure.js`, and then `recursion.js`.
 	* Submit a pull request when you are finished and we will review your code.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "LambdaSchool's JavaScript Mini-Bootcamp Homework 1",
   "main": "index.js",
   "scripts": {
-    "test": "eslint tests/*.js && eslint src/*.js && jest",
+    "test": "eslint tests/*.js && eslint src/*.js && jest --verbose",
     "test:watch": "npm test -- --watch"
   },
   "repository": {
diff --git a/src/arrays.js b/src/arrays.js
@@ -1,7 +1,6 @@
 // Complete the following functions.
 // These functions only need to work with arrays.
 
-/* eslint-disable no-unused-vars, max-len */
 
 const each = (elements, cb) => {
   // Iterates over a list of elements, yielding each in turn to the `cb` function.
@@ -44,5 +43,5 @@ module.exports = {
   reduce,
   find,
   filter,
-  flatten,
+  flatten
 };
diff --git a/src/class.js b/src/class.js
@@ -0,0 +1,26 @@
+// Create a class called User.
+// The constructor of the class should have a parameter called `options`.
+// `options` will be an object that will have the properties `email` and `password`.
+// Set the `email` and `password` properties on the class.
+// Add a method called `comparePasswords`.  `comparePasswords` should have a parameter
+// for a potential password that will be compared to the `password` property.
+// Return true if the potential password matches the `password` property.  Otherwise return false.
+
+
+/* eslint-disable no-undef */ // Remove this comment once you write your classes.
+
+
+// Create a class called `Animal` and a class called `Cat`.
+// `Cat` should extend the `Animal` class.
+// Animal and Cat should both have a parameter called `options` in their constructors.
+// Animal should have the property `age` that's set in the constructor and the method
+// `growOlder` that returns the age.
+// Cat should have the property `name` that is set in the constructor and the method
+// `meow` that should return the string `<name> meowed!` where `<name>` is the `name`
+// property set on the Cat instance.
+
+
+module.exports = {
+  User,
+  Cat
+};
diff --git a/src/closure.js b/src/closure.js
@@ -1,7 +1,5 @@
 // Complete the following functions.
 
-/* eslint-disable no-unused-vars */
-
 const counter = () => {
   // Return a function that when invoked increments and returns a counter variable.
   // Example: const newCounter = counter();
@@ -35,5 +33,5 @@ module.exports = {
   counter,
   counterFactory,
   cacheFunction,
-  limitFunctionCallCount,
+  limitFunctionCallCount
 };
diff --git a/src/objects.js b/src/objects.js
@@ -1,8 +1,6 @@
 // Complete the following underscore functions.
 // Reference http://underscorejs.org/ for examples.
 
-/* eslint-disable no-unused-vars */
-
 const keys = (obj) => {
   // Retrieve all the names of the object's properties.
   // Return the keys as strings in an array.
@@ -45,5 +43,5 @@ module.exports = {
   mapObject,
   pairs,
   invert,
-  defaults,
+  defaults
 };
diff --git a/src/recursion.js b/src/recursion.js
@@ -1,7 +1,5 @@
 // Complete the following functions.
 
-/* eslint-disable no-unused-vars */
-
 const nFibonacci = (n) => {
   // fibonacci sequence: 1 2 3 5 8 13 ...
   // return the nth number in the sequence
@@ -22,5 +20,5 @@ const checkMatchingLeaves = (obj) => {
 module.exports = {
   nFibonacci,
   nFactorial,
-  checkMatchingLeaves,
+  checkMatchingLeaves
 };
diff --git a/src/this.js b/src/this.js
@@ -2,8 +2,6 @@
 // There are no tests for this file.
 // To verify your code works you can run this file using `node this.js` while in the `/src` folder
 
-/* eslint-disable no-useless-constructor, no-unused-vars */
-
 class User {
   constructor(options) {
     // set a username and password property on the user object that is created
@@ -13,8 +11,6 @@ class User {
   // return `true` if they match, otherwise return `false`
 }
 
-/* eslint-enable no-useless-constructor */
-
 const me = new User({ username: 'LambdaSchool', password: 'correcthorsebatterystaple' });
 const result = me.checkPassword('correcthorsebatterystaple'); // should return `true`
 
@@ -25,7 +21,6 @@ const checkPassword = function comparePasswords(passwordToCompare) {
   // note that we use the `function` keyword and not `=>`
 };
 
-/* eslint-enable no-unused-vars */
 // invoke `checkPassword` on `me` by explicitly setting the `this` context
 // use .call, .apply, and .bind
 
diff --git a/tests/class.test.js b/tests/class.test.js
@@ -0,0 +1,58 @@
+const {
+  User,
+  Cat
+} = require('../src/class');
+
+/* eslint-disable no-undef */
+describe('classes', () => {
+  describe('User', () => {
+    it('should be a valid JS class', () => {
+      expect(typeof User).toBe('function');
+      expect(Array.isArray(new User({}))).toBe(false);
+      expect(typeof new User({})).toBe('object');
+    });
+
+    it('should set an email and password property from the provided options object', () => {
+      const user = new User({
+        email: 'ben@lambdaschool.com',
+        password: 'correcthorsebatterystaple'
+      });
+      expect(user.email).toBe('ben@lambdaschool.com');
+      expect(user.password).toBe('correcthorsebatterystaple');
+      expect(Object.keys(user).length).toBe(2);
+    });
+
+    it('should have a working comparePasswords method that returns a boolean value', () => {
+      const user = new User({
+        email: 'ben@lambdaschool.com',
+        password: 'correcthorsebatterystaple'
+      });
+
+      expect(typeof user.comparePasswords).toBe('function');
+      expect(user.comparePasswords('sup')).toBe(false);
+      expect(user.comparePasswords('correcthorsebatterystaple')).toBe(true);
+      expect(user.comparePasswords()).toBe(false);
+    });
+  });
+  describe('Cat', () => {
+    it('should have the properties name and age and the methods growOlder and meow', () => {
+      const snowball = new Cat({
+        name: 'Snowball II',
+        age: 5
+      });
+      expect(snowball).toHaveProperty('name');
+      expect(snowball).toHaveProperty('age');
+      expect(typeof snowball.growOlder).toBe('function');
+      expect(typeof snowball.meow).toBe('function');
+    });
+    it('should inherit properties and methods from Animal', () => {
+      const snowball = new Cat({
+        name: 'Snowball II',
+        age: 5
+      });
+      expect(Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(snowball), 'growOlder')).toBe(false);
+      expect(snowball.age).toBe(5);
+      expect(snowball.growOlder()).toBe(6);
+    });
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,11 @@`
`11`	`11`	`"linebreak-style": 0,`
`12`	`12`	`"consistent-return": 0,`
`13`	`13`	`"no-useless-return": 0,`
`14`		`- "no-return-assign": 0`
	`14`	`+ "no-return-assign": 0,`
	`15`	`+ "comma-dangle": 0,`
	`16`	`+ "arrow-body-style": 0,`
	`17`	`+ "max-len": 0,`
	`18`	`+ "no-unused-vars": 0,`
	`19`	`+ "no-useless-constructor": 0`
`15`	`20`	`}`
`16`	`21`	`}`