From 87cd36dcde34ea8e3b217158311746e426a26809 Mon Sep 17 00:00:00 2001 From: Jon Atack Date: Sun, 26 Jul 2015 20:38:28 +0200 Subject: [PATCH] Upgrade AR specs to RSpec 3 expect syntax TODO: The same with the MongoDB specs. --- .../adapters/active_record/base_spec.rb | 24 ++++++++++--------- spec/ransack/nodes/condition_spec.rb | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/spec/ransack/adapters/active_record/base_spec.rb b/spec/ransack/adapters/active_record/base_spec.rb index c9918ca96..8afa62d82 100644 --- a/spec/ransack/adapters/active_record/base_spec.rb +++ b/spec/ransack/adapters/active_record/base_spec.rb @@ -20,53 +20,55 @@ module ActiveRecord context 'with scopes' do before do - Person.stub :ransackable_scopes => [:active, :over_age, :of_age] + allow(Person).to receive_messages( + ransackable_scopes: [:active, :over_age, :of_age] + ) end it "applies true scopes" do s = Person.ransack('active' => true) - s.result.to_sql.should include "active = 1" + expect(s.result.to_sql).to (include 'active = 1') end it "applies stringy true scopes" do s = Person.ransack('active' => 'true') - s.result.to_sql.should include "active = 1" + expect(s.result.to_sql).to (include 'active = 1') end it "applies stringy boolean scopes with true value in an array" do s = Person.ransack('of_age' => ['true']) - s.result.to_sql.should include "age >= 18" + expect(s.result.to_sql).to (include 'age >= 18') end it "applies stringy boolean scopes with false value in an array" do s = Person.ransack('of_age' => ['false']) - s.result.to_sql.should include "age < 18" + expect(s.result.to_sql).to (include 'age < 18') end it "ignores unlisted scopes" do s = Person.ransack('restricted' => true) - s.result.to_sql.should_not include "restricted" + expect(s.result.to_sql).to_not (include 'restricted') end it "ignores false scopes" do s = Person.ransack('active' => false) - s.result.to_sql.should_not include "active" + expect(s.result.to_sql).not_to (include 'active') end it "ignores stringy false scopes" do s = Person.ransack('active' => 'false') - s.result.to_sql.should_not include "active" + expect(s.result.to_sql).to_not (include 'active') end it "passes values to scopes" do s = Person.ransack('over_age' => 18) - s.result.to_sql.should include "age > 18" + expect(s.result.to_sql).to (include 'age > 18') end it "chains scopes" do s = Person.ransack('over_age' => 18, 'active' => true) - s.result.to_sql.should include "age > 18" - s.result.to_sql.should include "active = 1" + expect(s.result.to_sql).to (include 'age > 18') + expect(s.result.to_sql).to (include 'active = 1') end end diff --git a/spec/ransack/nodes/condition_spec.rb b/spec/ransack/nodes/condition_spec.rb index 2c5de00fe..3c480aff1 100644 --- a/spec/ransack/nodes/condition_spec.rb +++ b/spec/ransack/nodes/condition_spec.rb @@ -34,7 +34,7 @@ module Nodes Ransack.configure { |c| c.ignore_unknown_conditions = true } end - specify { subject.should be_nil } + specify { expect(subject).to be_nil } end end end