diff options
author | Dylan Griffith <dyl.griffith@gmail.com> | 2019-10-17 16:15:07 +1100 |
---|---|---|
committer | Dylan Griffith <dyl.griffith@gmail.com> | 2019-10-23 13:46:52 +1100 |
commit | c2c498087410aacde7f4fdda980d7e31520a287f (patch) | |
tree | 7c08417c744faa046df092d45ba5c837f0d0b75e | |
parent | 3a4876ff713c08e38e37e9aba2e6efaaa3f4bba4 (diff) | |
download | gitlab-ce-c2c498087410aacde7f4fdda980d7e31520a287f.tar.gz |
Add #to_ability_name to Project & Milestone
This will be used later for search filtering.
-rw-r--r-- | app/models/milestone.rb | 4 | ||||
-rw-r--r-- | app/models/project.rb | 4 | ||||
-rw-r--r-- | spec/models/milestone_spec.rb | 8 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 8 |
4 files changed, 24 insertions, 0 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 2ad2838111e..012e72ece5a 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -254,6 +254,10 @@ class Milestone < ApplicationRecord group || project end + def to_ability_name + model_name.singular + end + def group_milestone? group_id.present? end diff --git a/app/models/project.rb b/app/models/project.rb index a1bd5edaba9..02ccd4542f7 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1223,6 +1223,10 @@ class Project < ApplicationRecord end end + def to_ability_name + model_name.singular + end + # rubocop: disable CodeReuse/ServiceClass def execute_hooks(data, hooks_scope = :push_hooks) run_after_commit_or_now do diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb index 3704a2d468d..d7c522247e8 100644 --- a/spec/models/milestone_spec.rb +++ b/spec/models/milestone_spec.rb @@ -206,6 +206,14 @@ describe Milestone do end end + describe '#to_ability_name' do + it 'returns milestone' do + milestone = build(:milestone) + + expect(milestone.to_ability_name).to eq('milestone') + end + end + describe '.search' do let(:milestone) { create(:milestone, title: 'foo', description: 'bar') } diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index de5fe9ee8a8..980110073ad 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -4334,6 +4334,14 @@ describe Project do end end + describe '#to_ability_name' do + it 'returns project' do + project = build(:project_empty_repo) + + expect(project.to_ability_name).to eq('project') + end + end + describe '#execute_hooks' do let(:data) { { ref: 'refs/heads/master', data: 'data' } } it 'executes active projects hooks with the specified scope' do |