From 3c0fee178670e524173a406147b678c282559d7c Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 20 Mar 2015 13:24:03 -0400 Subject: [PATCH] Fixes broken spec --- app/models/directory_item.rb | 7 ++++--- spec/models/directory_item_spec.rb | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb index 64361abb48a..0c9e5d67569 100644 --- a/app/models/directory_item.rb +++ b/app/models/directory_item.rb @@ -52,9 +52,9 @@ class DirectoryItem < ActiveRecord::Base AND COALESCE(t.visible, true) AND COALESCE(t.archetype, 'regular') = 'regular' AND p.deleted_at IS NULL - AND NOT (COALESCE(p.hidden, false)) - AND NOT COALESCE(c.read_restricted, false) - AND p.post_type != :moderator_action + AND (NOT (COALESCE(p.hidden, false))) + AND (NOT COALESCE(c.read_restricted, false)) + AND COALESCE(p.post_type, :regular_post_type) != :moderator_action AND u.id > 0 GROUP BY u.id", period_type: period_types[period_type], @@ -63,6 +63,7 @@ class DirectoryItem < ActiveRecord::Base was_liked_type: UserAction::WAS_LIKED, new_topic_type: UserAction::NEW_TOPIC, reply_type: UserAction::REPLY, + regular_post_type: Post.types[:regular], moderator_action: Post.types[:moderator_action] end end diff --git a/spec/models/directory_item_spec.rb b/spec/models/directory_item_spec.rb index 624027c241d..f6008fddc0e 100644 --- a/spec/models/directory_item_spec.rb +++ b/spec/models/directory_item_spec.rb @@ -2,12 +2,12 @@ require 'spec_helper' describe DirectoryItem do context 'refresh' do - let!(:user) { Fabricate(:user) } + let!(:post) { Fabricate(:post) } it "creates the record for the user" do DirectoryItem.refresh! expect(DirectoryItem.where(period_type: DirectoryItem.period_types[:all]) - .where(user_id: user.id) + .where(user_id: post.user.id) .exists?).to be_true end