diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-04 18:44:22 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-04 18:44:22 +0000 |
commit | 73579e66bb0571cba62c3c8c71795a136952f3b1 (patch) | |
tree | 14331d0a4c7f3e4beb741a363ab667af633865d9 /spec | |
parent | 716baf691fd212190aff5f944bb42ec84f799743 (diff) | |
parent | 2c78c7f4cdb1fae2650563f80feb294d2b7e5d80 (diff) | |
download | gitlab-ce-73579e66bb0571cba62c3c8c71795a136952f3b1.tar.gz |
Merge branch 'revert-2c879643' into 'master'
Revert "Merge branch 'revert-12499' into 'master'"
See merge request !12633
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/concerns/sortable_spec.rb | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/spec/models/concerns/sortable_spec.rb b/spec/models/concerns/sortable_spec.rb new file mode 100644 index 00000000000..d1e17c4f684 --- /dev/null +++ b/spec/models/concerns/sortable_spec.rb @@ -0,0 +1,21 @@ +require 'spec_helper' + +describe Sortable do + let(:relation) { Issue.all } + + describe '#where' do + it 'orders by id, descending' do + order_node = relation.where(iid: 1).order_values.first + expect(order_node).to be_a(Arel::Nodes::Descending) + expect(order_node.expr.name).to eq(:id) + end + end + + describe '#find_by' do + it 'does not order' do + expect(relation).to receive(:unscope).with(:order).and_call_original + + relation.find_by(iid: 1) + end + end +end |