last changes

Author: levnikan

.DS_Store

@@ -4,19 +4,34 @@ var BankSecurity = {
 
 var BankAccount = {
     balance: 0,
+<<<<<<< HEAD
 
     deposit: function (money) {
         this.balance = this.balance + money;
         return this.balance;
     },
 
+=======
+    deposit: function (money) {
+        this.balance = this.balance + money;
+    },
+>>>>>>> 4f8b4060407687a11e26eb422cb4e79289fe505c
     widthraw: function (cash) {
         this.balance = this.balance - cash;
         return this.balance;
     }
+<<<<<<< HEAD
 }
+=======
+};
+>>>>>>> 4f8b4060407687a11e26eb422cb4e79289fe505c
 
 module.exports = {
     BankAccount: BankAccount,
     BankSecurity: BankSecurity
 }
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> 4f8b4060407687a11e26eb422cb4e79289fe505c

chapter1/bank-account.js

@@ -3,6 +3,7 @@ var BankAccount = require('../bank-account').BankAccount;
 
 describe('Bank account', () => {
     it('should have no money on deposit in the beginning', () => {
+<<<<<<< HEAD
         assert.equal(BankAccount.balance, 0);
     });
 
@@ -12,5 +13,18 @@ describe('Bank account', () => {
 
     it('should be able to deposit money', () => {
         assert.equal(BankAccount.deposit(30), 10);
+=======
+
+        var obj = {
+            foo: "hello world",
+            fn: function () {
+                console.log(arguments.join(''));
+            }
+        }
+
+        obj.fn(1,2,3,4,45,6, "", {}, [], Infinity,1,23,1,12,12,3,12,3123,123,123,123,123,123,123);
+        
+        //assert.equal(BankAccount.balance, 0);
+>>>>>>> 4f8b4060407687a11e26eb422cb4e79289fe505c
     });
 })

chapter1/test/bank-account.test.js

@@ -9,10 +9,19 @@ describe('JS Basics', function () {
       assert.equal(Formulas.add(a, b), 99);
     });
 
+<<<<<<< HEAD
     it('should be able to divide and multiply number', function () {
       var a = 4;
       var b = 2;
       assert.equal(Formulas.divideMultiply(a, b), 8);
+=======
+xdescribe('JS Basics', function() {
+  describe('Numbers', function() {
+    it('should be able to add number', function() {
+      var a = 42.9902822; 
+      var b = 43.2929112;
+      assert.equal(a + b, 99);
+>>>>>>> 4f8b4060407687a11e26eb422cb4e79289fe505c
     });
 
     it('should return undefined if divided by 0', function () {