From 14b50dfbabc6b64856ac3511260b787aaf733105 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 3 Feb 2013 09:20:05 +0000 Subject: Removing shoulda context. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11315 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/principal_test.rb | 76 +++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 47 deletions(-) (limited to 'test/unit/principal_test.rb') diff --git a/test/unit/principal_test.rb b/test/unit/principal_test.rb index 8cd511ea2..02742b0f3 100644 --- a/test/unit/principal_test.rb +++ b/test/unit/principal_test.rb @@ -63,64 +63,46 @@ class PrincipalTest < ActiveSupport::TestCase assert_equal expected_order.map(&:name).map(&:downcase), scope.sorted.all.map(&:name).map(&:downcase) end - context "#like" do - setup do - Principal.create!(:login => 'login') - Principal.create!(:login => 'login2') + test "like scope should search login" do + results = Principal.like('jsmi') - Principal.create!(:firstname => 'firstname') - Principal.create!(:firstname => 'firstname2') - - Principal.create!(:lastname => 'lastname') - Principal.create!(:lastname => 'lastname2') - - Principal.create!(:mail => 'mail@example.com') - Principal.create!(:mail => 'mail2@example.com') - - @palmer = Principal.create!(:firstname => 'David', :lastname => 'Palmer') - end - - should "search login" do - results = Principal.like('login') - - assert_equal 2, results.count - assert results.all? {|u| u.login.match(/login/) } - end + assert results.any? + assert results.all? {|u| u.login.match(/jsmi/i) } + end - should "search firstname" do - results = Principal.like('firstname') + test "like scope should search firstname" do + results = Principal.like('john') - assert_equal 2, results.count - assert results.all? {|u| u.firstname.match(/firstname/) } - end + assert results.any? + assert results.all? {|u| u.firstname.match(/john/i) } + end - should "search lastname" do - results = Principal.like('lastname') + test "like scope should search lastname" do + results = Principal.like('smi') - assert_equal 2, results.count - assert results.all? {|u| u.lastname.match(/lastname/) } - end + assert results.any? + assert results.all? {|u| u.lastname.match(/smi/i) } + end - should "search mail" do - results = Principal.like('mail') + test "like scope should search mail" do + results = Principal.like('somenet') - assert_equal 2, results.count - assert results.all? {|u| u.mail.match(/mail/) } - end + assert results.any? + assert results.all? {|u| u.mail.match(/somenet/i) } + end - should "search firstname and lastname" do - results = Principal.like('david palm') + test "like scope should search firstname and lastname" do + results = Principal.like('john smi') - assert_equal 1, results.count - assert_equal @palmer, results.first - end + assert_equal 1, results.count + assert_equal User.find(2), results.first + end - should "search lastname and firstname" do - results = Principal.like('palmer davi') + test "like scope should search lastname and firstname" do + results = Principal.like('smith joh') - assert_equal 1, results.count - assert_equal @palmer, results.first - end + assert_equal 1, results.count + assert_equal User.find(2), results.first end def test_like_scope_with_cyrillic_name -- cgit v1.2.3