Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/features/groups/milestones/milestone_editing_spec.rb b/spec/features/groups/milestones/milestone_editing_spec.rb
new file mode 100644
index 00000000000..b3c7cfe88af
--- /dev/null
+++ b/spec/features/groups/milestones/milestone_editing_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe "Milestone editing", feature_category: :team_planning do
+  let_it_be(:group) { create(:group, owner: user) }
+  let_it_be(:user) { create(:group_member, :maintainer, user: create(:user), group: group).user }
+
+  let(:milestone) { create(:milestone, group: group, title: "12345676543") }
+
+  before do
+    sign_in(user)
+
+    visit(edit_group_milestone_path(group, milestone))
+  end
+
+  it_behaves_like 'milestone handling version conflicts'
+end