diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
commit | 9297025d0b7ddf095eb618dfaaab2ff8f2018d8b (patch) | |
tree | 865198c01d1824a9b098127baa3ab980c9cd2c06 /spec/helpers/issuables_helper_spec.rb | |
parent | 6372471f43ee03c05a7c1f8b0c6ac6b8a7431dbe (diff) |
Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42
Diffstat (limited to 'spec/helpers/issuables_helper_spec.rb')
-rw-r--r-- | spec/helpers/issuables_helper_spec.rb | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/spec/helpers/issuables_helper_spec.rb b/spec/helpers/issuables_helper_spec.rb index 6abce4c5983..f2e88bc311d 100644 --- a/spec/helpers/issuables_helper_spec.rb +++ b/spec/helpers/issuables_helper_spec.rb @@ -121,27 +121,6 @@ RSpec.describe IssuablesHelper, feature_category: :team_planning do end end - describe '#assigned_open_issues_count_text', feature_category: :team_planning do - let_it_be(:user) { create(:user) } - let_it_be(:project) { create(:project).tap { |p| p.add_developer(user) } } - - subject { helper.assigned_open_issues_count_text } - - before do - allow(helper).to receive(:current_user).and_return(user) - end - - context 'when assigned issues count is over MAX_LIMIT_FOR_ASSIGNEED_ISSUES_COUNT' do - before do - stub_const('User::MAX_LIMIT_FOR_ASSIGNEED_ISSUES_COUNT', 2) - end - - let_it_be(:issues) { create_list(:issue, 3, project: project, assignees: [user]) } - - it { is_expected.to eq '1+' } - end - end - describe '#issuables_state_counter_text' do let_it_be(:user) { create(:user) } @@ -600,7 +579,8 @@ RSpec.describe IssuablesHelper, feature_category: :team_planning do initial_labels: '[]', issuable_type: issuable.issuable_type, labels_filter_base_path: project_issues_path(project), - labels_manage_path: project_labels_path(project) + labels_manage_path: project_labels_path(project), + supports_lock_on_merge: issuable.supports_lock_on_merge?.to_s }) end end @@ -620,7 +600,8 @@ RSpec.describe IssuablesHelper, feature_category: :team_planning do title: label.title, description: label.description, color: label.color, - text_color: label.text_color + text_color: label.text_color, + lock_on_merge: label.lock_on_merge }, { __typename: "Label", @@ -628,7 +609,8 @@ RSpec.describe IssuablesHelper, feature_category: :team_planning do title: label2.title, description: label2.description, color: label2.color, - text_color: label2.text_color + text_color: label2.text_color, + lock_on_merge: label.lock_on_merge } ] @@ -638,7 +620,8 @@ RSpec.describe IssuablesHelper, feature_category: :team_planning do initial_labels: initial_labels.to_json, issuable_type: issuable.issuable_type, labels_filter_base_path: project_merge_requests_path(project), - labels_manage_path: project_labels_path(project) + labels_manage_path: project_labels_path(project), + supports_lock_on_merge: issuable.supports_lock_on_merge?.to_s }) end end |