Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules

* upstream/master: (126 commits)
  Update VERSION to 10.3.0-pre
  Update CHANGELOG.md for 10.2.0
  default fill color for SVGs
  ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`
  Use Redis cache for branch existence checks
  Update CONTRIBUTING.md: Link definition of done to criteria
  Use `make install` for Gitaly setups in non-test environments
  FileUploader should check for hashed_storage?(:attachments) to use disk_path
  Set the default gitlab-shell timeout to 3 hours
  Update composite pipelines index to include "id"
  Use arrays in Pipeline#latest_builds_with_artifacts
  Fix blank states using old css
  Skip confirmation user api
  Custom issue tracker
  Revert "check for `read_only?` first before seeing if request is disallowed"
  add `#with_metadata` scope to remove a N+1 from the notes' API
  Fix promoting milestone updating all issuables without milestone
  Batchload blobs for diff generation
  check for `read_only?` first before seeing if request is disallowed
  use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers`
  ...

1 files changed, 36 insertions, 0 deletions

diff --git a/spec/services/milestones/promote_service_spec.rb b/spec/services/milestones/promote_service_spec.rb
index 9f2df6d6d19..a0a2843b676 100644
--- a/spec/services/milestones/promote_service_spec.rb
+++ b/spec/services/milestones/promote_service_spec.rb
@@ -25,6 +25,18 @@ describe Milestones::PromoteService do
 
         expect { service.execute(milestone) }.to raise_error(described_class::PromoteMilestoneError)
       end
+
+      it 'does not promote milestone and update issuables if promoted milestone is not valid' do
+        issue = create(:issue, milestone: milestone, project: project)
+        merge_request = create(:merge_request, milestone: milestone, source_project: project)
+        allow_any_instance_of(Milestone).to receive(:valid?).and_return(false)
+
+        expect { service.execute(milestone) }.to raise_error(described_class::PromoteMilestoneError)
+
+        expect(milestone.reload).to be_persisted
+        expect(issue.reload.milestone).to eq(milestone)
+        expect(merge_request.reload.milestone).to eq(milestone)
+      end
     end
 
     context 'without duplicated milestone titles across projects' do
@@ -34,6 +46,16 @@ describe Milestones::PromoteService do
         expect(promoted_milestone).to be_group_milestone
       end
 
+      it 'does not update issuables without milestone with the new promoted milestone' do
+        issue_without_milestone = create(:issue, project: project, milestone: nil)
+        merge_request_without_milestone = create(:merge_request, milestone: nil, source_project: project)
+
+        service.execute(milestone)
+
+        expect(issue_without_milestone.reload.milestone).to be_nil
+        expect(merge_request_without_milestone.reload.milestone).to be_nil
+      end
+
       it 'sets issuables with new promoted milestone' do
         issue = create(:issue, milestone: milestone, project: project)
         merge_request = create(:merge_request, milestone: milestone, source_project: project)
@@ -59,6 +81,20 @@ describe Milestones::PromoteService do
         expect(Milestone.exists?(milestone_2.id)).to be_falsy
       end
 
+      it 'does not update issuables without milestone with the new promoted milestone' do
+        issue_without_milestone_1 = create(:issue, project: project, milestone: nil)
+        issue_without_milestone_2 = create(:issue, project: project_2, milestone: nil)
+        merge_request_without_milestone_1 = create(:merge_request, milestone: nil, source_project: project)
+        merge_request_without_milestone_2 = create(:merge_request, milestone: nil, source_project: project_2)
+
+        service.execute(milestone)
+
+        expect(issue_without_milestone_1.reload.milestone).to be_nil
+        expect(issue_without_milestone_2.reload.milestone).to be_nil
+        expect(merge_request_without_milestone_1.reload.milestone).to be_nil
+        expect(merge_request_without_milestone_2.reload.milestone).to be_nil
+      end
+
       it 'sets all issuables with new promoted milestone' do
         issue = create(:issue, milestone: milestone, project: project)
         issue_2 = create(:issue, milestone: milestone_2, project: project_2)