summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/list.rb4
-rw-r--r--spec/models/list_spec.rb4
2 files changed, 1 insertions, 7 deletions
diff --git a/app/models/list.rb b/app/models/list.rb
index 6f639a51150..41f79513a10 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -9,12 +9,10 @@ class List < ActiveRecord::Base
validates :label_id, uniqueness: { scope: :board_id }, if: :label?
validates :position, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, if: :label?
- delegate :name, to: :label, allow_nil: true, prefix: true
-
before_destroy :can_be_destroyed, unless: :label?
def title
- label? ? label_name : list_type.humanize
+ label? ? label.name : list_type.humanize
end
private
diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb
index 86ff4cafa93..664d12a2fd3 100644
--- a/spec/models/list_spec.rb
+++ b/spec/models/list_spec.rb
@@ -6,10 +6,6 @@ describe List do
it { is_expected.to belong_to(:label) }
end
- describe 'delegate methods' do
- it { is_expected.to delegate_method(:name).to(:label).with_prefix }
- end
-
describe 'validations' do
it { is_expected.to validate_presence_of(:board) }
it { is_expected.to validate_presence_of(:label) }