Merge branch 'SmileyChris-master' into develop

bitshares/asset.py

@@ -133,7 +133,7 @@ class Asset(BlockchainObject):
 
     @property
     def calls(self):
-        return self.get_call_positions(10)
+        return self.get_call_orders(10)
 
     def get_call_orders(self, limit=100):
         from .price import Price

requirements-test.txt

@@ -4,5 +4,6 @@ scrypt==0.7.1
 Events==0.2.2
 pyyaml
 pytest
+pytest-mock
 coverage
 mock

tests/test_asset.py

@@ -37,3 +37,13 @@ class Testcases(unittest.TestCase):
         self.assertEqual(asset.permissions, asset["permissions"])
         self.assertIsInstance(asset.flags, dict)
         self.assertEqual(asset.flags, asset["flags"])
+
+    """
+    # Mocker comes from pytest-mock, providing an easy way to have patched objects
+    # for the life of the test.
+    def test_calls(mocker):
+        asset = Asset("USD", lazy=True, bitshares_instance=BitShares(offline=True))
+        method = mocker.patch.object(Asset, 'get_call_orders')
+        asset.calls
+        method.assert_called_with(10)
+    """