diff options
author | Jan Provaznik <jprovaznik@gitlab.com> | 2019-09-03 11:26:23 +0000 |
---|---|---|
committer | Jan Provaznik <jprovaznik@gitlab.com> | 2019-09-03 11:26:23 +0000 |
commit | aa34c693e9306445537fb6291520abceaab394c0 (patch) | |
tree | 5452d670fccf74b16c0a72a1ec33983ae5287883 | |
parent | d548766cd46220c9fb7c76539a1b1e9463cb5dfe (diff) | |
parent | 1894c6ebe83981d1a6d4dfdc4cb551c2184966c7 (diff) | |
download | gitlab-ce-aa34c693e9306445537fb6291520abceaab394c0.tar.gz |
Merge branch 'clusterable_cluster_environments_path' into 'master'
Add #environments_cluster_path which will always return nil in CE
See merge request gitlab-org/gitlab-ce!32527
-rw-r--r-- | app/presenters/clusterable_presenter.rb | 5 | ||||
-rw-r--r-- | spec/presenters/clusterable_presenter_spec.rb | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/app/presenters/clusterable_presenter.rb b/app/presenters/clusterable_presenter.rb index fff6d23efdf..d1bf0344b66 100644 --- a/app/presenters/clusterable_presenter.rb +++ b/app/presenters/clusterable_presenter.rb @@ -53,6 +53,11 @@ class ClusterablePresenter < Gitlab::View::Presenter::Delegated raise NotImplementedError end + # Will be overidden in EE + def environments_cluster_path(cluster) + nil + end + def empty_state_help_text nil end diff --git a/spec/presenters/clusterable_presenter_spec.rb b/spec/presenters/clusterable_presenter_spec.rb index 05afe5347d1..47ccc59ae45 100644 --- a/spec/presenters/clusterable_presenter_spec.rb +++ b/spec/presenters/clusterable_presenter_spec.rb @@ -78,4 +78,13 @@ describe ClusterablePresenter do it_behaves_like 'appropriate member permissions' end end + + describe '#environments_cluster_path' do + subject { described_class.new(clusterable).environments_cluster_path(cluster) } + + let(:clusterable) { create(:group) } + let(:cluster) { create(:cluster_for_group, groups: [clusterable]) } + + it { is_expected.to be_nil } + end end |