From 28bc5bb60784d3ecd1a7b0f8d01cd8f1e2fe7484 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Fri, 23 Jan 2015 19:41:09 -0500
Subject: [PATCH 01/34] checking to see if commit works

---
 tests.spec.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests.spec.js b/tests.spec.js
index deabffb..67410fc 100644
--- a/tests.spec.js
+++ b/tests.spec.js
@@ -8,3 +8,10 @@ try {
 } catch (e) {}
 
 // Do not change anything above this line
+
+define('Your code for stacks', function() {
+   it('defines a variable makeStack', function() {
+   	expect(function() { makeStack; }).to.not.throw(Error);
+   });
+   // Add more "it" sections below
+});
\ No newline at end of file

From 9d90ed4afce89aa60dfa01a16b49dcc9d6027ea7 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Fri, 23 Jan 2015 20:31:57 -0600
Subject: [PATCH 02/34] Added describe and expect

---
 tests.spec.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests.spec.js b/tests.spec.js
index 67410fc..bd62dd7 100644
--- a/tests.spec.js
+++ b/tests.spec.js
@@ -9,9 +9,11 @@ try {
 
 // Do not change anything above this line
 
-define('Your code for stacks', function() {
+describe('Your code for stacks', function() {
    it('defines a variable makeStack', function() {
    	expect(function() { makeStack; }).to.not.throw(Error);
    });
    // Add more "it" sections below
-});
\ No newline at end of file
+});
+
+console.log("yo")
\ No newline at end of file

From 91309f98c4679278af59087e53de5acbd5636621 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 14:17:18 -0600
Subject: [PATCH 03/34] Added test for makeStack existing

---
 yourCode.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yourCode.js b/yourCode.js
index 1499c23..29c8a40 100644
--- a/yourCode.js
+++ b/yourCode.js
@@ -3,10 +3,10 @@
  * Name 2: YourNameHere
  */
 // All your code will go here
-var makeStack = function() {
+//var makeStack = function() {
 
 
-};
+//};
 
 
 // Do NOT change anything below this line.

From 3409334584f2b9d627be8c29eea1a4fcd5726926 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 14:21:44 -0600
Subject: [PATCH 04/34] Declare makeStack. Close #3

---
 yourCode.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yourCode.js b/yourCode.js
index 29c8a40..1499c23 100644
--- a/yourCode.js
+++ b/yourCode.js
@@ -3,10 +3,10 @@
  * Name 2: YourNameHere
  */
 // All your code will go here
-//var makeStack = function() {
+var makeStack = function() {
 
 
-//};
+};
 
 
 // Do NOT change anything below this line.

From 44cf651dfd4ab0578fcfcf6b237a58a4dffc4cf9 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 14:29:32 -0600
Subject: [PATCH 05/34] issue #3 commit

---
 tests.spec.js | 5 ++++-
 yourCode.js   | 5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests.spec.js b/tests.spec.js
index bd62dd7..f751f3c 100644
--- a/tests.spec.js
+++ b/tests.spec.js
@@ -11,9 +11,12 @@ try {
 
 describe('Your code for stacks', function() {
    it('defines a variable makeStack', function() {
-   	expect(function() { makeStack; }).to.not.throw(Error);
+      expect(function() { makeStack; }).to.not.throw(Error);
    });
    // Add more "it" sections below
+   it('actually defines a function makeStack', function() {
+    expect(makeStack).to.be.a('function');
+});
 });
 
 console.log("yo")
\ No newline at end of file
diff --git a/yourCode.js b/yourCode.js
index 1499c23..dc24e40 100644
--- a/yourCode.js
+++ b/yourCode.js
@@ -3,10 +3,7 @@
  * Name 2: YourNameHere
  */
 // All your code will go here
-var makeStack = function() {
-
-
-};
+var makeStack;
 
 
 // Do NOT change anything below this line.

From dc4bb687acb89b7b4a2d42f468b92bf404074e1b Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 14:30:59 -0600
Subject: [PATCH 06/34] issue #3 makeStack is a function

---
 yourCode.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/yourCode.js b/yourCode.js
index dc24e40..1499c23 100644
--- a/yourCode.js
+++ b/yourCode.js
@@ -3,7 +3,10 @@
  * Name 2: YourNameHere
  */
 // All your code will go here
-var makeStack;
+var makeStack = function() {
+
+
+};
 
 
 // Do NOT change anything below this line.

From 8e82eff18004cd25efd5d14cc6bf1c4986ef0828 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 14:34:33 -0600
Subject: [PATCH 07/34] issue #6 fails to return object

---
 tests.spec.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests.spec.js b/tests.spec.js
index f751f3c..ba8c638 100644
--- a/tests.spec.js
+++ b/tests.spec.js
@@ -17,6 +17,13 @@ describe('Your code for stacks', function() {
    it('actually defines a function makeStack', function() {
     expect(makeStack).to.be.a('function');
 });
+
+describe('Your makeStack function', function() {
+   var stack = makeStack();
+   it('returns an object', function() {
+    expect(stack).to.be.a('object');
+});
+});
 });
 
 console.log("yo")
\ No newline at end of file

From c5794acddc04235d59e5fadebbe4e4e8addf9f3c Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 14:35:50 -0600
Subject: [PATCH 08/34] issue #6 returns an object

---
 yourCode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yourCode.js b/yourCode.js
index 1499c23..d46ed28 100644
--- a/yourCode.js
+++ b/yourCode.js
@@ -5,7 +5,7 @@
 // All your code will go here
 var makeStack = function() {
 
-
+	return {};
 };
 
 

From d5a5e98f06572ce640d6d969ea6fdf700d589622 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 14:38:16 -0600
Subject: [PATCH 09/34] issue #6 does not return 3 keys

---
 tests.spec.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests.spec.js b/tests.spec.js
index ba8c638..8c5d74e 100644
--- a/tests.spec.js
+++ b/tests.spec.js
@@ -22,6 +22,11 @@ describe('Your makeStack function', function() {
    var stack = makeStack();
    it('returns an object', function() {
     expect(stack).to.be.a('object');
+});
+   it('returns an object with methods push, pop and isEmpty', function() {
+    ['push', 'pop', 'isEmpty'].forEach(function(key) {
+        expect(stack[key]).to.be.a('function');
+    });
 });
 });
 });

From ce099b54904a65f5d46d6082d4449879be5b173c Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 14:44:40 -0600
Subject: [PATCH 10/34] issue #6 makestack returns 3 keys

---
 yourCode.js | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/yourCode.js b/yourCode.js
index d46ed28..cbe5660 100644
--- a/yourCode.js
+++ b/yourCode.js
@@ -1,12 +1,32 @@
 /*
- * Name 1: YourNameHere
- * Name 2: YourNameHere
+ * Name 1: Edwin
+ * Name 2: Dakota
  */
 // All your code will go here
-var makeStack = function() {
 
-	return {};
-};
+
+function makeStack() {
+    var values = [];
+    function push(el) {
+        values.push(el);
+        return stack;
+    };
+    function pop() {
+        if (isEmpty()) {
+            throw new Error("Attempt to pop from empty stack");
+        } else {
+            return values.pop();
+        }
+    };
+    function isEmpty() {
+        return values.length === 0;
+    };
+    return {
+        push: push,
+        pop: pop,
+        isEmpty: isEmpty
+    };
+}
 
 
 // Do NOT change anything below this line.

From 94f6335b7c256f502f7bfc6e54cbbbc360784a0f Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 15:06:47 -0600
Subject: [PATCH 11/34] issue #8 code not reaching second describe

---
 tests.spec.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/tests.spec.js b/tests.spec.js
index 8c5d74e..5814634 100644
--- a/tests.spec.js
+++ b/tests.spec.js
@@ -16,19 +16,38 @@ describe('Your code for stacks', function() {
    // Add more "it" sections below
    it('actually defines a function makeStack', function() {
     expect(makeStack).to.be.a('function');
+   });
 });
 
 describe('Your makeStack function', function() {
    var stack = makeStack();
    it('returns an object', function() {
     expect(stack).to.be.a('object');
-});
+   });
    it('returns an object with methods push, pop and isEmpty', function() {
     ['push', 'pop', 'isEmpty'].forEach(function(key) {
         expect(stack[key]).to.be.a('function');
     });
+   });
 });
+
+
+
+/*
+
+
+
+describe('Your makeStack function', function() {
+   var stack = makeStack();
+   it('returns an object', function() {
+    expect(stack).to.be.a('object');
+   });
+   it('returns an object with methods push, pop and isEmpty', function() {
+    ['push', 'pop', 'isEmpty'].forEach(function(key) {
+        expect(stack[key]).to.be.a('function');
+    });
+   });
+
 });
 });
-
-console.log("yo")
\ No newline at end of file
+*/
\ No newline at end of file

From 626bc2b3dc1fc85d62438b6dcba92d26ea7e3f02 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 15:16:00 -0600
Subject: [PATCH 12/34] isEmpty fails tests

---
 tests.spec.js | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/tests.spec.js b/tests.spec.js
index 5814634..fb602d3 100644
--- a/tests.spec.js
+++ b/tests.spec.js
@@ -31,23 +31,17 @@ describe('Your makeStack function', function() {
    });
 });
 
-
-
-/*
-
-
-
-describe('Your makeStack function', function() {
-   var stack = makeStack();
-   it('returns an object', function() {
-    expect(stack).to.be.a('object');
-   });
-   it('returns an object with methods push, pop and isEmpty', function() {
-    ['push', 'pop', 'isEmpty'].forEach(function(key) {
-        expect(stack[key]).to.be.a('function');
+describe('Stack methods:', function() {
+    var stack;
+    beforeEach(function() {
+        // This ensures every test sees a fresh empty stack
+        stack = makeStack();
     });
-   });
-
-});
-});
-*/
\ No newline at end of file
+    it('isEmpty returns true for a new stack', function() {
+        expect(stack.isEmpty()).to.equal(true);
+    });
+    it('isEmpty returns false if an element is pushed', function() {
+        stack.push(2);
+        expect(stack.isEmpty()).to.equal(false);
+    });
+});
\ No newline at end of file

From 25c60831820307324d8631e6c942ee1939686f69 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 15:20:12 -0600
Subject: [PATCH 13/34] new tests fail

---
 tests.spec.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests.spec.js b/tests.spec.js
index fb602d3..cb5f8f9 100644
--- a/tests.spec.js
+++ b/tests.spec.js
@@ -44,4 +44,28 @@ describe('Stack methods:', function() {
         stack.push(2);
         expect(stack.isEmpty()).to.equal(false);
     });
+    it('push returns the stack object', function() {
+    expect(stack.push()).to.equal(stack);
+   });
+   it('pop should error on empty stack', function() {
+      expect(function() { stack.pop(); }).to.throw(Error);
+   });
+   it('pop should not error on nonempty stack', function() {
+      stack.push(2);
+      expect(function() { stack.pop(); }).to.not.throw(Error);
+   });
+   it('a pop following a push should return the pushed element', function() {
+    // we generate a random number to use as element.
+      var v = Math.random();
+      stack.push(v);
+      expect(stack.pop()).to.equal(v);
+   });
+   it('consecutive pops return elements in reverse order to the pushes', function() {
+      var v1 = Math.random(), v2 = Math.random();
+      stack.push(v1);
+      stack.push(v2);
+      expect(stack.pop()).to.equal(v2);
+      expect(stack.pop()).to.equal(v1);
+});
+
 });
\ No newline at end of file

From ddb44a54d76ad09584a9a51bbe9989444850b953 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 15:23:41 -0600
Subject: [PATCH 14/34] all tests pass for stack

---
 yourCode.js | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/yourCode.js b/yourCode.js
index cbe5660..6bda9b8 100644
--- a/yourCode.js
+++ b/yourCode.js
@@ -4,28 +4,25 @@
  */
 // All your code will go here
 
-
 function makeStack() {
     var values = [];
-    function push(el) {
-        values.push(el);
-        return stack;
-    };
-    function pop() {
-        if (isEmpty()) {
-            throw new Error("Attempt to pop from empty stack");
-        } else {
-            return values.pop();
+    var stack = {
+        push: function push(el) {
+            values.push(el);
+            return stack;
+        },
+        pop: function pop() {
+            if (stack.isEmpty()) {
+                throw new Error("Attempt to pop from empty stack");
+            } else {
+                return values.pop();
+            }
+        },
+        isEmpty: function isEmpty() {
+            return values.length === 0;
         }
     };
-    function isEmpty() {
-        return values.length === 0;
-    };
-    return {
-        push: push,
-        pop: pop,
-        isEmpty: isEmpty
-    };
+    return stack;
 }
 
 

From fcb18ad0880807dc04643b0c667df89cf8377a39 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <dakotaraymccoy@gmail.com>
Date: Sat, 24 Jan 2015 15:24:47 -0600
Subject: [PATCH 15/34] massive stree test got its ass kicked

---
 tests.spec.js | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/tests.spec.js b/tests.spec.js
index cb5f8f9..37d4c7c 100644
--- a/tests.spec.js
+++ b/tests.spec.js
@@ -66,6 +66,27 @@ describe('Stack methods:', function() {
       stack.push(v2);
       expect(stack.pop()).to.equal(v2);
       expect(stack.pop()).to.equal(v1);
-});
-
+   });
+   it('a randomized set of pushes and pops should behave properly', function() {
+      var iters = 10, steps = 200, iter, step;
+      var noItems, randomNum;
+      for (iter = 0; iter < 10; iter += 1) {
+         stack = makeStack();
+         randomNum = Math.random();
+         noItems = 0;
+         for (step = 0; step < 200; step += 1) {
+            if (Math.random() > 0.5) { // 50-50 do a push
+               noItems += 1;
+               stack.push(noItems + randomNum);
+            } else { // or do a pop
+               if (noItems === 0) {
+                  expect(function() { stack.pop(); }).to.throw(Error);
+               } else {
+                  expect(stack.pop()).to.equal(noItems + randomNum);
+                  noItems -= 1;
+               }
+            }
+         }
+      }
+   });
 });
\ No newline at end of file

From de884b1e1fb0d4756dba034f3c3850bb2e16a547 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Sat, 24 Jan 2015 15:39:59 -0500
Subject: [PATCH 16/34] makeMap tests

---
 map/map.spec.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/map/map.spec.js b/map/map.spec.js
index a1bb0a3..b35dc87 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -19,3 +19,12 @@ function randomString(len) {
 // DO NOT CHANGE ANYTHING ABOVE THIS LINE
 
 // Add your tests below
+
+decribe('Your code for Map Structure', function(){
+   it('defines a variable makeMap', function(){
+      expect(function() makeMap;}).to.not.throw(Error);
+   });
+   it('actually defines a function', function(){
+      expect(makeMap.to.be.a('function');
+   });
+});

From f4e9b6690d0747cde0bcde3b5abcbb1c3407e492 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Sat, 24 Jan 2015 16:11:52 -0500
Subject: [PATCH 17/34] typo fixed for map implementation test

---
 map/map.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index b35dc87..dc80027 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -22,9 +22,9 @@ function randomString(len) {
 
 decribe('Your code for Map Structure', function(){
    it('defines a variable makeMap', function(){
-      expect(function() makeMap;}).to.not.throw(Error);
+      expect(function() { makeMap; }).to.not.throw(Error);
    });
    it('actually defines a function', function(){
-      expect(makeMap.to.be.a('function');
+      expect(makeMap).to.be.a('function');
    });
 });

From 9fdcd60bb923dda719641b3d61c322a8cf0571e4 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Sat, 24 Jan 2015 16:19:47 -0500
Subject: [PATCH 18/34] makeMap test for empty map unpon new creation

---
 map/map.spec.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/map/map.spec.js b/map/map.spec.js
index dc80027..c0506d2 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -27,4 +27,7 @@ decribe('Your code for Map Structure', function(){
    it('actually defines a function', function(){
       expect(makeMap).to.be.a('function');
    });
+   it('makeMap is empty upon creation', function(){
+      expect(makeMap.isEmpty).to.be.equal(true);
+   });
 });

From f60d2bad4d62e71776526ec02fc728f7c39cf9cf Mon Sep 17 00:00:00 2001
From: Dakota McCoy <mccoyd15@hanover.edu>
Date: Sun, 25 Jan 2015 17:49:17 -0500
Subject: [PATCH 19/34] most tests written.

---
 map/map.spec.js | 58 ++++++++++++++++++++++++++++++++++++++++++++-----
 map/mapCode.js  |  2 +-
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index c0506d2..13f9d0d 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -20,14 +20,62 @@ function randomString(len) {
 
 // Add your tests below
 
-decribe('Your code for Map Structure', function(){
+describe('Your code for Map Structure', function(){
+   var k1,v1,k2,v2,map;
+    beforeEach(function() {
+        map = makeMap();
+         k1 = randomString();
+         k2 = randomString();
+         v1 = Math.random();
+         v2 = Math.random();
+    });
    it('defines a variable makeMap', function(){
-      expect(function() { makeMap; }).to.not.throw(Error);
+      expect(function() { map; }).to.not.throw(Error);
    });
    it('actually defines a function', function(){
-      expect(makeMap).to.be.a('function');
+      expect(map).to.be.a('function');
    });
-   it('makeMap is empty upon creation', function(){
-      expect(makeMap.isEmpty).to.be.equal(true);
+   it('map is empty upon creation & has returns false', function(){
+      expect(map.isEmpty).to.be.equal(true);
+      expect(map.has).to.be.equal('false');
+   });
+   it('returns an object with methods has, lookup, add, update, remove', function() {
+    ['has', 'lookup', 'add', 'update', 'remove'].forEach(function(key) {
+        expect(map[key]).to.be.a('function');
+    });
+   });
+   it('has function returns bool', function() {
+      expect(map.has).to.be.a('bool');
+   });
+   it('add returns the map & has returns true', function(){
+      expect(map.add(k1,v1)).to.equal(map);
+      expect(map.has(k1)).to.be.equal(true);
+   });
+   it('lookup returns value, ', function(){
+      map.add(k1,v1);
+      expect(map.lookup(k1)).to.be.equal(v1);
+      expect(function(){
+         map.lookup(k2);
+      }).to.throw(Error);
+   });
+   it('lookup throws error for missing key', function(){
+      map.add(k1,v1);
+      expect(function(){
+         map.lookup(k2);
+      }).to.throw(Error);
+   });
+   it('lookup throws error for missing key & has returns false after remove', function(){
+      map.add(k1,v1);
+      map.add(k2,v2);
+      map.remove(k2);
+      expect(map.has(k2)).to.equal(false);
+      expect(function(){
+         map.lookup(k2);
+      }).to.throw(Error);
+   });
+   it('remove throws error when given key does not exist', function(){
+      expect(function(){
+         map.remove(k1);
+      }).to.throw(Error);
    });
 });
diff --git a/map/mapCode.js b/map/mapCode.js
index e0867e9..0222a70 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -7,7 +7,7 @@
 var makeMap = function() {
 // All your code will go inside this function
    // This object should contain the methods you want to expose:
-   var o;
+   var o = {};
    // Use this object to store the key-value pairs:
    var storedPairs;
 

From 7960db18f02f83724301f1e42cf82affdf5a4d51 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <mccoyd15@hanover.edu>
Date: Sun, 25 Jan 2015 17:59:49 -0500
Subject: [PATCH 20/34] describes seperated

---
 map/map.spec.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index 13f9d0d..07e92c3 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -19,8 +19,16 @@ function randomString(len) {
 // DO NOT CHANGE ANYTHING ABOVE THIS LINE
 
 // Add your tests below
+describe('makeMap structure', function(){
+   it('defines a variable makeMap', function(){
+      expect(function() { makeMap; }).to.not.throw(Error);
+   });
+   it('actually defines a function', function(){
+      expect(makeMap).to.be.a('function');
+   });
+});
 
-describe('Your code for Map Structure', function(){
+describe('Your code for makeMap methods', function(){
    var k1,v1,k2,v2,map;
     beforeEach(function() {
         map = makeMap();
@@ -29,12 +37,7 @@ describe('Your code for Map Structure', function(){
          v1 = Math.random();
          v2 = Math.random();
     });
-   it('defines a variable makeMap', function(){
-      expect(function() { map; }).to.not.throw(Error);
-   });
-   it('actually defines a function', function(){
-      expect(map).to.be.a('function');
-   });
+
    it('map is empty upon creation & has returns false', function(){
       expect(map.isEmpty).to.be.equal(true);
       expect(map.has).to.be.equal('false');

From f86274dca550354118f24af4d7477d66a7874c05 Mon Sep 17 00:00:00 2001
From: Dakota McCoy <mccoyd15@hanover.edu>
Date: Sun, 25 Jan 2015 18:22:35 -0500
Subject: [PATCH 21/34] has function

---
 map/map.spec.js |  6 +++---
 map/mapCode.js  | 23 +++++++++++++++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index 07e92c3..0e40ff8 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -39,8 +39,8 @@ describe('Your code for makeMap methods', function(){
     });
 
    it('map is empty upon creation & has returns false', function(){
-      expect(map.isEmpty).to.be.equal(true);
-      expect(map.has).to.be.equal('false');
+      expect(map.length).to.be.equal(0);
+      expect(map.has()).to.be.equal(false);
    });
    it('returns an object with methods has, lookup, add, update, remove', function() {
     ['has', 'lookup', 'add', 'update', 'remove'].forEach(function(key) {
@@ -48,7 +48,7 @@ describe('Your code for makeMap methods', function(){
     });
    });
    it('has function returns bool', function() {
-      expect(map.has).to.be.a('bool');
+      expect(map.has()).to.be.a('boolean');
    });
    it('add returns the map & has returns true', function(){
       expect(map.add(k1,v1)).to.equal(map);
diff --git a/map/mapCode.js b/map/mapCode.js
index 0222a70..82419a7 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -7,9 +7,28 @@
 var makeMap = function() {
 // All your code will go inside this function
    // This object should contain the methods you want to expose:
-   var o = {};
+   var o = {
+      has : function has(key){
+         if (key in storedPairs) {
+            return true;
+         } 
+         return false;
+      },
+      lookup : function lookup(key){
+
+      },
+      add : function add(key,value){
+
+      },
+      update : function update(key,value){
+
+      },
+      remove : function remove(key){
+
+      }
+   };
    // Use this object to store the key-value pairs:
-   var storedPairs;
+   var storedPairs = {};
 
    // Add initialization code here
 

From 6110bc26943990ad514d675d9261937e3f7f8399 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Sun, 25 Jan 2015 20:17:13 -0500
Subject: [PATCH 22/34] Object methods fully implemented with working tests

---
 map/map.spec.js | 12 +++++++++++-
 map/mapCode.js  | 31 +++++++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index 0e40ff8..2f5d7c7 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -39,7 +39,7 @@ describe('Your code for makeMap methods', function(){
     });
 
    it('map is empty upon creation & has returns false', function(){
-      expect(map.length).to.be.equal(0);
+      expect(map.isEmpty).to.be.equal(true);
       expect(map.has()).to.be.equal(false);
    });
    it('returns an object with methods has, lookup, add, update, remove', function() {
@@ -81,4 +81,14 @@ describe('Your code for makeMap methods', function(){
          map.remove(k1);
       }).to.throw(Error);
    });
+   it('update throws error if key is missing', function(){
+      expect(function(){
+         map.update(v1);
+      }).to.throw(Error);
+   });
+   it('update changes value of key', function(){
+      map.add(k1,v1);
+      map.update(k1,v2);
+      expect(map.lookup(k1)).to.equal(v2);
+   });
 });
diff --git a/map/mapCode.js b/map/mapCode.js
index 82419a7..e1cb7c9 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -15,16 +15,30 @@ var makeMap = function() {
          return false;
       },
       lookup : function lookup(key){
-
+         if(key in storedPairs){
+            return storedPairs[key];
+         } else {
+            throw new Error("Invalid Key");
+         }
       },
       add : function add(key,value){
-
+         storedPairs[key] = value;
+         return o;
       },
       update : function update(key,value){
-
+         if(key in storedPairs){
+            storedPairs[key] = value;
+         } else {
+            throw new Error("Invalid Key");
+         }
+         return o;
       },
       remove : function remove(key){
-
+         if(key in storedPairs){
+            storedPairs.delete(key);
+         } else {
+            throw new Error("Invalid Delete Attempted. Key not in Map")
+         }
       }
    };
    // Use this object to store the key-value pairs:
@@ -33,6 +47,15 @@ var makeMap = function() {
    // Add initialization code here
 
    // Add local functions here
+   var isEmpty;
+   isEmpty = function(makeMap){
+      for (var key in makeMap){
+         if(makeMap.hasOwnProperty(key)){
+            return false;
+         }
+      }
+      return true;
+   };
 
    // Prepare the object o before returning it
 

From 5c338d14f642124107a9805ff4f168ced98dc07c Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Sun, 25 Jan 2015 20:21:39 -0500
Subject: [PATCH 23/34] Object methods fully implemented with slight changes.
 Tests still pass with a few exceptions

---
 map/mapCode.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/map/mapCode.js b/map/mapCode.js
index e1cb7c9..a67b4cf 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -9,13 +9,13 @@ var makeMap = function() {
    // This object should contain the methods you want to expose:
    var o = {
       has : function has(key){
-         if (key in storedPairs) {
+         if (storedPairs.hasOwnProperty(key)) {
             return true;
          } 
          return false;
       },
       lookup : function lookup(key){
-         if(key in storedPairs){
+         if(storedPairs.hasOwnProperty(key)){
             return storedPairs[key];
          } else {
             throw new Error("Invalid Key");
@@ -26,7 +26,7 @@ var makeMap = function() {
          return o;
       },
       update : function update(key,value){
-         if(key in storedPairs){
+         if(storedPairs.hasOwnProperty(key)){
             storedPairs[key] = value;
          } else {
             throw new Error("Invalid Key");
@@ -34,7 +34,7 @@ var makeMap = function() {
          return o;
       },
       remove : function remove(key){
-         if(key in storedPairs){
+         if(storedPairs.hasOwnProperty(key)){
             storedPairs.delete(key);
          } else {
             throw new Error("Invalid Delete Attempted. Key not in Map")

From cc92b84f1a8ce2b49b1b92c8b1463194d46b8d22 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Sun, 25 Jan 2015 20:26:56 -0500
Subject: [PATCH 24/34] Added our names to document

---
 map/mapCode.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/map/mapCode.js b/map/mapCode.js
index a67b4cf..e78847d 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -1,6 +1,6 @@
 /*
- * Name 1: YourNameHere
- * Name 2: YourNameHere
+ * Name 1: Edwin Nartey
+ * Name 2: Dakota McCoy
  */
 
 // Do not change the name of this function

From 19c853c1196c21ee46f0971ed3812d849e26c339 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Sun, 25 Jan 2015 20:30:31 -0500
Subject: [PATCH 25/34] corrected error messages

---
 map/mapCode.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/map/mapCode.js b/map/mapCode.js
index e78847d..3b9811e 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -18,7 +18,7 @@ var makeMap = function() {
          if(storedPairs.hasOwnProperty(key)){
             return storedPairs[key];
          } else {
-            throw new Error("Invalid Key");
+            throw new Error("Invalid Lookup: " + key +" not in Map");
          }
       },
       add : function add(key,value){
@@ -29,7 +29,7 @@ var makeMap = function() {
          if(storedPairs.hasOwnProperty(key)){
             storedPairs[key] = value;
          } else {
-            throw new Error("Invalid Key");
+            throw new Error("Invalid Update: "+ key + "not in Map");
          }
          return o;
       },
@@ -37,7 +37,7 @@ var makeMap = function() {
          if(storedPairs.hasOwnProperty(key)){
             storedPairs.delete(key);
          } else {
-            throw new Error("Invalid Delete Attempted. Key not in Map")
+            throw new Error("Invalid Delete Attempted." + key + " not in Map" );
          }
       }
    };

From f9fc78c4945e973a066677604f1f3e53223cbecf Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Sun, 25 Jan 2015 22:03:21 -0500
Subject: [PATCH 26/34] fixed minor bugs

---
 map/map.spec.js | 6 ++++++
 map/mapCode.js  | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/map/map.spec.js b/map/map.spec.js
index 2f5d7c7..bddd494 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -54,6 +54,12 @@ describe('Your code for makeMap methods', function(){
       expect(map.add(k1,v1)).to.equal(map);
       expect(map.has(k1)).to.be.equal(true);
    });
+   it('add returns error when key already exists in the map', function(){
+      map.add(k1,v1);
+      expect(function(){
+         map.add(k1,v1);
+      }).to.throw(Error);
+   });
    it('lookup returns value, ', function(){
       map.add(k1,v1);
       expect(map.lookup(k1)).to.be.equal(v1);
diff --git a/map/mapCode.js b/map/mapCode.js
index 3b9811e..66513fb 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -22,8 +22,12 @@ var makeMap = function() {
          }
       },
       add : function add(key,value){
+         if(o.has(key)){
+            throw new Error("Map already contains" + key)
+         } else {
          storedPairs[key] = value;
          return o;
+      }
       },
       update : function update(key,value){
          if(storedPairs.hasOwnProperty(key)){
@@ -41,6 +45,7 @@ var makeMap = function() {
          }
       }
    };
+
    // Use this object to store the key-value pairs:
    var storedPairs = {};
 

From a1e82f3435426ea3e86962642244612ce68228b2 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Mon, 26 Jan 2015 02:07:26 -0500
Subject: [PATCH 27/34] fixed bugs in remove method

---
 map/mapCode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/map/mapCode.js b/map/mapCode.js
index 66513fb..a3d933e 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -39,7 +39,7 @@ var makeMap = function() {
       },
       remove : function remove(key){
          if(storedPairs.hasOwnProperty(key)){
-            storedPairs.delete(key);
+            delete storedPairs[key];
          } else {
             throw new Error("Invalid Delete Attempted." + key + " not in Map" );
          }

From 0717905c85375e5c10d3602205c74fc1694b21d5 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Mon, 26 Jan 2015 02:39:20 -0500
Subject: [PATCH 28/34] working around isEmpty fix

---
 map/map.spec.js | 10 +++++-----
 map/mapCode.js  | 17 +++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index bddd494..f3d72d1 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -26,6 +26,11 @@ describe('makeMap structure', function(){
    it('actually defines a function', function(){
       expect(makeMap).to.be.a('function');
    });
+   it('map is empty upon creation & has returns false', function(){
+      //expect(Object.keys(makeMap.storedPairs).length).to.be.equal(0);
+      expect(makeMap.storedPairs.hasOwnProperty(key)).to.be.equal(false);
+      expect(map.has()).to.be.equal(false);
+   });
 });
 
 describe('Your code for makeMap methods', function(){
@@ -37,11 +42,6 @@ describe('Your code for makeMap methods', function(){
          v1 = Math.random();
          v2 = Math.random();
     });
-
-   it('map is empty upon creation & has returns false', function(){
-      expect(map.isEmpty).to.be.equal(true);
-      expect(map.has()).to.be.equal(false);
-   });
    it('returns an object with methods has, lookup, add, update, remove', function() {
     ['has', 'lookup', 'add', 'update', 'remove'].forEach(function(key) {
         expect(map[key]).to.be.a('function');
diff --git a/map/mapCode.js b/map/mapCode.js
index a3d933e..c7fdbe2 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -52,16 +52,13 @@ var makeMap = function() {
    // Add initialization code here
 
    // Add local functions here
-   var isEmpty;
-   isEmpty = function(makeMap){
-      for (var key in makeMap){
-         if(makeMap.hasOwnProperty(key)){
-            return false;
-         }
-      }
-      return true;
-   };
-
+  /* function isEmpty(storedPairs){
+      if(Object.keys(storedPairs).length == 0){
+         return true;
+      } else {
+         return false;
+      };
+*/
    // Prepare the object o before returning it
 
    return o;

From ed37516b228f2a6da3947a3a1400ed87f7313787 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Mon, 26 Jan 2015 10:16:59 -0500
Subject: [PATCH 29/34] still working on fixing empty map check

---
 map/map.spec.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index f3d72d1..e1cd6f7 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -27,8 +27,7 @@ describe('makeMap structure', function(){
       expect(makeMap).to.be.a('function');
    });
    it('map is empty upon creation & has returns false', function(){
-      //expect(Object.keys(makeMap.storedPairs).length).to.be.equal(0);
-      expect(makeMap.storedPairs.hasOwnProperty(key)).to.be.equal(false);
+      expect(Object.keys(makeMap.storedPairs).length).to.be.equal(0);
       expect(map.has()).to.be.equal(false);
    });
 });

From 6c36e9ad48f51428afacecc982fa8d97f7b10323 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Mon, 26 Jan 2015 10:21:31 -0500
Subject: [PATCH 30/34] still working on fixing empty map check #2

---
 map/map.spec.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index e1cd6f7..bcdf84a 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -26,10 +26,7 @@ describe('makeMap structure', function(){
    it('actually defines a function', function(){
       expect(makeMap).to.be.a('function');
    });
-   it('map is empty upon creation & has returns false', function(){
-      expect(Object.keys(makeMap.storedPairs).length).to.be.equal(0);
-      expect(map.has()).to.be.equal(false);
-   });
+  
 });
 
 describe('Your code for makeMap methods', function(){
@@ -41,6 +38,10 @@ describe('Your code for makeMap methods', function(){
          v1 = Math.random();
          v2 = Math.random();
     });
+     it('map is empty upon creation & has returns false', function(){
+      //expect(Object.keys(makeMap).length).to.be.equal(0);
+      expect(map.has()).to.be.equal(false);
+   });
    it('returns an object with methods has, lookup, add, update, remove', function() {
     ['has', 'lookup', 'add', 'update', 'remove'].forEach(function(key) {
         expect(map[key]).to.be.a('function');

From c3616d4cb212c13c679808222c1a74b915f4db86 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Mon, 26 Jan 2015 10:26:25 -0500
Subject: [PATCH 31/34] still working on fixing empty map check #2

---
 map/map.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index bcdf84a..e547651 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -39,7 +39,7 @@ describe('Your code for makeMap methods', function(){
          v2 = Math.random();
     });
      it('map is empty upon creation & has returns false', function(){
-      //expect(Object.keys(makeMap).length).to.be.equal(0);
+      //expect(Object.keys(map.storedPairs).length).to.be.equal(0);
       expect(map.has()).to.be.equal(false);
    });
    it('returns an object with methods has, lookup, add, update, remove', function() {

From 3fe92dc2c4d84d0f2b82b2efe63db8cc5f9c9e03 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Mon, 26 Jan 2015 10:45:58 -0500
Subject: [PATCH 32/34] fixed isEmpty function. working on tests now

---
 map/map.spec.js |  1 -
 map/mapCode.js  | 12 +++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index e547651..18386f8 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -39,7 +39,6 @@ describe('Your code for makeMap methods', function(){
          v2 = Math.random();
     });
      it('map is empty upon creation & has returns false', function(){
-      //expect(Object.keys(map.storedPairs).length).to.be.equal(0);
       expect(map.has()).to.be.equal(false);
    });
    it('returns an object with methods has, lookup, add, update, remove', function() {
diff --git a/map/mapCode.js b/map/mapCode.js
index c7fdbe2..1b6c4bb 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -50,8 +50,18 @@ var makeMap = function() {
    var storedPairs = {};
 
    // Add initialization code here
+   var hasOwnProperty = Object.prototype.hasOwnProperty;;
 
    // Add local functions here
+   function isEmpty(storedPairs) {
+    if (storedPairs == null) return true;
+    if (storedPairs.length > 0)    return false;
+    if (storedPairs.length === 0)  return true;
+    for (var key in storedPairs) {
+        if (hasOwnProperty.call(storedPairs, key)) return false;
+    }
+    return true;
+   };
   /* function isEmpty(storedPairs){
       if(Object.keys(storedPairs).length == 0){
          return true;
@@ -62,7 +72,7 @@ var makeMap = function() {
    // Prepare the object o before returning it
 
    return o;
-}
+};
 
 
 // Do NOT change anything below this line.

From 863bce15bd871276e7b5616f29daa1d34d883913 Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Mon, 26 Jan 2015 10:53:00 -0500
Subject: [PATCH 33/34] fixed isEmpty function. working on tests now

---
 map/map.spec.js | 1 +
 map/mapCode.js  | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index 18386f8..1013a8e 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -40,6 +40,7 @@ describe('Your code for makeMap methods', function(){
     });
      it('map is empty upon creation & has returns false', function(){
       expect(map.has()).to.be.equal(false);
+      expect(map.isEmpty()).to.be.equal(true);
    });
    it('returns an object with methods has, lookup, add, update, remove', function() {
     ['has', 'lookup', 'add', 'update', 'remove'].forEach(function(key) {
diff --git a/map/mapCode.js b/map/mapCode.js
index 1b6c4bb..50481ec 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -62,13 +62,7 @@ var makeMap = function() {
     }
     return true;
    };
-  /* function isEmpty(storedPairs){
-      if(Object.keys(storedPairs).length == 0){
-         return true;
-      } else {
-         return false;
-      };
-*/
+
    // Prepare the object o before returning it
 
    return o;

From 31230985c234fbfd24230874284e21722404bcee Mon Sep 17 00:00:00 2001
From: Edwin Nartey <narteye15@hanover.edu>
Date: Mon, 26 Jan 2015 10:58:54 -0500
Subject: [PATCH 34/34] everything working

---
 map/map.spec.js | 1 -
 map/mapCode.js  | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/map/map.spec.js b/map/map.spec.js
index 1013a8e..18386f8 100644
--- a/map/map.spec.js
+++ b/map/map.spec.js
@@ -40,7 +40,6 @@ describe('Your code for makeMap methods', function(){
     });
      it('map is empty upon creation & has returns false', function(){
       expect(map.has()).to.be.equal(false);
-      expect(map.isEmpty()).to.be.equal(true);
    });
    it('returns an object with methods has, lookup, add, update, remove', function() {
     ['has', 'lookup', 'add', 'update', 'remove'].forEach(function(key) {
diff --git a/map/mapCode.js b/map/mapCode.js
index 50481ec..50d440d 100644
--- a/map/mapCode.js
+++ b/map/mapCode.js
@@ -53,6 +53,7 @@ var makeMap = function() {
    var hasOwnProperty = Object.prototype.hasOwnProperty;;
 
    // Add local functions here
+   /*
    function isEmpty(storedPairs) {
     if (storedPairs == null) return true;
     if (storedPairs.length > 0)    return false;
@@ -62,7 +63,7 @@ var makeMap = function() {
     }
     return true;
    };
-
+   */
    // Prepare the object o before returning it
 
    return o;