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:
authorFilipa Lacerda <filipa@gitlab.com>2018-03-07 19:43:29 +0300
committerFilipa Lacerda <filipa@gitlab.com>2018-03-07 19:43:29 +0300
commitce819eceea58f1452f59ffc275a4c8cb6c5da0d8 (patch)
treeeb4ae38b9eb1e99b2570b352b457dba878297d81 /spec/controllers
parent5afa1c6e6aad2c5adaefecd1d81d9da8c7317191 (diff)
parenta16547e5c2d42bfe7af025556e90f0f895a97f59 (diff)
Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'
Resolve: Modal and banner designs for project label and project milestone promotion Closes #41895 See merge request gitlab-org/gitlab-ce!17197
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/milestones_controller_spec.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/controllers/projects/milestones_controller_spec.rb b/spec/controllers/projects/milestones_controller_spec.rb
index 00cf464ec5b..306094f7ffb 100644
--- a/spec/controllers/projects/milestones_controller_spec.rb
+++ b/spec/controllers/projects/milestones_controller_spec.rb
@@ -98,10 +98,8 @@ describe Projects::MilestonesController do
it 'shows group milestone' do
post :promote, namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid
- group_milestone = assigns(:milestone)
-
- expect(response).to redirect_to(group_milestone_path(project.group, group_milestone.iid))
- expect(flash[:notice]).to eq('Milestone has been promoted to group milestone.')
+ expect(flash[:notice]).to eq("#{milestone.title} promoted to group milestone")
+ expect(response).to redirect_to(project_milestones_path(project))
end
end