Merge branch 'master' into develop

.travis.yml

@@ -1,13 +1,17 @@
 language: node_js
 node_js:
+  - "0.12"
   - "0.11"
   - "0.10"
 before_script:
   - npm install
   - npm install jshint
+  - export DISPLAY=:99.0 
+  - sh -e /etc/init.d/xvfb start
 script:
    - "jshint *.js lib"
 after_script:
   - npm run-script build
+  - npm run-script karma
   - npm run-script test-coveralls
 

package.json

@@ -41,7 +41,7 @@
     "lint": "gulp lint",
     "test": "mocha",
     "test-coveralls": "istanbul cover _mocha -- -R spec && cat coverage/lcov.info | coveralls --verbose",
-    "karma": "./node_modules/karma/bin/karma start --singleRun=true --browsers=\"Chrome,Firefox\""
+    "karma": "./node_modules/karma/bin/karma start --singleRun=true --browsers=\"Firefox\""
   },
   "repository": {
     "type": "git",

test/eth.methods.js

@@ -32,6 +32,27 @@ describe('web3', function() {
         u.propertyExists(web3.eth, 'defaultBlock');
         u.propertyExists(web3.eth, 'blockNumber');
     });
+
+    // Fail at the moment
+    // describe('eth', function(){
+    //     it('should be a positive balance', function() {
+    //         // when
+    //         var testAddress = '0x50f4ed0e83f9da907017bcfb444e3e25407f59bb';
+    //         var balance = web3.eth.balanceAt(testAddress);
+    //         // then
+    //         assert(balance > 0, 'Balance is ' + balance);
+    //     });
+
+    //     it('should return a block', function() {
+    //         // when
+    //         var block = web3.eth.block(0);
+            
+    //         // then
+    //         assert.notEqual(block, null);
+    //         assert.equal(block.number, 0);
+    //         assert(web3.toDecimal(block.difficulty) > 0);
+    //     });
+    // });
 });