diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /spec/requests/groups | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'spec/requests/groups')
3 files changed, 12 insertions, 28 deletions
diff --git a/spec/requests/groups/crm/contacts_controller_spec.rb b/spec/requests/groups/crm/contacts_controller_spec.rb index 4d8ca0fcd60..0ee72233418 100644 --- a/spec/requests/groups/crm/contacts_controller_spec.rb +++ b/spec/requests/groups/crm/contacts_controller_spec.rb @@ -85,28 +85,19 @@ RSpec.describe Groups::Crm::ContactsController do end describe 'GET #index' do - subject do - get group_crm_contacts_path(group) - response - end + subject { get group_crm_contacts_path(group) } it_behaves_like 'ok response with index template if authorized' end describe 'GET #new' do - subject do - get new_group_crm_contact_path(group) - response - end + subject { get new_group_crm_contact_path(group) } it_behaves_like 'ok response with index template if authorized' end describe 'GET #edit' do - subject do - get edit_group_crm_contact_path(group, id: 1) - response - end + subject { get edit_group_crm_contact_path(group, id: 1) } it_behaves_like 'ok response with index template if authorized' end diff --git a/spec/requests/groups/crm/organizations_controller_spec.rb b/spec/requests/groups/crm/organizations_controller_spec.rb index 37ffac71772..410fc979262 100644 --- a/spec/requests/groups/crm/organizations_controller_spec.rb +++ b/spec/requests/groups/crm/organizations_controller_spec.rb @@ -85,18 +85,19 @@ RSpec.describe Groups::Crm::OrganizationsController do end describe 'GET #index' do - subject do - get group_crm_organizations_path(group) - response - end + subject { get group_crm_organizations_path(group) } it_behaves_like 'ok response with index template if authorized' end describe 'GET #new' do - subject do - get new_group_crm_organization_path(group) - end + subject { get new_group_crm_organization_path(group) } + + it_behaves_like 'ok response with index template if authorized' + end + + describe 'GET #edit' do + subject { get edit_group_crm_organization_path(group, id: 1) } it_behaves_like 'ok response with index template if authorized' end diff --git a/spec/requests/groups/email_campaigns_controller_spec.rb b/spec/requests/groups/email_campaigns_controller_spec.rb index 9ed828d1a9a..4d630ef6710 100644 --- a/spec/requests/groups/email_campaigns_controller_spec.rb +++ b/spec/requests/groups/email_campaigns_controller_spec.rb @@ -94,7 +94,7 @@ RSpec.describe Groups::EmailCampaignsController do describe 'track parameter' do context 'when valid' do - where(track: [Namespaces::InProductMarketingEmailsService::TRACKS.keys.without(:experience), Namespaces::InviteTeamEmailService::TRACK].flatten) + where(track: Namespaces::InProductMarketingEmailsService::TRACKS.keys.without(:experience)) with_them do it_behaves_like 'track and redirect' @@ -117,10 +117,6 @@ RSpec.describe Groups::EmailCampaignsController do with_them do it_behaves_like 'track and redirect' end - - it_behaves_like 'track and redirect' do - let(:track) { Namespaces::InviteTeamEmailService::TRACK.to_s } - end end context 'when invalid' do @@ -128,10 +124,6 @@ RSpec.describe Groups::EmailCampaignsController do with_them do it_behaves_like 'no track and 404' - - it_behaves_like 'no track and 404' do - let(:track) { Namespaces::InviteTeamEmailService::TRACK.to_s } - end end end end |