From 0b6d06e5aa3bdf8b0457a266de591e0a4b26e0a0 Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Tue, 17 Feb 2015 20:00:30 +0100
Subject: [PATCH] Squashed 'libjsqrc/ethereumjs/' changes from 82cc5f6..9a85b09

9a85b09 version upgrade
ec6f9b3 added transactionCount && uncleCount methods
b96a7aa gulp cleanup
d6128f2 coveralls badge points to master
efee649 coveralls badge
339f565 travis coveralls
27d53dd travis coveralls
001077e Merge pull request #59 from cubedro/master
9902977 updated dist
af7c26b check request.status in httpsync.js to prevent throwing errors when undefined
ad8112c Merge pull request #15 from ethereum/master
d1e6b20 updated README
c184728 version upgrade
3d652e8 fixed web3.reset()
26561e4 fixed #51
03661d3 eth_polling_timeout const
9e806cc Merge branch 'master' into develop
82d32bb providermanager -> requestmanager
a86fccf web3 refactor (in progress)
c29f4a1 filters refactor
9d84609 Merge branch 'master' of https://github.com/ethereum/ethereum.js
859a199 Merge pull request #55 from ethereum/develop
fd5146d Merge pull request #12 from debris/master

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 9a85b098a082f9ed38bcf92ab5ee6ba64489d7cf
---
 eth.methods.js    |  2 ++
 filter.methods.js | 27 +++++++++++++++++++++++++++
 web3.methods.js   | 11 +++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 filter.methods.js

diff --git a/eth.methods.js b/eth.methods.js
index 8f10b441d..9ea0ad59a 100644
--- a/eth.methods.js
+++ b/eth.methods.js
@@ -19,6 +19,8 @@ describe('web3', function() {
         u.methodExists(web3.eth, 'solidity');
         u.methodExists(web3.eth, 'serpent');
         u.methodExists(web3.eth, 'logs');
+        u.methodExists(web3.eth, 'transactionCount');
+        u.methodExists(web3.eth, 'uncleCount');
 
         u.propertyExists(web3.eth, 'coinbase');
         u.propertyExists(web3.eth, 'listening');
diff --git a/filter.methods.js b/filter.methods.js
new file mode 100644
index 000000000..9f81ec38f
--- /dev/null
+++ b/filter.methods.js
@@ -0,0 +1,27 @@
+var assert = require('assert');
+var filter = require('../lib/filter');
+var u = require('./test.utils.js');
+
+var empty = function () {};
+var implementation = {
+    newFilter: empty,
+    getMessages: empty,
+    uninstallFilter: empty,
+    startPolling: empty,
+    stopPolling: empty,
+};
+
+describe('web3', function () {
+    describe('eth', function () {
+        describe('filter', function () {
+            var f = filter({}, implementation);
+
+            u.methodExists(f, 'arrived');
+            u.methodExists(f, 'happened');
+            u.methodExists(f, 'changed');
+            u.methodExists(f, 'messages');
+            u.methodExists(f, 'logs');
+            u.methodExists(f, 'uninstall');
+        });
+    });
+});
diff --git a/web3.methods.js b/web3.methods.js
index 06de41da4..8dcc61101 100644
--- a/web3.methods.js
+++ b/web3.methods.js
@@ -6,5 +6,16 @@ describe('web3', function() {
     u.methodExists(web3, 'sha3');
     u.methodExists(web3, 'toAscii');
     u.methodExists(web3, 'fromAscii');
+    u.methodExists(web3, 'toDecimal');
+    u.methodExists(web3, 'fromDecimal');
+    u.methodExists(web3, 'toEth');
+    u.methodExists(web3, 'setProvider');
+    u.methodExists(web3, 'reset');
+
+    u.propertyExists(web3, 'manager');
+    u.propertyExists(web3, 'providers');
+    u.propertyExists(web3, 'eth');
+    u.propertyExists(web3, 'db');
+    u.propertyExists(web3, 'shh');
 });