1106 Lesson4 finished

calculator.js

@@ -11,5 +11,16 @@ function substract(num1, num2){
   return num1 - num2;
 }
 
+function multiple(num1, num2){
+  return num1 * num2;
+}
+
+function divide(num1, num2){
+  return num1 / num2;
+}
+
 module.exports.add = add;
+module.exports.substract = substract;
+module.exports.multiple = multiple;
+module.exports.divide = divide;
 module.exports.isNumber = isNumber;

index.html

@@ -22,6 +22,8 @@ <h1>Silly Calculator</h1>
     <select id="operator" size="1">
       <option value="add">+</option>
       <option value="substract">-</option>
+	  <option value="multiple">X</option>
+	  <option value="divide">/</option>
     </select>
     <input type="text" id="num2" value="1" />
     <div>=</div>

main.js

@@ -15,6 +15,12 @@ window.onload = function(){
     }
     else if (operator == "substract"){
       document.getElementById('ans').value = substract(num1, num2);
+    }
+	else if (operator == "multiple"){
+      document.getElementById('ans').value = multiple(num1, num2);
+    }
+	else if (operator == "divide"){
+      document.getElementById('ans').value = divide(num1, num2);
     }
     else {
       alert("Bad operator!")

test/test_calculator.js

@@ -3,8 +3,18 @@ var cal = require('../calculator.js')
 
 describe('Calculator', function(){
   describe('add', function(){
-    it('add', function(){
-      assert.equal('2', cal.add(1, 1));
+    it('will add', function(){
+      assert.equal('18', cal.add(12, 6));
+    })
+	it('will substract', function(){
+      assert.equal('6', cal.substract(12, 6));
+    })
+	it('will multiple', function(){
+      assert.equal('72', cal.multiple(12, 6));
+    })
+	it('will divide', function(){
+	  //this will be wrong
+      assert.equal('3', cal.divide(12, 6));
     })
   })
 })