From 96ef74a61762330b17b212f56fa49f4a283ec87b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 21 2017 15:38:12 +0000
Subject: Fix the tests and set the return_value of some of the mock calls in the decorator


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/tests/test_pagure_flask_api_fork.py b/tests/test_pagure_flask_api_fork.py
index 1e6d035..b407f22 100644
--- a/tests/test_pagure_flask_api_fork.py
+++ b/tests/test_pagure_flask_api_fork.py
@@ -1227,24 +1227,23 @@ class PagureFlaskApiForktests(tests.Modeltests):
         self.assertEqual(request.flags[0].comment, 'Tests passed')
         self.assertEqual(request.flags[0].percent, 100)
 
-    @patch('pagure.lib.notify.send_email')
-    @patch('pagure.lib.git.merge_pull_request')
+    @patch('pagure.lib.notify.send_email', return_value=True)
+    @patch(
+        'pagure.lib.git.merge_pull_request', return_value='Changes merged!')
     @patch.dict(
         'pagure.APP.config', {'MANDATORY_FLAGS': {'foobar': 'koji'}})
     def test_api_pull_request_merge_no_flag(self, mpr, send_email):
         """ Test the api_pull_request_merge method of the flask api when
         the PR is missing one of the mandatory flag.
         """
-        mpr.return_value = 'Changes merged!'
-        send_email.return_value = True
 
         tests.create_projects(self.session)
         tests.create_tokens(self.session)
         tests.create_tokens_acl(self.session)
 
         # Create the pull-request to close
-        repo = pagure.lib.get_project(self.session, 'test')
-        forked_repo = pagure.lib.get_project(self.session, 'test')
+        repo = pagure.get_authorized_project(self.session, 'test')
+        forked_repo = pagure.get_authorized_project(self.session, 'test')
         req = pagure.lib.new_pull_request(
             session=self.session,
             repo_from=forked_repo,
@@ -1320,8 +1319,8 @@ class PagureFlaskApiForktests(tests.Modeltests):
         tests.create_tokens_acl(self.session)
 
         # Create the pull-request to close
-        repo = pagure.lib.get_project(self.session, 'test')
-        forked_repo = pagure.lib.get_project(self.session, 'test')
+        repo = pagure.get_authorized_project(self.session, 'test')
+        forked_repo = pagure.get_authorized_project(self.session, 'test')
         req = pagure.lib.new_pull_request(
             session=self.session,
             repo_from=forked_repo,
@@ -1384,8 +1383,8 @@ class PagureFlaskApiForktests(tests.Modeltests):
         tests.create_tokens_acl(self.session)
 
         # Create the pull-request to close
-        repo = pagure.lib.get_project(self.session, 'test')
-        forked_repo = pagure.lib.get_project(self.session, 'test')
+        repo = pagure.get_authorized_project(self.session, 'test')
+        forked_repo = pagure.get_authorized_project(self.session, 'test')
         req = pagure.lib.new_pull_request(
             session=self.session,
             repo_from=forked_repo,
@@ -1445,8 +1444,9 @@ class PagureFlaskApiForktests(tests.Modeltests):
         tests.create_tokens_acl(self.session)
 
         # Create the pull-request to close
-        repo = pagure.lib.get_project(self.session, 'test')
-        forked_repo = pagure.lib.get_project(self.session, 'test')
+        repo = pagure.get_authorized_project(self.session, 'test')
+        forked_repo = pagure.get_authorized_project(
+            self.session, 'test')
         req = pagure.lib.new_pull_request(
             session=self.session,
             repo_from=forked_repo,
diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py
index ca77241..1e5866e 100644
--- a/tests/test_pagure_flask_ui_fork.py
+++ b/tests/test_pagure_flask_ui_fork.py
@@ -497,10 +497,9 @@ class PagureFlaskForktests(tests.Modeltests):
                 '</button>\n                      Merge conflicts!',
                 output.data)
 
-    @patch('pagure.lib.notify.send_email')
+    @patch('pagure.lib.notify.send_email', return_value=True)
     def test_merge_request_pull_nochange(self, send_email):
         """ Test the merge_request_pull endpoint. """
-        send_email.return_value = True
 
         tests.create_projects(self.session)
         tests.create_projects_git(