diff options
author | Jarka Kadlecová <jarka@gitlab.com> | 2018-08-06 11:05:44 +0200 |
---|---|---|
committer | Jarka Kadlecová <jarka@gitlab.com> | 2018-08-06 14:18:21 +0200 |
commit | 6dc7490789237a84b66baaaf4c6deea5ec3bf2de (patch) | |
tree | 0753dac4c896896eeae88a3aa0f92de433839e9f /spec | |
parent | 02b077925dedca390be3e8c4c7960d89ea8d4c6e (diff) | |
download | gitlab-ce-6dc7490789237a84b66baaaf4c6deea5ec3bf2de.tar.gz |
Add changes from the EE
Diffstat (limited to 'spec')
-rw-r--r-- | spec/requests/api/todos_spec.rb | 14 | ||||
-rw-r--r-- | spec/services/todos/destroy/group_private_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/todos/destroy/project_private_service_spec.rb | 1 |
3 files changed, 14 insertions, 3 deletions
diff --git a/spec/requests/api/todos_spec.rb b/spec/requests/api/todos_spec.rb index 2ee8d150dc8..b5cf04e7f22 100644 --- a/spec/requests/api/todos_spec.rb +++ b/spec/requests/api/todos_spec.rb @@ -1,7 +1,8 @@ require 'spec_helper' describe API::Todos do - let(:project_1) { create(:project, :repository) } + let(:group) { create(:group) } + let(:project_1) { create(:project, :repository, group: group) } let(:project_2) { create(:project) } let(:author_1) { create(:user) } let(:author_2) { create(:user) } @@ -92,6 +93,17 @@ describe API::Todos do end end + context 'and using the group filter' do + it 'filters based on project_id param' do + get api('/todos', john_doe), { group_id: group.id, sort: :target_id } + + expect(response.status).to eq(200) + expect(response).to include_pagination_headers + expect(json_response).to be_an Array + expect(json_response.length).to eq(2) + end + end + context 'and using the action filter' do it 'filters based on action param' do get api('/todos', john_doe), { action: 'mentioned' } diff --git a/spec/services/todos/destroy/group_private_service_spec.rb b/spec/services/todos/destroy/group_private_service_spec.rb index c4ee6ebed50..2f49b68f544 100644 --- a/spec/services/todos/destroy/group_private_service_spec.rb +++ b/spec/services/todos/destroy/group_private_service_spec.rb @@ -33,7 +33,7 @@ describe Todos::Destroy::GroupPrivateService do expect(project_member.todos).to match_array([todo_project_member]) end - context 'with nested groups' do + context 'with nested groups', :nested_groups do let(:parent_group) { create(:group) } let(:subgroup) { create(:group, :private, parent: group) } let(:subproject) { create(:project, group: subgroup) } diff --git a/spec/services/todos/destroy/project_private_service_spec.rb b/spec/services/todos/destroy/project_private_service_spec.rb index 9ebc0231795..128d3487514 100644 --- a/spec/services/todos/destroy/project_private_service_spec.rb +++ b/spec/services/todos/destroy/project_private_service_spec.rb @@ -10,7 +10,6 @@ describe Todos::Destroy::ProjectPrivateService do let!(:todo_non_member) { create(:todo, user: user, project: project) } let!(:todo2_non_member) { create(:todo, user: user, project: project) } let!(:todo_member) { create(:todo, user: project_member, project: project) } - let!(:todo_member) { create(:todo, user: project_member, project: project) } let!(:todo_group_member) { create(:todo, user: group_member, project: project) } describe '#execute' do |