Project

General

Profile

« Previous | Next » 

Revision bd3b03ac

Added by Stephen Benjamin almost 6 years ago

fixes #23943 - use order instead of sort

.sort in Rails 5 returns an array, but scopes like in_default_view is
called on the sorted array. This changes the rake task to use SQL
sorting with order instead.

View differences:

test/lib/tasks/repository_test.rb
def test_regenerate_repo_metadata
ForemanTasks.expects(:async_task).with(::Actions::Katello::Repository::BulkMetadataGenerate,
Katello::Repository.all.sort).returns(ForemanTasks::Task.new)
Katello::Repository.all.order(:name)).returns(ForemanTasks::Task.new)
Rake.application.invoke_task('katello:regenerate_repo_metadata')
end
......
def test_regenerate_repo_metadata_env
ENV['LIFECYCLE_ENVIRONMENT'] = @library_repo.environment.name
expected_repos = Katello::Repository.joins(:environment).where('katello_environments.name' => @library_repo.environment.name)
expected_repos = Katello::Repository.in_environment(@library_repo.environment).order(:name)
Katello::Repository.stubs(:in_environment).returns(expected_repos)
ForemanTasks.expects(:async_task).with(::Actions::Katello::Repository::BulkMetadataGenerate,
expected_repos.sort).returns(ForemanTasks::Task.new)
expected_repos).returns(ForemanTasks::Task.new)
Rake.application.invoke_task('katello:regenerate_repo_metadata')
end
......
def test_refresh_pulp_repo_details
ForemanTasks.expects(:async_task).with(::Actions::BulkAction, Actions::Katello::Repository::RefreshRepository,
Katello::Repository.all.sort).returns(ForemanTasks::Task.new)
Katello::Repository.all.order(:name)).returns(ForemanTasks::Task.new)
Rake.application.invoke_task('katello:refresh_pulp_repo_details')
end

Also available in: Unified diff