From 0c8eff93411b037fb8374bd149f2f494d675d499 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 3 Aug 2013 12:02:21 -0300 Subject: [PATCH] rails3: remove useless named scope in Article --- app/models/article.rb | 4 +--- test/unit/article_test.rb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/article.rb b/app/models/article.rb index f20ad09..6dd0a3f 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -217,10 +217,8 @@ class Article < ActiveRecord::Base {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]} } - scope :join_profile, :joins => [:profile] - scope :public, - :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ] + :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile] scope :more_recent, :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb index 01881cf..9e7cbb7 100644 --- a/test/unit/article_test.rb +++ b/test/unit/article_test.rb @@ -1618,7 +1618,7 @@ class ArticleTest < ActiveSupport::TestCase art4 = Article.create!(:name => 'article 4', :profile_id => fast_create(Person, :visible => false).id) art5 = Article.create!(:name => 'article 5', :profile_id => fast_create(Person, :public_profile => false).id) - articles = Article.join_profile.public + articles = Article.public assert_includes articles, art1 assert_not_includes articles, art2 assert_not_includes articles, art3 -- libgit2 0.21.2