fix crash caused by incorrect query in scope

setting all categories to be secured led to a blank screen on all pages

use stabby lambda for consistency in class

make the test a little more concise

- move the local assignments into let blocks for
reusability

- remove calls to `to_a`, which aren't needed

- use 'be_empty' instead of '[]' to be consistent
with the other matchers in the test

add a test for the `secured` scope with multiple
secured categories
This commit is contained in:
Lee Machin 2013-05-15 22:45:52 +02:00 committed by Lee Machin
parent b1bfda0e11
commit dadb7eaa23
2 changed files with 19 additions and 9 deletions

View File

@ -29,11 +29,10 @@ class Category < ActiveRecord::Base
scope :latest, ->{ order('topic_count desc') } scope :latest, ->{ order('topic_count desc') }
scope :secured, lambda { |guardian| scope :secured, ->(guardian = nil) {
ids = nil
ids = guardian.secure_category_ids if guardian ids = guardian.secure_category_ids if guardian
if ids.present? if ids.present?
where("categories.secure ='f' or categories.id = :cats ", cats: ids) where("categories.secure ='f' or categories.id in (:cats)", cats: ids)
else else
where("categories.secure ='f'") where("categories.secure ='f'")
end end

View File

@ -19,9 +19,12 @@ describe Category do
it { should have_many :featured_topics } it { should have_many :featured_topics }
describe "security" do describe "security" do
it "secures categories correctly" do let(:category) { Fabricate(:category) }
category = Fabricate(:category) let(:category_2) { Fabricate(:category) }
let(:user) { Fabricate(:user) }
let(:group) { Fabricate(:group) }
it "secures categories correctly" do
category.secure?.should be_false category.secure?.should be_false
category.deny(:all) category.deny(:all)
@ -30,10 +33,8 @@ describe Category do
category.allow(:all) category.allow(:all)
category.secure?.should be_false category.secure?.should be_false
user = Fabricate(:user) user.secure_categories.should be_empty
user.secure_categories.to_a.should == []
group = Fabricate(:group)
group.add(user) group.add(user)
group.save group.save
@ -41,8 +42,18 @@ describe Category do
category.save category.save
user.reload user.reload
user.secure_categories.to_a.should == [category] user.secure_categories.should == [category]
end
it "lists all secured categories correctly" do
group.add(user)
category.allow(group)
Category.secured.should == [category]
category_2.allow(group)
Category.secured.should =~ [category, category_2]
end end
end end