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:
Diffstat (limited to 'spec/features/merge_request/user_sees_wip_help_message_spec.rb')
-rw-r--r--spec/features/merge_request/user_sees_wip_help_message_spec.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/spec/features/merge_request/user_sees_wip_help_message_spec.rb b/spec/features/merge_request/user_sees_wip_help_message_spec.rb
index 42fe18cfc93..204df5b3995 100644
--- a/spec/features/merge_request/user_sees_wip_help_message_spec.rb
+++ b/spec/features/merge_request/user_sees_wip_help_message_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe 'Merge request > User sees WIP help message' do
+RSpec.describe 'Merge request > User sees draft help message' do
let(:project) { create(:project, :public, :repository) }
let(:user) { project.creator }
@@ -11,8 +11,8 @@ RSpec.describe 'Merge request > User sees WIP help message' do
sign_in(user)
end
- context 'with WIP commits' do
- it 'shows a specific WIP hint' do
+ context 'with draft commits' do
+ it 'shows a specific draft hint' do
visit project_new_merge_request_path(
project,
merge_request: {
@@ -24,14 +24,14 @@ RSpec.describe 'Merge request > User sees WIP help message' do
within_wip_explanation do
expect(page).to have_text(
- 'It looks like you have some WIP commits in this branch'
+ 'It looks like you have some draft commits in this branch'
)
end
end
end
- context 'without WIP commits' do
- it 'shows the regular WIP message' do
+ context 'without draft commits' do
+ it 'shows the regular draft message' do
visit project_new_merge_request_path(
project,
merge_request: {
@@ -43,11 +43,11 @@ RSpec.describe 'Merge request > User sees WIP help message' do
within_wip_explanation do
expect(page).not_to have_text(
- 'It looks like you have some WIP commits in this branch'
+ 'It looks like you have some draft commits in this branch'
)
expect(page).to have_text(
- "Start the title with WIP: to prevent a Work In Progress merge \
-request from being merged before it's ready"
+ "Start the title with Draft: or WIP: to prevent a merge request that is a \
+work in progress from being merged before it's ready."
)
end
end