Skip to content

Commit

Permalink
engaged_repution should always return a relative value
Browse files Browse the repository at this point in the history
  • Loading branch information
jellegerbrandy committed Apr 27, 2016
1 parent 98e5f6d commit 7499fbb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions restapi/tests/test_evaluations.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ def url_resource(evaluation_id):

def test_evaluation_data(self):
# test that GETting an evaluation returns all expected data
user = self.contract.create_user()
user = self.contract.create_user(tokens=100)
# create another user just to make the numbers more meaningful
self.contract.create_user()
contribution = self.contract.create_contribution(user=user)
evaluation = self.contract.create_evaluation(
contribution=contribution, value=1, user=user)
Expand All @@ -51,11 +53,11 @@ def test_evaluation_data(self):
info = self.app.get(url).json
self.assertEqual(info['value'], 1)
self.assertEqual(info['contribution']['id'], contribution.id)
self.assertEqual(info['contribution']['score'], 1.0)
self.assertEqual(info['contribution']['engaged_reputation'], user.reputation)
self.assertEqual(info['contribution']['engaged_reputation'], user.relative_reputation())
self.assertGreater(info['contribution']['score'], 0)
self.assertEqual(info['evaluator']['id'], user.id)
self.assertEqual(info['evaluator']['tokens'], 99)
self.assertEqual(info['evaluator']['reputation'], 1)
self.assertEqual(info['evaluator']['reputation'], user.relative_reputation())

def test_evaluation_collection_get(self):
# add some data
Expand Down
2 changes: 1 addition & 1 deletion restapi/views/evaluations.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def evaluation_to_dict(evaluation, request):
'contribution': {
'id': contribution.id,
'score': request.contract.contribution_score(contribution),
'engaged_reputation': contribution.engaged_reputation(),
'engaged_reputation': contribution.engaged_reputation() / contribution.contract.total_reputation(),
},
'value': float(evaluation.value),
}

0 comments on commit 7499fbb

Please sign in to comment.