summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-03 11:17:55 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-07-03 11:17:55 +0000
commit063b035d931d0676cf427fa8de49966360cbf42b (patch)
tree2b47a0aac0196a7fdbba66b716b7bb76f7d4a675 /spec/controllers
parent2443ab69206f7cbd9a6ac2e96308695a01b85c7a (diff)
parentb8430dddbd413c87f77ba7f02d9b0a0cd4ec42ad (diff)
downloadgitlab-ce-063b035d931d0676cf427fa8de49966360cbf42b.tar.gz
Merge branch '34116-milestone-filtering-on-group-issues' into 'master'
Use correct milestones for filtering on Group Issues Closes #34116 See merge request !12374
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/groups/milestones_controller_spec.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/spec/controllers/groups/milestones_controller_spec.rb b/spec/controllers/groups/milestones_controller_spec.rb
index f3263bc177d..c6e5fb61cf9 100644
--- a/spec/controllers/groups/milestones_controller_spec.rb
+++ b/spec/controllers/groups/milestones_controller_spec.rb
@@ -23,6 +23,21 @@ describe Groups::MilestonesController do
project.team << [user, :master]
end
+ describe "#index" do
+ it 'shows group milestones page' do
+ get :index, group_id: group.to_param
+
+ expect(response).to have_http_status(200)
+ end
+
+ it 'shows group milestones JSON' do
+ get :index, group_id: group.to_param, format: :json
+
+ expect(response).to have_http_status(200)
+ expect(response.content_type).to eq 'application/json'
+ end
+ end
+
it_behaves_like 'milestone tabs'
describe "#create" do