Merge branch '362277-update-delegation-of-wip_title-to-draft_title' into 'master'

Migrate uses of #wip_title to #draft_title

See merge request gitlab-org/gitlab!88219

app/services/merge_requests/base_service.rb

@@ -121,16 +121,16 @@ def update(merge_request)
     override :handle_quick_actions
     def handle_quick_actions(merge_request)
       super
-      handle_wip_event(merge_request)
+      handle_draft_event(merge_request)
     end
-    def handle_wip_event(merge_request)
-      if wip_event = params.delete(:wip_event)
+    def handle_draft_event(merge_request)
+      if draft_event = params.delete(:wip_event)
         # We update the title that is provided in the params or we use the mr title
         title = params[:title] || merge_request.title
-        params[:title] = case wip_event
-                         when 'wip' then MergeRequest.wip_title(title)
-                         when 'unwip' then MergeRequest.wipless_title(title)
+        params[:title] = case draft_event
+                         when 'wip' then MergeRequest.draft_title(title)
+                         when 'unwip' then MergeRequest.draftless_title(title)
                          end
       end
     end

app/services/merge_requests/build_service.rb

@@ -46,7 +46,7 @@ def execute
              :source_branch_ref,
              :source_project,
              :compare_commits,
-             :wip_title,
+             :draft_title,
              :description,
              :first_multiline_commit,
              :errors,
@@ -206,7 +206,7 @@ def target_branch_exists?
     def set_draft_title_if_needed
       return unless compare_commits.empty? || Gitlab::Utils.to_boolean(params[:draft])
-      merge_request.title = wip_title
+      merge_request.title = draft_title
     end
     # When your branch name starts with an iid followed by a dash this pattern will be

ee/spec/features/merge_trains/two_merge_requests_on_train_spec.rb

@@ -201,7 +201,7 @@
   context 'when merge request 1 is not mergeable' do
     before do
-      merge_request_1.update!(title: merge_request_1.wip_title)
+      merge_request_1.update!(title: merge_request_1.draft_title)
       merge_request_1.merge_train.pipeline.succeed!
       merge_request_1.reload

ee/spec/services/auto_merge/add_to_merge_train_when_pipeline_succeeds_service_spec.rb

@@ -160,7 +160,7 @@
     context 'when merge request is not mergeable' do
       before do
-        merge_request.update!(title: merge_request.wip_title)
+        merge_request.update!(title: merge_request.draft_title)
       end
       it { is_expected.to eq(false) }

ee/spec/services/ee/merge_requests/create_pipeline_service_spec.rb

@@ -89,9 +89,9 @@
       end
     end
-    context 'when merge request is WIP' do
+    context 'when merge request is a draft' do
       before do
-        merge_request.update!(title: merge_request.wip_title)
+        merge_request.update!(title: merge_request.draft_title)
       end
       context 'when remove_mergeable_state_check is true' do

ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb

@@ -103,9 +103,9 @@
       end
     end
-    context 'when merge request is not under a mergeable state' do
+    context 'when merge request is not in a mergeable state' do
       before do
-        merge_request.update!(title: merge_request.wip_title)
+        merge_request.update!(title: merge_request.draft_title)
       end
       it_behaves_like 'drops the merge request from the merge train' do

spec/controllers/projects/merge_requests_controller_spec.rb

@@ -1730,7 +1730,7 @@ def go(format: 'html')
   describe 'POST remove_wip' do
     before do
-      merge_request.title = merge_request.wip_title
+      merge_request.title = merge_request.draft_title
       merge_request.save!
       post :remove_wip,
@@ -1743,8 +1743,8 @@ def go(format: 'html')
         xhr: true
     end
-    it 'removes the wip status' do
-      expect(merge_request.reload.title).to eq(merge_request.wipless_title)
+    it 'removes the draft status' do
+      expect(merge_request.reload.title).to eq(merge_request.draftless_title)
     end
     it 'renders MergeRequest as JSON' do

spec/graphql/resolvers/merge_requests_resolver_spec.rb

@@ -174,7 +174,7 @@
     context 'with draft argument' do
       before do
-        merge_request_4.update!(title: MergeRequest.wip_title(merge_request_4.title))
+        merge_request_4.update!(title: MergeRequest.draft_title(merge_request_4.title))
       end
       context 'with draft: true argument' do

spec/models/merge_request_spec.rb

@@ -1472,20 +1472,20 @@ def set_compare(merge_request)
     end
   end
-  describe "#wipless_title" do
+  describe "#draftless_title" do
     subject { build_stubbed(:merge_request) }
     ['draft:', 'Draft: ', '[Draft]', '[DRAFT] '].each do |draft_prefix|
       it "removes a '#{draft_prefix}' prefix" do
-        wipless_title = subject.title
+        draftless_title = subject.title
         subject.title = "#{draft_prefix}#{subject.title}"
-        expect(subject.wipless_title).to eq wipless_title
+        expect(subject.draftless_title).to eq draftless_title
       end
       it "is satisfies the #work_in_progress? method" do
         subject.title = "#{draft_prefix}#{subject.title}"
-        subject.title = subject.wipless_title
+        subject.title = subject.draftless_title
         expect(subject.work_in_progress?).to eq false
       end
@@ -1497,58 +1497,58 @@ def set_compare(merge_request)
       it "doesn't remove a '#{wip_prefix}' prefix" do
         subject.title = "#{wip_prefix}#{subject.title}"
-        expect(subject.wipless_title).to eq subject.title
+        expect(subject.draftless_title).to eq subject.title
       end
     end
     it 'removes only draft prefix from the MR title' do
       subject.title = 'Draft: Implement feature called draft'
-      expect(subject.wipless_title).to eq 'Implement feature called draft'
+      expect(subject.draftless_title).to eq 'Implement feature called draft'
     end
     it 'does not remove WIP in the middle of the title' do
       subject.title = 'Something with WIP in the middle'
-      expect(subject.wipless_title).to eq subject.title
+      expect(subject.draftless_title).to eq subject.title
     end
     it 'does not remove Draft in the middle of the title' do
       subject.title = 'Something with Draft in the middle'
-      expect(subject.wipless_title).to eq subject.title
+      expect(subject.draftless_title).to eq subject.title
     end
     it 'does not remove WIP at the end of the title' do
       subject.title = 'Something ends with WIP'
-      expect(subject.wipless_title).to eq subject.title
+      expect(subject.draftless_title).to eq subject.title
     end
     it 'does not remove Draft at the end of the title' do
       subject.title = 'Something ends with Draft'
-      expect(subject.wipless_title).to eq subject.title
+      expect(subject.draftless_title).to eq subject.title
     end
   end
-  describe "#wip_title" do
+  describe "#draft_title" do
     it "adds the Draft: prefix to the title" do
-      wip_title = "Draft: #{subject.title}"
-      expect(subject.wip_title).to eq wip_title
+      draft_title = "Draft: #{subject.title}"
+      expect(subject.draft_title).to eq draft_title
     end
     it "does not add the Draft: prefix multiple times" do
-      wip_title = "Draft: #{subject.title}"
-      subject.title = subject.wip_title
-      subject.title = subject.wip_title
-      expect(subject.wip_title).to eq wip_title
+      draft_title = "Draft: #{subject.title}"
+      subject.title = subject.draft_title
+      subject.title = subject.draft_title
+      expect(subject.draft_title).to eq draft_title
     end
     it "is satisfies the #work_in_progress? method" do
-      subject.title = subject.wip_title
+      subject.title = subject.draft_title
       expect(subject.work_in_progress?).to eq true
     end

spec/services/quick_actions/interpret_service_spec.rb

@@ -333,14 +333,14 @@
     shared_examples 'undraft command' do
       it 'returns wip_event: "unwip" if content contains /draft' do
-        issuable.update!(title: issuable.wip_title)
+        issuable.update!(title: issuable.draft_title)
         _, updates, _ = service.execute(content, issuable)
         expect(updates).to eq(wip_event: 'unwip')
       end
       it 'returns the unwip message' do
-        issuable.update!(title: issuable.wip_title)
+        issuable.update!(title: issuable.draft_title)
         _, _, message = service.execute(content, issuable)
         expect(message).to eq("Unmarked this #{issuable.to_ability_name.humanize(capitalize: false)} as a draft.")