Commit 78fdccdf authored by Michael Kozono's avatar Michael Kozono

Merge branch 'bw-change-type-group-to-namespace' into 'master'

Change `group` association to `namespace`

See merge request gitlab-org/gitlab!67885
parents 26cc0cfa 2c9e5d45
...@@ -13,7 +13,7 @@ class WorkItem::Type < ApplicationRecord ...@@ -13,7 +13,7 @@ class WorkItem::Type < ApplicationRecord
enum base_type: Issue.issue_types enum base_type: Issue.issue_types
belongs_to :group, foreign_key: :namespace_id, optional: true belongs_to :namespace, optional: true
has_many :work_items, class_name: 'Issue', foreign_key: :work_item_type_id, inverse_of: :work_item_type has_many :work_items, class_name: 'Issue', foreign_key: :work_item_type_id, inverse_of: :work_item_type
before_validation :strip_whitespace before_validation :strip_whitespace
......
...@@ -2,10 +2,14 @@ ...@@ -2,10 +2,14 @@
FactoryBot.define do FactoryBot.define do
factory :work_item_type, class: 'WorkItem::Type' do factory :work_item_type, class: 'WorkItem::Type' do
group namespace
name { generate(:work_item_type_name) } name { generate(:work_item_type_name) }
icon_name { 'issue' } icon_name { 'issue' }
base_type { Issue.issue_types['issue'] } base_type { Issue.issue_types['issue'] }
trait :default do
namespace { nil }
end
end end
end end
...@@ -9,7 +9,7 @@ RSpec.describe WorkItem::Type do ...@@ -9,7 +9,7 @@ RSpec.describe WorkItem::Type do
describe 'associations' do describe 'associations' do
it { is_expected.to have_many(:work_items).with_foreign_key('work_item_type_id') } it { is_expected.to have_many(:work_items).with_foreign_key('work_item_type_id') }
it { is_expected.to belong_to(:group).with_foreign_key('namespace_id') } it { is_expected.to belong_to(:namespace) }
end end
describe '#destroy' do describe '#destroy' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment