[allura] branch gc/8481 updated: fixup! fixup! [#8481] added target attributes to repository activity

[gc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gcruz pushed a commit to branch gc/8481
in repository https://gitbox.apache.org/repos/asf/allura.git


The following commit(s) were added to refs/heads/gc/8481 by this push:
     new 31ce5c9d0 fixup! fixup! [#8481] added target attributes to repository activity
31ce5c9d0 is described below

commit 31ce5c9d0593e1532fd35ca862a2299d7097e93b
Author: Guillermo Cruz <gu...@slashdotmedia.com>
AuthorDate: Wed Nov 30 12:19:06 2022 -0600

    fixup! fixup! [#8481] added target attributes to repository activity
---
 Allura/allura/app.py                   | 2 +-
 Allura/allura/tests/model/test_repo.py | 3 ++-
 Allura/allura/tests/test_tasks.py      | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index a05caded8..d08e1585b 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -831,7 +831,7 @@ class Application(ActivityObject):
 
     @property
     def activity_extras(self):
-        return {'allura_id': self.config._id}
+        return {}
 
 class AdminControllerMixin:
     """Provides common functionality admin controllers need"""
diff --git a/Allura/allura/tests/model/test_repo.py b/Allura/allura/tests/model/test_repo.py
index 85fa9b9fb..b1fab59d6 100644
--- a/Allura/allura/tests/model/test_repo.py
+++ b/Allura/allura/tests/model/test_repo.py
@@ -686,11 +686,12 @@ class TestMergeRequest:
             app_config=mock.Mock(_id=ObjectId()),
             downstream={'commit_id': '12345'},
             request_number=1,
+
         )
         self._set_mr_mock_attrs(self.mr)
 
     def _set_mr_mock_attrs(self, mr):
-        mr.app = mock.Mock(forkable=True, url='/mock-app-url/')
+        mr.app = mock.Mock(forkable=True, url='/mock-app-url/', activity_name='code merge', activity_url='/fake/url', activity_extras={}, node_id=None)
         mr.app.repo.commit.return_value = mock.Mock(_id='09876')
         mr.merge_allowed = mock.Mock(return_value=True)
         mr.discussion_thread = mock.Mock()
diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py
index bb61cb95a..275c36455 100644
--- a/Allura/allura/tests/test_tasks.py
+++ b/Allura/allura/tests/test_tasks.py
@@ -72,8 +72,8 @@ class TestRepoTasks(unittest.TestCase):
     @mock.patch('allura.tasks.repo_tasks.session', autospec=True)
     @mock.patch.object(M, 'MergeRequest')
     def test_merge(self, MR, session):
-        mr = mock.Mock(_id='_id',
-                       activity_name='merge req', activity_url='/fake/url', activity_extras={}, node_id=None)
+        mr = mock.Mock(_id='_id', activity_name='merge req', activity_url='/fake/url', activity_extras={}, node_id=None,
+                       app=mock.Mock(activity_name='code merge', activity_url='/fake/url', activity_extras={}, node_id=None))
         MR.query.get.return_value = mr
         repo_tasks.merge(mr._id)
         mr.app.repo.merge.assert_called_once_with(mr)