From 7ea77f068fff68e669b3dafc69d31515ff535c55 Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Wed, 30 Jan 2013 18:53:11 +0100 Subject: [PATCH] [#316] Update some more activity streams tests --- ckan/tests/functional/api/test_activity.py | 40 ++++++++++++---------- ckan/tests/functional/test_activity.py | 2 +- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/ckan/tests/functional/api/test_activity.py b/ckan/tests/functional/api/test_activity.py index c0daf7b17ee..51bee6de429 100644 --- a/ckan/tests/functional/api/test_activity.py +++ b/ckan/tests/functional/api/test_activity.py @@ -2017,32 +2017,36 @@ def test_follow_dataset(self): # Find the new activity in the user's activity stream. user_new_activities = (find_new_activities( before['user activity stream'], after['user activity stream'])) - assert len(user_new_activities) == 1, ("There should be 1 new " + assert len(user_new_activities) == 0, ("There should be 0 new " " activity in the user's activity stream, but found %i" % len(user_new_activities)) - activity = user_new_activities[0] + + # The rest of this test is commented out because 'follow dataset' + # activities are disabled, even they are reenabled then uncomment it. + + #activity = user_new_activities[0] # The same new activity should appear in the package's activity stream. - pkg_new_activities = after['package activity stream'] - for activity in user_new_activities: - assert activity in pkg_new_activities + #pkg_new_activities = after['package activity stream'] + #for activity in user_new_activities: + # assert activity in pkg_new_activities # Check that the new activity has the right attributes. - assert activity['object_id'] == self.warandpeace['id'], \ - str(activity['object_id']) - assert activity['user_id'] == user['id'], str(activity['user_id']) - assert activity['activity_type'] == 'follow dataset', \ - str(activity['activity_type']) - if 'id' not in activity: - assert False, "activity object should have an id value" + #assert activity['object_id'] == self.warandpeace['id'], \ + # str(activity['object_id']) + #assert activity['user_id'] == user['id'], str(activity['user_id']) + #assert activity['activity_type'] == 'follow dataset', \ + # str(activity['activity_type']) + #if 'id' not in activity: + # assert False, "activity object should have an id value" # TODO: Test for the _correct_ revision_id value. - if 'revision_id' not in activity: - assert False, "activity object should have a revision_id value" - timestamp = datetime_from_string(activity['timestamp']) - assert timestamp >= before['time'] and timestamp <= \ - after['time'], str(activity['timestamp']) + #if 'revision_id' not in activity: + # assert False, "activity object should have a revision_id value" + #timestamp = datetime_from_string(activity['timestamp']) + #assert timestamp >= before['time'] and timestamp <= \ + # after['time'], str(activity['timestamp']) - assert len(self.activity_details(activity)) == 0 + #assert len(self.activity_details(activity)) == 0 def test_follow_user(self): user = self.normal_user diff --git a/ckan/tests/functional/test_activity.py b/ckan/tests/functional/test_activity.py index a8d9e0a9588..5634171c12d 100644 --- a/ckan/tests/functional/test_activity.py +++ b/ckan/tests/functional/test_activity.py @@ -120,7 +120,7 @@ def test_user_activity(self): result = self.app.get(offset, status=200) stripped = self.strip_tags(result) assert '%s started following %s' % (user['fullname'], - package['title']) in stripped, stripped + package['title']) not in stripped, stripped # Follow another user. follow_user(context, {'id': 'joeadmin'})