launchpad-reviewers team mailing list archive

[Finn Gärtner <mp+492024@xxxxxxxxxxxxxxxxxx>]

Finn Gärtner has proposed merging ~finnrg/launchpad:fix/set-getMergeProposals-api-version-to-beta into launchpad:master.

Commit message:
fix: Set the API version of getMergeProposals back to beta, to comply with existing tests

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~finnrg/launchpad/+git/launchpad/+merge/492024
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~finnrg/launchpad:fix/set-getMergeProposals-api-version-to-beta into launchpad:master.

diff --git a/lib/lp/code/model/tests/test_hasbranches.py b/lib/lp/code/model/tests/test_hasbranches.py
index 6d911be..64bfdbd 100644
--- a/lib/lp/code/model/tests/test_hasbranches.py
+++ b/lib/lp/code/model/tests/test_hasbranches.py
@@ -56,11 +56,7 @@ class TestHasMergeProposalsWebservice(TestCaseWithFactory):
         owner = self.factory.makePerson()
         owner_url = api_url(owner)
         webservice = webservice_for_person(
-            owner,
-            permission=OAuthPermission.READ_PRIVATE,
-            # Required because we override the getMergeProposals
-            # API version from IHasMergeProposals in IPersonViewRestricted
-            default_api_version="devel",
+            owner, permission=OAuthPermission.READ_PRIVATE
         )
 
         def create_merge_proposals():
diff --git a/lib/lp/registry/interfaces/person.py b/lib/lp/registry/interfaces/person.py
index 3ca58b1..e30be20 100644
--- a/lib/lp/registry/interfaces/person.py
+++ b/lib/lp/registry/interfaces/person.py
@@ -1955,7 +1955,7 @@ class IPersonViewRestricted(
     # Really IBranchMergeProposal
     @operation_returns_collection_of(Interface)
     @export_read_operation()
-    @operation_for_version("devel")
+    @operation_for_version("beta")
     def getMergeProposals(
         status=None,
         visible_by_user=None,