spec/grinder_spec.rb in philtre-0.1.1 vs spec/grinder_spec.rb in philtre-0.1.2
- old
+ new
@@ -5,11 +5,11 @@
Sequel.extension :blank
Sequel.extension :core_extensions
describe Philtre::Grinder do
def ds
- @ds ||= Sequel.mock[:t].filter( :name.lieu, :title.lieu ).order( :birth_year.lieu )
+ @ds ||= Sequel.mock[:t].filter( Sequel.&(:name.lieu, :title.lieu) ).order( :birth_year.lieu )
end
def other_ds
@other_ds ||= Sequel.mock[:ods]
end
@@ -136,10 +136,10 @@
describe 'subset stack' do
def ds
@ds ||=
begin
subselect = Sequel.mock[:sub].select(:id)
- Sequel.mock[:t].filter( :name.lieu, :title.lieu, person_id: subselect ).order( :birth_year.lieu )
+ Sequel.mock[:t].filter( Sequel.&(:name.lieu, :title.lieu, person_id: subselect) ).order( :birth_year.lieu )
end
end
it 'gets back to where after a subselect' do
grinder = Philtre::Grinder.new Philtre::Filter.new(person_id: 42)