add specs for tags finder
This commit is contained in:
parent
6c9c33f43e
commit
97b69862ad
|
@ -1,5 +1,6 @@
|
|||
class Projects::TagsController < Projects::ApplicationController
|
||||
include SortingHelper
|
||||
|
||||
# Authorize
|
||||
before_action :require_non_empty_project
|
||||
before_action :authorize_download_code!
|
||||
|
@ -7,7 +8,9 @@ class Projects::TagsController < Projects::ApplicationController
|
|||
before_action :authorize_admin_project!, only: [:destroy]
|
||||
|
||||
def index
|
||||
@sort = params[:sort] || 'name'
|
||||
params[:sort] = params[:sort].presence || 'name'
|
||||
|
||||
@sort = params[:sort]
|
||||
@tags = TagsFinder.new(@repository, params).execute
|
||||
@tags = Kaminari.paginate_array(@tags).page(params[:page])
|
||||
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
class TagsFinder
|
||||
def initialize(repository, params)
|
||||
@repository = repository
|
||||
@params = params
|
||||
end
|
||||
|
||||
def execute
|
||||
tags = @repository.tags_sorted_by(sort)
|
||||
filter_by_name(tags)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def sort
|
||||
@params[:sort].presence
|
||||
end
|
||||
|
||||
def search
|
||||
@params[:search].presence
|
||||
end
|
||||
|
||||
def filter_by_name(tags)
|
||||
if search
|
||||
tags.select { |tag| tag.name.include?(search) }
|
||||
else
|
||||
tags
|
||||
end
|
||||
end
|
||||
end
|
|
@ -12,7 +12,8 @@
|
|||
= search_field_tag :search, params[:search], { placeholder: 'Filter by tag name', id: 'tag-search', class: 'form-control search-text-input input-short', spellcheck: false }
|
||||
.dropdown.inline
|
||||
%button.dropdown-toggle.btn{ type: 'button', data: { toggle: 'dropdown'} }
|
||||
%span.light= @sort.humanize
|
||||
%span.light
|
||||
= @sort.humanize
|
||||
%b.caret
|
||||
%ul.dropdown-menu.dropdown-menu-align-right
|
||||
%li
|
||||
|
@ -22,7 +23,7 @@
|
|||
= sort_title_recently_updated
|
||||
= link_to filter_tags_path(sort: sort_value_oldest_updated) do
|
||||
= sort_title_oldest_updated
|
||||
- if can? current_user, :push_code, @project
|
||||
- if can?(current_user, :push_code, @project)
|
||||
= link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
|
||||
New tag
|
||||
|
||||
|
|
|
@ -0,0 +1,79 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe TagsFinder do
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project) }
|
||||
let(:repository) { project.repository }
|
||||
|
||||
describe '#execute' do
|
||||
context 'sort only' do
|
||||
it 'sorts by name' do
|
||||
tags_finder = described_class.new(repository, {})
|
||||
|
||||
result = tags_finder.execute
|
||||
|
||||
expect(result.first.name).to eq("v1.0.0")
|
||||
end
|
||||
|
||||
it 'sorts by recently_updated' do
|
||||
tags_finder = described_class.new(repository, { sort: 'updated_desc' })
|
||||
|
||||
result = tags_finder.execute
|
||||
recently_updated_tag = repository.tags.max do |a, b|
|
||||
repository.commit(a.target).committed_date <=> repository.commit(b.target).committed_date
|
||||
end
|
||||
|
||||
expect(result.first.name).to eq(recently_updated_tag.name)
|
||||
end
|
||||
|
||||
it 'sorts by last_updated' do
|
||||
tags_finder = described_class.new(repository, { sort: 'updated_asc' })
|
||||
|
||||
result = tags_finder.execute
|
||||
|
||||
expect(result.first.name).to eq('v1.0.0')
|
||||
end
|
||||
end
|
||||
|
||||
context 'filter only' do
|
||||
it 'filters tags by name' do
|
||||
tags_finder = described_class.new(repository, { search: '1.0.0' })
|
||||
|
||||
result = tags_finder.execute
|
||||
|
||||
expect(result.first.name).to eq('v1.0.0')
|
||||
expect(result.count).to eq(1)
|
||||
end
|
||||
|
||||
it 'does not find any tags with that name' do
|
||||
tags_finder = described_class.new(repository, { search: 'hey' })
|
||||
|
||||
result = tags_finder.execute
|
||||
|
||||
expect(result.count).to eq(0)
|
||||
end
|
||||
end
|
||||
|
||||
context 'filter and sort' do
|
||||
it 'filters tags by name and sorts by recently_updated' do
|
||||
params = { sort: 'updated_desc', search: 'v1' }
|
||||
tags_finder = described_class.new(repository, params)
|
||||
|
||||
result = tags_finder.execute
|
||||
|
||||
expect(result.first.name).to eq('v1.1.0')
|
||||
expect(result.count).to eq(2)
|
||||
end
|
||||
|
||||
it 'filters tags by name and sorts by last_updated' do
|
||||
params = { sort: 'updated_asc', search: 'v1' }
|
||||
tags_finder = described_class.new(repository, params)
|
||||
|
||||
result = tags_finder.execute
|
||||
|
||||
expect(result.first.name).to eq('v1.0.0')
|
||||
expect(result.count).to eq(2)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue