Tests are passing again

[margebot.git] / tests / test_marge.py

diff --git a/tests/test_marge.py b/tests/test_marge.py
index 2fc7429..d8b85b3 100644 (file)
--- a/tests/test_marge.py
+++ b/tests/test_marge.py
@@ -166,13 +166,14 @@ class TestMarge(object):
             return []
         monkeypatch.setattr(gitlab.Gitlab, 'getmergerequests', mock_getmergerequests)
 
-        def mock_addprojecthook(self, project, url, **kwargs):
+        def mock_addprojecthook_extra(self, project, url, push=False, issues=False, merge_requests=False, tag_push=False, extra_data=None):
             return True
-        monkeypatch.setattr(gitlab.Gitlab, 'addprojecthook', mock_addprojecthook)
+        monkeypatch.setattr(gitlab.Gitlab, 'addprojecthook_extra', mock_addprojecthook_extra, raising=False)
 
-        def mock_editprojecthook(self, project, hook_id, url, **kwargs):
+        def mock_editprojecthook_extra(self, project, hook_id, url, push=False, issues=False, merge_requests=False, tag_push=False, extra_data=None):
             return True
-        monkeypatch.setattr(gitlab.Gitlab, 'editprojecthook', mock_editprojecthook)
+        monkeypatch.setattr(gitlab.Gitlab, 'editprojecthook_extra', mock_editprojecthook_extra, raising=False)
+
         return gitlab.Gitlab
 
 
@@ -180,12 +181,12 @@ class TestMarge(object):
 #    def MargeGitlab(self, monkeypatch):
 #        def mock_addprojecthook_extra(self, project, url, push=False, issues=False, merge_requests=False, tag_push=False, extra_data=None):
 #            return True
-#        monkeypatch.setattr('plugins.marge.MargeGitlab.addprojecthook_extra', mock_addprojecthook_extra)
+#        monkeypatch.setattr(plugins.marge.MargeGitlab, 'addprojecthook_extra')
 #
 #        def mock_editprojecthook_extra(self, project, hook_id, url, push=False, issues=False, merge_requests=False, tag_push=False, extra_data=None):
 #            return True
-#        monkeypatch.setattr('plugins.marge.MargeGitlab.editprojecthook_extra', mock_editprojecthook_extra)
-#        return marge.MargeGitlab
+#        monkeypatch.setattr(plugins.marge.MargeGitlab, 'editprojecthook_extra')
+#        return plugins.marge.MargeGitlab
 
     @pytest.fixture
     def gitlab_no_reviews(self, gitlab, monkeypatch):
@@ -196,7 +197,7 @@ class TestMarge(object):
 
     @pytest.fixture
     def gitlab_one_review(self, gitlab, monkeypatch):
-        ret_mr = {'id': 'mr_id',
+        ret_mr = {'iid': 'mr_id',
                   'author': {'id': 2001},
                   'created_at': 'Oct 29, 2017 2:37am',
                   'merge_status': 'can_be_merged',
@@ -278,7 +279,6 @@ class TestMarge(object):
         pm = margebot.pop_message()
         assert 'Updating room list for group/new_repo MRs from room1,room2,room3 to room4,room5,room6' in pm
 
-#    @pytest.mark.skip(reason='until I figure out how to mock MargeGitlab')
     def test_watchrepo_existing_mr(self, margebot, gitlab_one_review):
         margebot.push_message('!watchrepo sample/mr room1,room2,room3')
         pm = margebot.pop_message()