diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-06-25 16:46:45 -0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-06-25 18:31:30 -0300 |
commit | e8edf620f10fb03edfefc32af0b9a9b780ab107a (patch) | |
tree | 427a9380e6fb884475a9e07cae94b2fe99d0f621 /spec | |
parent | 45453c27ae63a7445d31e7a5ef92ebb74c0b0094 (diff) | |
download | gitlab-ce-e8edf620f10fb03edfefc32af0b9a9b780ab107a.tar.gz |
Fix sorting by name on explore projects page
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/concerns/sortable_spec.rb | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/spec/models/concerns/sortable_spec.rb b/spec/models/concerns/sortable_spec.rb index b821a84d5e0..39c16ae60af 100644 --- a/spec/models/concerns/sortable_spec.rb +++ b/spec/models/concerns/sortable_spec.rb @@ -40,15 +40,25 @@ describe Sortable do describe 'ordering by name' do it 'ascending' do - expect(relation).to receive(:reorder).with("lower(name) asc") + expect(relation).to receive(:reorder).once.and_call_original - relation.order_by('name_asc') + table = Regexp.escape(ActiveRecord::Base.connection.quote_table_name(:namespaces)) + column = Regexp.escape(ActiveRecord::Base.connection.quote_column_name(:name)) + + sql = relation.order_by('name_asc').to_sql + + expect(sql).to match /.+ORDER BY LOWER\(#{table}.#{column}\) ASC\z/ end it 'descending' do - expect(relation).to receive(:reorder).with("lower(name) desc") + expect(relation).to receive(:reorder).once.and_call_original + + table = Regexp.escape(ActiveRecord::Base.connection.quote_table_name(:namespaces)) + column = Regexp.escape(ActiveRecord::Base.connection.quote_column_name(:name)) + + sql = relation.order_by('name_desc').to_sql - relation.order_by('name_desc') + expect(sql).to match /.+ORDER BY LOWER\(#{table}.#{column}\) DESC\z/ end end |