Repository: VirtusLab/git-machete
Pull request #1308 (2024-08-22 16:47:46)

Remove stray references to PRs/pull requests from GitLab tests/docs


Patch:
diff --git a/ci/checks/enforce-consistent-style-for-fork-point.sh b/ci/checks/enforce-consistent-style-for-fork-point.sh
index b2c3c93..3967d03 100755
--- a/ci/checks/enforce-consistent-style-for-fork-point.sh
+++ b/ci/checks/enforce-consistent-style-for-fork-point.sh
@@ -2,10 +2,9 @@
 
 set -e -o pipefail -u
 
-self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
 self_name=$(basename "$0")
-source "$self_dir"/utils.sh
 
 if git grep -n '[fF]orkpoint' -- :!**/$self_name; then
-  die "Please use 'fork point' or 'Fork point' or 'fork_point' instead of 'forkpoint' or 'Forkpoint'."
+  echo "Please use 'fork point' or 'Fork point' or 'fork_point' instead of 'forkpoint' or 'Forkpoint'."
+  exit 1
 fi
diff --git a/ci/checks/enforce-consistent-style-for-github.sh b/ci/checks/enforce-consistent-style-for-github.sh
index f09cad7..ace4d13 100755
--- a/ci/checks/enforce-consistent-style-for-github.sh
+++ b/ci/checks/enforce-consistent-style-for-github.sh
@@ -2,10 +2,9 @@
 
 set -e -o pipefail -u
 
-self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
-source "$self_dir"/utils.sh
 self_name=$(basename "$0")
 
 if git grep -n Github -- :!**/$self_name; then
-  die "Please use 'GitHub' instead of 'Github'."
+  echo "Please use 'GitHub' instead of 'Github'."
+  exit 1
 fi
diff --git a/ci/checks/enforce-consistent-style-for-gitlab.sh b/ci/checks/enforce-consistent-style-for-gitlab.sh
index 230b8ad..257ca10 100755
--- a/ci/checks/enforce-consistent-style-for-gitlab.sh
+++ b/ci/checks/enforce-consistent-style-for-gitlab.sh
@@ -2,10 +2,9 @@
 
 set -e -o pipefail -u
 
-self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
-source "$self_dir"/utils.sh
 self_name=$(basename "$0")
 
 if git grep -n Gitlab -- :!**/$self_name; then
-  die "Please use 'GitLab' instead of 'Gitlab'."
+  echo "Please use 'GitLab' instead of 'Gitlab'."
+  exit 1
 fi
diff --git a/ci/checks/enforce-issue-number-for-todos.sh b/ci/checks/enforce-issue-number-for-todos.sh
index fb84996..2e49fc1 100755
--- a/ci/checks/enforce-issue-number-for-todos.sh
+++ b/ci/checks/enforce-issue-number-for-todos.sh
@@ -2,10 +2,8 @@
 
 set -e -o pipefail -u
 
-self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
-source "$self_dir"/utils.sh
-
 # Negative lookahead (?!...), requires Perl syntax (-P): find fixmes/todos NOT followed by issue number
 if git grep --perl-regexp -I --ignore-case --line-number '(\*|//|#|<!--)\s*(fixme|todo)(?! \([[:alnum:]/-]*#[0-9]+\): )'; then
-  die "Use 'TODO|FIXME (<other-repo-name-or-empty>#<issue-number>): <short-description>' format for the above TODOs and FIXMEs"
+  echo "Use 'TODO|FIXME (<other-repo-name-or-empty>#<issue-number>): <short-description>' format for the above TODOs and FIXMEs"
+  exit 1
 fi
diff --git a/ci/checks/enforce-mocking-only-whitelisted-methods.sh b/ci/checks/enforce-mocking-only-whitelisted-methods.sh
index af0bbe9..6997512 100755
--- a/ci/checks/enforce-mocking-only-whitelisted-methods.sh
+++ b/ci/checks/enforce-mocking-only-whitelisted-methods.sh
@@ -2,8 +2,6 @@
 
 set -e -o pipefail -u
 
-self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
-source "$self_dir"/utils.sh
 self_name=$(basename "$0")
 
 whitelisted_methods="\
@@ -30,6 +28,7 @@ actual_methods=$(git grep -Pho "(?<=self\.patch_symbol\(mocker, ['\"]).*?(?=['\"
 # `grep ''` to check if the output is non-empty (true if non-empty, false if empty)
 if comm -13 <(echo "$whitelisted_methods") <(echo "$actual_methods") | grep ''; then
   echo
-  error "The above properties/methods are mocked in at least one test method, but are NOT whitelisted in $self_name."
-  die   "While it is possible to add new whitelisted properties/methods, consider redesigning the test(s) first."
+  echo "The above properties/methods are mocked in at least one test method, but are NOT whitelisted in $self_name."
+  echo "While it is possible to add new whitelisted properties/methods, consider redesigning the test(s) first."
+  exit 1
 fi
diff --git a/ci/checks/enforce-newline-at-eof.sh b/ci/checks/enforce-newline-at-eof.sh
index ca743d6..02915f8 100755
--- a/ci/checks/enforce-newline-at-eof.sh
+++ b/ci/checks/enforce-newline-at-eof.sh
@@ -2,9 +2,6 @@
 
 set -e -o pipefail -u
 
-self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
-source "$self_dir"/utils.sh
-
 found=0
 for file in $(git grep -I --files-with-matches ''); do
   last_two_characters=$(tail -c2 "$file" | xxd -p)
@@ -18,5 +15,6 @@ for file in $(git grep -I --files-with-matches ''); do
 done
 
 if [[ $found -ne 0 ]]; then
-  die 'The above non-binary file(s) do not end with a single newline character, please tidy up'
+  echo 'The above non-binary file(s) do not end with a single newline character, please tidy up'
+  exit 1
 fi
diff --git a/ci/checks/prohibit-exempli-gratia-in-rst.sh b/ci/checks/prohibit-exempli-gratia-in-rst.sh
index 438edb4..3fe6e6b 100755
--- a/ci/checks/prohibit-exempli-gratia-in-rst.sh
+++ b/ci/checks/prohibit-exempli-gratia-in-rst.sh
@@ -2,9 +2,7 @@
 
 set -e -o pipefail -u
 
-self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
-source "$self_dir"/utils.sh
-
 if git grep -En 'e\. ?g\.' -- '*.rst'; then
-  die 'Do not use `e.g.` in docs; use a clearer alternative like `for example` instead'
+  echo 'Do not use `e.g.` in docs; use a clearer alternative like `for example` instead'
+  exit 1
 fi
diff --git a/ci/checks/prohibit-id-est-in-rst.sh b/ci/checks/prohibit-id-est-in-rst.sh
index a22cc0e..ee2f772 100755
--- a/ci/checks/prohibit-id-est-in-rst.sh
+++ b/ci/checks/prohibit-id-est-in-rst.sh
@@ -2,9 +2,7 @@
 
 set -e -o pipefail -u
 
-self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
-source "$self_dir"/utils.sh
-
 if git grep -En 'i\. ?e\.' -- '*.rst'; then
-  die 'Do not use `i.e.` in docs; use a clearer alternative like a long dash `---` instead'
+  echo 'Do not use `i.e.` in docs; use a clearer alternative like a long dash `---` instead'
+  exit 1
 fi
diff --git a/ci/checks/prohibit-mrs-in-github-files.sh b/ci/checks/prohibit-mrs-in-github-files.sh
new file mode 100755
index 0000000..872e027
--- /dev/null
+++ b/ci/checks/prohibit-mrs-in-github-files.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e -o pipefail -u
+
+self_name=$(basename "$0")
+
+if git grep -EIn 'MR|-mr|[mM]erge [rR]equest' -- '*github*' :!**/$self_name; then
+  echo
+  echo "GitHub uses *pull* requests rather than *merge* requests, please fix"
+  exit 1
+fi
diff --git a/ci/checks/prohibit-prs-in-gitlab-files.sh b/ci/checks/prohibit-prs-in-gitlab-files.sh
new file mode 100755
index 0000000..ec80f51
--- /dev/null
+++ b/ci/checks/prohibit-prs-in-gitlab-files.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e -o pipefail -u
+
+self_name=$(basename "$0")
+
+if git grep -EIn 'PR|-pr($|[^o])|[pP]ull [rR]equest' -- '*gitlab*' :!**/$self_name; then
+  echo
+  echo "GitLab uses *merge* requests rather than *pull* requests, please fix"
+  echo 'Usage of `pull_request` in GitLab-related identifiers is allowed so that we avoid inventing a common abstract word for pull and merge requests'
+  exit 1
+fi
diff --git a/ci/checks/prohibit-split-backslash-n.sh b/ci/checks/prohibit-split-backslash-n.sh
index d4655cd..b908817 100755
--- a/ci/checks/prohibit-split-backslash-n.sh
+++ b/ci/checks/prohibit-split-backslash-n.sh
@@ -2,9 +2,8 @@
 
 set -e -o pipefail -u
 
-self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
-source "$self_dir"/utils.sh
-
 if git grep -n 'split(.\\n.)' -- '*.py'; then
-  die 'Do not use split("\\n") on strings as it does not cover \\r\\n line breaks; use splitlines() instead'
+  # shellcheck disable=SC2028
+  echo 'Do not use split("\\n") on strings as it does not cover \\r\\n line breaks; use splitlines() instead'
+  exit 1
 fi
diff --git a/ci/checks/run-all-checks.sh b/ci/checks/run-all-checks.sh
index e847130..c947c8a 100755
--- a/ci/checks/run-all-checks.sh
+++ b/ci/checks/run-all-checks.sh
@@ -32,6 +32,8 @@ prohibit-fork-point-in-git-context.sh
 prohibit-id-est-in-rst.sh
 prohibit-double-backticks-in-python.sh
 prohibit-markdown-links-in-rst.sh
+prohibit-mrs-in-github-files.sh
+prohibit-prs-in-gitlab-files.sh
 prohibit-single-backtick-in-rst.sh
 prohibit-split-backslash-n.sh
 prohibit-strings-split-without-delimiter.sh
diff --git a/docs/man/git-machete.1 b/docs/man/git-machete.1
index 83a16a3..07a7909 100644
--- a/docs/man/git-machete.1
+++ b/docs/man/git-machete.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "GIT-MACHETE" "1" "Aug 20, 2024" "" "git-machete"
+.TH "GIT-MACHETE" "1" "Aug 22, 2024" "" "git-machete"
 .SH NAME
 git-machete \- git-machete 3.28.1
 .sp
@@ -1102,7 +1102,7 @@ Creates, checks out and manages GitLab MRs while keeping them reflected in branc
 \fBNOTE:\fP
 .INDENT 0.0
 .INDENT 3.5
-To allow GitLab API access for private repositories (and also to perform side\-effecting actions like opening a PR,
+To allow GitLab API access for private projects (and also to perform side\-effecting actions like opening a MR,
 even in case of public projects), a GitLab API token with \fBapi\fP scope is required, see \X'tty: link https://gitlab.com/-/user_settings/personal_access_tokens'\fI\%https://gitlab.com/\-/user_settings/personal_access_tokens\fP\X'tty: link'\&.
 This will be resolved from the first of:
 .INDENT 0.0
@@ -1160,9 +1160,9 @@ Also include full MR URLs in the annotations (rather than just MR number).
 .UNINDENT
 .TP
 .B \fBcheckout\-mrs [\-\-all | \-\-by=<gitlab\-login> | \-\-mine | <MR\-number\-1> ... <MR\-number\-N>]\fP:
-Check out the source branch of the given pull requests (specified by numbers or by a flag),
-also traverse chain of pull requests upwards, adding branches one by one to git\-machete and check them out locally.
-Once the specified pull requests are checked out locally, annotate local branches with corresponding pull request numbers.
+Check out the source branch of the given merge requests (specified by numbers or by a flag),
+also traverse chain of merge requests upwards, adding branches one by one to git\-machete and check them out locally.
+Once the specified merge requests are checked out locally, annotate local branches with corresponding merge request numbers.
 If only one MR has been checked out, then switch the local repository\(aqs HEAD to its source branch.
 .sp
 When the current user is NOT the author of the MR associated with that branch, adds \fBrebase=no push=no\fP branch qualifiers used by \fBgit machete traverse\fP,
@@ -1183,7 +1183,7 @@ Checkout open MRs for the current user associated with the GitLab token.
 .sp
 \fBParameters:\fP
 .sp
-\fB<MR\-number\-1> ... <MR\-number\-N>\fP    Pull request numbers to checkout.
+\fB<MR\-number\-1> ... <MR\-number\-N>\fP    Merge request numbers to checkout.
 .TP
 .B \fBcreate\-mr [\-\-draft] [\-\-title=<title>] [\-\-yes]\fP:
 Creates a MR for the current branch, using the upstream (parent) branch as the MR source branch.
diff --git a/docs/source/cli/gitlab.rst b/docs/source/cli/gitlab.rst
index 8bb8df0..535ef7b 100644
--- a/docs/source/cli/gitlab.rst
+++ b/docs/source/cli/gitlab.rst
@@ -14,7 +14,7 @@ Creates, checks out and manages GitLab MRs while keeping them reflected in branc
 
 .. note::
 
-    To allow GitLab API access for private repositories (and also to perform side-effecting actions like opening a PR,
+    To allow GitLab API access for private projects (and also to perform side-effecting actions like opening a MR,
     even in case of public projects), a GitLab API token with ``api`` scope is required, see https://gitlab.com/-/user_settings/personal_access_tokens.
     This will be resolved from the first of:
 
@@ -55,9 +55,9 @@ Creates, checks out and manages GitLab MRs while keeping them reflected in branc
 
 
 ``checkout-mrs [--all | --by=<gitlab-login> | --mine | <MR-number-1> ... <MR-number-N>]``:
-    Check out the source branch of the given pull requests (specified by numbers or by a flag),
-    also traverse chain of pull requests upwards, adding branches one by one to git-machete and check them out locally.
-    Once the specified pull requests are checked out locally, annotate local branches with corresponding pull request numbers.
+    Check out the source branch of the given merge requests (specified by numbers or by a flag),
+    also traverse chain of merge requests upwards, adding branches one by one to git-machete and check them out locally.
+    Once the specified merge requests are checked out locally, annotate local branches with corresponding merge request numbers.
     If only one MR has been checked out, then switch the local repository's HEAD to its source branch.
 
     When the current user is NOT the author of the MR associated with that branch, adds ``rebase=no push=no`` branch qualifiers used by ``git machete traverse``,
@@ -73,7 +73,7 @@ Creates, checks out and manages GitLab MRs while keeping them reflected in branc
 
     **Parameters:**
 
-    ``<MR-number-1> ... <MR-number-N>``    Pull request numbers to checkout.
+    ``<MR-number-1> ... <MR-number-N>``    Merge request numbers to checkout.
 
 ``create-mr [--draft] [--title=<title>] [--yes]``:
     Creates a MR for the current branch, using the upstream (parent) branch as the MR source branch.
diff --git a/git_machete/generated_docs.py b/git_machete/generated_docs.py
index 7e58566..af04dc6 100644
--- a/git_machete/generated_docs.py
+++ b/git_machete/generated_docs.py
@@ -728,7 +728,7 @@ long_docs: Dict[str, str] = {
 
         Creates, checks out and manages GitLab MRs while keeping them reflected in branch layout file.
 
-        To allow GitLab API access for private repositories (and also to perform side-effecting actions like opening a PR,
+        To allow GitLab API access for private projects (and also to perform side-effecting actions like opening a MR,
         even in case of public projects), a GitLab API token with `api` scope is required, see https://gitlab.com/-/user_settings/personal_access_tokens.
         This will be resolved from the first of:
            * `GITLAB_TOKEN` env var,
@@ -765,9 +765,9 @@ long_docs: Dict[str, str] = {
 
            `checkout-mrs [--all | --by=<gitlab-login> | --mine | <MR-number-1> ... <MR-number-N>]`:
  
-              Check out the source branch of the given pull requests (specified by numbers or by a flag),
-              also traverse chain of pull requests upwards, adding branches one by one to git-machete and check them out locally.
-              Once the specified pull requests are checked out locally, annotate local branches with corresponding pull request numbers.
+              Check out the source branch of the given merge requests (specified by numbers or by a flag),
+              also traverse chain of merge requests upwards, adding branches one by one to git-machete and check them out locally.
+              Once the specified merge requests are checked out locally, annotate local branches with corresponding merge request numbers.
               If only one MR has been checked out, then switch the local repository's HEAD to its source branch.
 
               When the current user is NOT the author of the MR associated with that branch, adds `rebase=no push=no` branch qualifiers used by `git machete traverse`,
@@ -787,7 +787,7 @@ long_docs: Dict[str, str] = {
 
               <b>Parameters:</b>
 
-              `<MR-number-1> ... <MR-number-N>`    Pull request numbers to checkout.
+              `<MR-number-1> ... <MR-number-N>`    Merge request numbers to checkout.
 
            `create-mr [--draft] [--title=<title>] [--yes]`:
  
diff --git a/git_machete/gitlab.py b/git_machete/gitlab.py
index ede15b6..3fc9c2f 100644
--- a/git_machete/gitlab.py
+++ b/git_machete/gitlab.py
@@ -215,7 +215,7 @@ class GitLabClient(CodeHostingClient):
                         f"ended up in `{error_response.get('message')}` response from GitLab.\n"
                         "Please report this error as a comment under `https://github.com/VirtusLab/git-machete/issues/1212`.\n"
                         "As a workaround for now, please check `git remote -v`.\n"
-                        "Most likely you use an old URL of a repository that has been moved since.\n"
+                        "Most likely you use an old URL of a project that has been moved since.\n"
                         "Use `git remote set-url <remote> <URL>` to update the URL.")
                 else:
                     UnexpectedMacheteException(


Test patch:
diff --git a/tests/mockers_gitlab.py b/tests/mockers_gitlab.py
index 163b88c..568980d 100644
--- a/tests/mockers_gitlab.py
+++ b/tests/mockers_gitlab.py
@@ -28,7 +28,7 @@ def mock_mr_json(head: str, base: str, number: int,
                  draft: bool = False
                  ) -> Dict[str, Any]:
     return {
-        'title': 'Draft: PR title' if draft else 'PR title',
+        'title': 'Draft: MR title' if draft else 'MR title',
         'source_branch': head,
         'source_project_id': repo_id,
         'target_branch': base,
@@ -143,7 +143,7 @@ def __mock_urlopen_impl(gitlab_api_state: MockGitLabAPIState, request: Request)
             head: Optional[str] = query_params.get('source_branch')
             if head:
                 mrs = gitlab_api_state.get_open_mrs_by_head(head)
-                # If no matching PRs are found, the real GitLab returns 200 OK with an empty JSON array - not 404.
+                # If no matching MRs are found, the real GitLab returns 200 OK with an empty JSON array - not 404.
                 return MockAPIResponse(HTTPStatus.OK, mrs)
             else:
                 mrs = gitlab_api_state.get_open_mrs()
diff --git a/tests/test_gitlab.py b/tests/test_gitlab.py
index aa171b7..e3ef9cd 100644
--- a/tests/test_gitlab.py
+++ b/tests/test_gitlab.py
@@ -40,14 +40,14 @@ class TestGitLab(BaseTest):
             assert org_and_repo.organization == organization
             assert org_and_repo.repository == repository
 
-    PR_COUNT_FOR_TEST_GITLAB_API_PAGINATION = 12
+    MR_COUNT_FOR_TEST_GITLAB_API_PAGINATION = 12
 
     @staticmethod
     def gitlab_api_state_for_test_gitlab_api_pagination() -> MockGitLabAPIState:
         return MockGitLabAPIState.with_mrs(*[
             mock_mr_json(
                 head=f'feature_{i:02d}', base='develop', number=i
-            ) for i in range(TestGitLab.PR_COUNT_FOR_TEST_GITLAB_API_PAGINATION)])
+            ) for i in range(TestGitLab.MR_COUNT_FOR_TEST_GITLAB_API_PAGINATION)])
 
     def test_gitlab_api_pagination(self, mocker: MockerFixture) -> None:
         self.patch_symbol(mocker, 'builtins.input', mock_input_returning_y)
@@ -61,14 +61,14 @@ class TestGitLab(BaseTest):
             .commit("first commit")
             .push()
         )
-        for i in range(self.PR_COUNT_FOR_TEST_GITLAB_API_PAGINATION):
+        for i in range(self.MR_COUNT_FOR_TEST_GITLAB_API_PAGINATION):
             self.repo_sandbox.check_out('develop').new_branch(f'feature_{i:02d}').commit().push()
         self.repo_sandbox.check_out('develop')
-        body: str = 'develop *\n' + '\n'.join([f'feature_{i:02d}' for i in range(self.PR_COUNT_FOR_TEST_GITLAB_API_PAGINATION)]) + '\n'
+        body: str = 'develop *\n' + '\n'.join([f'feature_{i:02d}' for i in range(self.MR_COUNT_FOR_TEST_GITLAB_API_PAGINATION)]) + '\n'
         rewrite_branch_layout_file(body)
 
         self.repo_sandbox.check_out('develop')
-        for i in range(self.PR_COUNT_FOR_TEST_GITLAB_API_PAGINATION):
+        for i in range(self.MR_COUNT_FOR_TEST_GITLAB_API_PAGINATION):
             self.repo_sandbox.delete_branch(f"feature_{i:02d}")
         body = 'develop *\n'
         rewrite_branch_layout_file(body)
@@ -76,7 +76,7 @@ class TestGitLab(BaseTest):
         launch_command('gitlab', 'checkout-mrs', '--all')
         launch_command('discover', '--checked-out-since=1 day ago')
         expected_status_output = 'develop *\n' + '\n'.join([f'|\no-feature_{i:02d}  rebase=no push=no'
-                                                            for i in range(self.PR_COUNT_FOR_TEST_GITLAB_API_PAGINATION)]) + '\n'
+                                                            for i in range(self.MR_COUNT_FOR_TEST_GITLAB_API_PAGINATION)]) + '\n'
         assert_success(['status'], expected_status_output)
 
     def test_gitlab_enterprise_domain_unauthorized_without_token(self, mocker: MockerFixture) -> None:
diff --git a/tests/test_gitlab_checkout_mrs.py b/tests/test_gitlab_checkout_mrs.py
index 09480aa..a9c35e1 100644
--- a/tests/test_gitlab_checkout_mrs.py
+++ b/tests/test_gitlab_checkout_mrs.py
@@ -112,7 +112,7 @@ class TestGitLabCheckoutMRs(BaseTest):
             """
         rewrite_branch_layout_file(body)
 
-        # not broken chain of pull requests (root found in dependency tree)
+        # not broken chain of merge requests (root found in dependency tree)
         launch_command('gitlab', 'checkout-mrs', '18')
         assert_success(
             ["status"],
@@ -138,7 +138,7 @@ class TestGitLabCheckoutMRs(BaseTest):
                     o-chore/redundant_checks *  MR !18 (some_other_user) rebase=no push=no
             """
         )
-        # broken chain of pull requests (add new root)
+        # broken chain of merge requests (add new root)
         launch_command('gitlab', 'checkout-mrs', '24')
         assert_success(
             ["status"],
@@ -171,7 +171,7 @@ class TestGitLabCheckoutMRs(BaseTest):
             """
         )
 
-        # broken chain of pull requests (branches already added)
+        # broken chain of merge requests (branches already added)
         launch_command('gitlab', 'checkout-mrs', '24')
         assert_success(
             ["status"],
@@ -253,7 +253,7 @@ class TestGitLabCheckoutMRs(BaseTest):
         expected_msg = "Checking for open GitLab MRs... OK\n"
         assert_success(['gitlab', 'checkout-mrs', '--by', 'some_other_user'], expected_msg)
 
-        # Check against closed pull request with source branch deleted from remote
+        # Check against closed merge request with source branch deleted from remote
         self.repo_sandbox.create_repo("other-local", bare=False, switch_dir_to_new_repo=True)
         (
             self.repo_sandbox
diff --git a/tests/test_gitlab_retarget_mr.py b/tests/test_gitlab_retarget_mr.py
index 61c43d8..4e8a189 100644
--- a/tests/test_gitlab_retarget_mr.py
+++ b/tests/test_gitlab_retarget_mr.py
@@ -75,7 +75,7 @@ class TestGitLabRetargetMR(BaseTest):
             ended up in Non GET methods are not allowed for moved projects response from GitLab.
             Please report this error as a comment under https://github.com/VirtusLab/git-machete/issues/1212.
             As a workaround for now, please check git remote -v.
-            Most likely you use an old URL of a repository that has been moved since.
+            Most likely you use an old URL of a project that has been moved since.
             Use git remote set-url <remote> <URL> to update the URL."""
         )