diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-30 08:42:23 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-30 08:42:23 +0000 |
commit | c3e54801bb461b6d53c48e3194f87cb5ebf3f5ba (patch) | |
tree | 3eef57c9f35c9aa0332a4c0b9ee88afd5da628f2 | |
parent | 21fb7a5e5b6be5c58845460e3a2f9de0c1cfab8c (diff) | |
download | gitlab-ce-c3e54801bb461b6d53c48e3194f87cb5ebf3f5ba.tar.gz |
Add latest changes from gitlab-org/gitlab@15-8-stable-ee
-rw-r--r-- | app/models/todo.rb | 2 | ||||
-rw-r--r-- | spec/helpers/todos_helper_spec.rb | 19 |
2 files changed, 19 insertions, 2 deletions
diff --git a/app/models/todo.rb b/app/models/todo.rb index 7bbdf321269..47dabc1533d 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -177,7 +177,7 @@ class Todo < ApplicationRecord end def resource_parent - project + project || group end def unmergeable? diff --git a/spec/helpers/todos_helper_spec.rb b/spec/helpers/todos_helper_spec.rb index fcdb41eb4af..26951b0c1e7 100644 --- a/spec/helpers/todos_helper_spec.rb +++ b/spec/helpers/todos_helper_spec.rb @@ -40,7 +40,7 @@ RSpec.describe TodosHelper do end let_it_be(:group_todo) do - create(:todo, target: group) + create(:todo, target: group, group: group, project: nil, user: user) end let_it_be(:project_access_request_todo) do @@ -435,4 +435,21 @@ RSpec.describe TodosHelper do it { expect(result).to match("Due #{l(Date.tomorrow, format: Date::DATE_FORMATS[:medium])}") } end end + + describe '#todo_parent_path' do + context 'when todo resource parent is a group' do + subject(:result) { helper.todo_parent_path(group_todo) } + + it { expect(result).to eq(group_todo.group.name) } + end + + context 'when todo resource parent is not a group' do + it 'returns project title with namespace' do + result = helper.todo_parent_path(project_access_request_todo) + + expect(result).to include(project_access_request_todo.project.name) + expect(result).to include(project_access_request_todo.project.namespace.human_name) + end + end + end end |