Skip to content
Snippets Groups Projects
Commit 8a3458ec authored by Lee Tickett's avatar Lee Tickett :red_circle:
Browse files

Fix specs

parent a2ccb3b6
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,7 @@ For more information about what is planned for the future, see [issue 2256](http ...@@ -34,7 +34,7 @@ For more information about what is planned for the future, see [issue 2256](http
## Enable customer relations management (CRM) ## Enable customer relations management (CRM)
> [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108378) in GitLab 15.8. > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108378) in GitLab 15.8.
Customer relations management features are enabled at the group level. If your Customer relations management features are enabled at the group level. If your
group also contains subgroups, and you want to use CRM features in the subgroup, group also contains subgroups, and you want to use CRM features in the subgroup,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
include ExternalAuthorizationServiceHelpers include ExternalAuthorizationServiceHelpers
let(:user) { create(:user) } let(:user) { create(:user) }
let(:group) { create(:group) } let(:group) { create(:group, :crm_disabled) }
before do before do
sign_in user sign_in user
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
create_package_nav(_('Operate')) create_package_nav(_('Operate'))
insert_after_nav_item(_('Analyze'), new_nav_item: settings_for_maintainer_nav_item) if Gitlab.ee? insert_after_nav_item(_('Analyze'), new_nav_item: settings_for_maintainer_nav_item) if Gitlab.ee?
insert_infrastructure_registry_nav(_('Kubernetes')) insert_infrastructure_registry_nav(_('Kubernetes'))
insert_customer_relations_nav(Gitlab.ee? ? _('Iterations') : _('Milestones')) if group.crm_enabled?
stub_config(dependency_proxy: { enabled: false }) stub_config(dependency_proxy: { enabled: false })
stub_config(registry: { enabled: false }) stub_config(registry: { enabled: false })
...@@ -45,16 +46,6 @@ ...@@ -45,16 +46,6 @@
context 'when crm feature is disabled' do context 'when crm feature is disabled' do
let(:group) { create(:group, :crm_disabled) } let(:group) { create(:group, :crm_disabled) }
before do
if Gitlab.ee?
insert_customer_relations_nav(_('Iterations'))
else
insert_customer_relations_nav(_('Milestones'))
end
visit group_path(group)
end
it_behaves_like 'verified navigation bar' it_behaves_like 'verified navigation bar'
end end
......
...@@ -1256,7 +1256,7 @@ ...@@ -1256,7 +1256,7 @@
it_behaves_like 'Self-managed Core resource access tokens' it_behaves_like 'Self-managed Core resource access tokens'
context 'support bot' do context 'support bot' do
let_it_be_with_refind(:group) { create(:group, :private, :crm_enabled) } let_it_be_with_refind(:group) { create(:group, :private) }
let_it_be(:current_user) { Users::Internal.support_bot } let_it_be(:current_user) { Users::Internal.support_bot }
before do before do
...@@ -1635,7 +1635,7 @@ ...@@ -1635,7 +1635,7 @@
let(:current_user) { owner } let(:current_user) { owner }
before do before do
group.crm_settings.update!(enabled: false) Group::CrmSettings.create!(group: group, enabled: false)
end end
it { is_expected.to be_disallowed(:read_crm_contact) } it { is_expected.to be_disallowed(:read_crm_contact) }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment