From f825fd1d881ce077ad868a70fd8d7db6a49e4700 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 26 Oct 2022 21:09:20 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../project_features_compatibility_spec.rb | 2 +- spec/models/project_spec.rb | 1 + spec/models/work_items/type_spec.rb | 3 ++- spec/models/work_items/widgets/milestone_spec.rb | 27 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 spec/models/work_items/widgets/milestone_spec.rb (limited to 'spec/models') diff --git a/spec/models/concerns/project_features_compatibility_spec.rb b/spec/models/concerns/project_features_compatibility_spec.rb index 89f34834aa4..f168bedc8eb 100644 --- a/spec/models/concerns/project_features_compatibility_spec.rb +++ b/spec/models/concerns/project_features_compatibility_spec.rb @@ -8,7 +8,7 @@ RSpec.describe ProjectFeaturesCompatibility do let(:features) do features_enabled + %w( repository pages operations container_registry package_registry environments feature_flags releases - monitor + monitor infrastructure ) end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index bf98566fdcc..88d96a812e0 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -862,6 +862,7 @@ RSpec.describe Project, factory_default: :keep do it { is_expected.to delegate_method(:environments_access_level).to(:project_feature) } it { is_expected.to delegate_method(:feature_flags_access_level).to(:project_feature) } it { is_expected.to delegate_method(:releases_access_level).to(:project_feature) } + it { is_expected.to delegate_method(:infrastructure_access_level).to(:project_feature) } it { is_expected.to delegate_method(:maven_package_requests_forwarding).to(:namespace) } it { is_expected.to delegate_method(:pypi_package_requests_forwarding).to(:namespace) } it { is_expected.to delegate_method(:npm_package_requests_forwarding).to(:namespace) } diff --git a/spec/models/work_items/type_spec.rb b/spec/models/work_items/type_spec.rb index e41df7f0f61..aa18e00f63b 100644 --- a/spec/models/work_items/type_spec.rb +++ b/spec/models/work_items/type_spec.rb @@ -69,7 +69,8 @@ RSpec.describe WorkItems::Type do ::WorkItems::Widgets::Hierarchy, ::WorkItems::Widgets::Labels, ::WorkItems::Widgets::Assignees, - ::WorkItems::Widgets::StartAndDueDate + ::WorkItems::Widgets::StartAndDueDate, + ::WorkItems::Widgets::Milestone ) end end diff --git a/spec/models/work_items/widgets/milestone_spec.rb b/spec/models/work_items/widgets/milestone_spec.rb new file mode 100644 index 00000000000..7b2d661df29 --- /dev/null +++ b/spec/models/work_items/widgets/milestone_spec.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe WorkItems::Widgets::Milestone do + let_it_be(:project) { create(:project) } + let_it_be(:milestone) { create(:milestone, project: project) } + let_it_be(:work_item) { create(:work_item, :issue, project: project, milestone: milestone) } + + describe '.type' do + subject { described_class.type } + + it { is_expected.to eq(:milestone) } + end + + describe '#type' do + subject { described_class.new(work_item).type } + + it { is_expected.to eq(:milestone) } + end + + describe '#milestone' do + subject { described_class.new(work_item).milestone } + + it { is_expected.to eq(work_item.milestone) } + end +end -- cgit v1.2.3