Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2024-01-05 12:11:29 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2024-01-05 12:11:29 +0300
commitfc23bd54a1a49003eda83bc2331d9b8b8417a91b (patch)
tree9c90d537ac9477541488d974b8bc9493baa91daf /spec/support
parent309dbdc49533a76243003a3f662736ae0b0ec14a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/shared_examples/quick_actions/merge_request/rebase_quick_action_shared_examples.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/shared_examples/quick_actions/merge_request/rebase_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/merge_request/rebase_quick_action_shared_examples.rb
index 92705fc1b4d..2c38c716736 100644
--- a/spec/support/shared_examples/quick_actions/merge_request/rebase_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/merge_request/rebase_quick_action_shared_examples.rb
@@ -59,7 +59,7 @@ RSpec.shared_examples 'rebase quick action' do
it 'tells the user a rebase is in progress' do
add_note('/rebase')
- expect(page).to have_content 'A rebase is already in progress.'
+ expect(page).to have_content Gitlab::QuickActions::MergeRequestActions::REBASE_FAILURE_REBASE_IN_PROGRESS
expect(page).not_to have_content 'Scheduled a rebase'
end
end
@@ -70,7 +70,7 @@ RSpec.shared_examples 'rebase quick action' do
it 'does not rebase the MR' do
add_note("/rebase")
- expect(page).to have_content 'This merge request cannot be rebased while there are conflicts.'
+ expect(page).to have_content Gitlab::QuickActions::MergeRequestActions::REBASE_FAILURE_UNMERGEABLE
end
end
@@ -89,7 +89,7 @@ RSpec.shared_examples 'rebase quick action' do
it 'does not rebase the MR' do
add_note("/rebase")
- expect(page).to have_content 'This merge request branch is protected from force push.'
+ expect(page).to have_content Gitlab::QuickActions::MergeRequestActions::REBASE_FAILURE_PROTECTED_BRANCH
end
end
end