summaryrefslogtreecommitdiff
path: root/spec/controllers/groups
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-01-25 13:22:34 +0000
committerSean McGivern <sean@gitlab.com>2019-01-25 13:22:34 +0000
commitdfa31d5f2fa4a6c71c992710b9d1786707b4c912 (patch)
tree0494d10254b2f608d8f48917abe486a346363647 /spec/controllers/groups
parent04c9ab3183610017b8c2803b6a48a597fb86d8c1 (diff)
parent22eb2e4c227b060981bb37708222cdd07e825542 (diff)
downloadgitlab-ce-dfa31d5f2fa4a6c71c992710b9d1786707b4c912.tar.gz
Merge branch '54905-milestone-search' into 'master'
Resolve "Milestone search" Closes #54905 See merge request gitlab-org/gitlab-ce!24265
Diffstat (limited to 'spec/controllers/groups')
-rw-r--r--spec/controllers/groups/milestones_controller_spec.rb31
1 files changed, 28 insertions, 3 deletions
diff --git a/spec/controllers/groups/milestones_controller_spec.rb b/spec/controllers/groups/milestones_controller_spec.rb
index 40d991a669c..043cf28514b 100644
--- a/spec/controllers/groups/milestones_controller_spec.rb
+++ b/spec/controllers/groups/milestones_controller_spec.rb
@@ -32,10 +32,35 @@ describe Groups::MilestonesController do
end
describe '#index' do
- it 'shows group milestones page' do
- get :index, params: { group_id: group.to_param }
+ describe 'as HTML' do
+ render_views
- expect(response).to have_gitlab_http_status(200)
+ it 'shows group milestones page' do
+ milestone
+
+ get :index, params: { group_id: group.to_param }
+
+ expect(response).to have_gitlab_http_status(200)
+ expect(response.body).to include(milestone.title)
+ end
+
+ it 'searches legacy milestones by title when search_title is given' do
+ project_milestone = create(:milestone, project: project, title: 'Project milestone title')
+
+ get :index, params: { group_id: group.to_param, search_title: 'Project mil' }
+
+ expect(response.body).to include(project_milestone.title)
+ expect(response.body).not_to include(milestone.title)
+ end
+
+ it 'searches group milestones by title when search_title is given' do
+ group_milestone = create(:milestone, title: 'Group milestone title', group: group)
+
+ get :index, params: { group_id: group.to_param, search_title: 'Group mil' }
+
+ expect(response.body).to include(group_milestone.title)
+ expect(response.body).not_to include(milestone.title)
+ end
end
context 'as JSON' do