Fix tag count error in tests.

bborn · Feb 29, 2016 · 3caf109 · 3caf109
1 parent 4edd5e4
commit 3caf109
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 86 deletions.
diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb
@@ -94,14 +94,6 @@ def require_current_user
 
     def popular_tags(limit = 20, type = nil)
       ActsAsTaggableOn::Tag.popular(limit, type)
-=begin
-      if type == nil
-        ActsAsTaggableOn::Tag.most_used(limit)
-      else
-        klass = Object.const_get type
-        klass.tag_counts.most_used(limit)
-      end
-=end
     end
 
 

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
@@ -14,15 +14,7 @@ def auto_complete_for_tag_name
   end
 
   def index
-    @tags = popular_tags(100).to_a
-
-    @user_tags = popular_tags(75, 'User').to_a
-
-    @post_tags = popular_tags(75, 'Post').to_a
-
-    @photo_tags = popular_tags(75, 'Photo').to_a
-
-    @clipping_tags = popular_tags(75, 'Clipping').to_a
+    @tags = popular_tags(100)
   end
 
 

diff --git a/app/models/acts_as_taggable_on/tag.rb b/app/models/acts_as_taggable_on/tag.rb
@@ -4,8 +4,12 @@ class ActsAsTaggableOn::Tag < ActiveRecord::Base
 
   class << self
     def popular(limit = 20, type = nil)
-      tags = ActsAsTaggableOn::Tag.most_used(limit)
-      tags
+      if type == nil
+        ActsAsTaggableOn::Tag.most_used(limit)
+      else
+        klass = Object.const_get type
+        klass.tag_counts.most_used(limit)
+      end
     end
 
     def default_per_page

diff --git a/config/initializers/tag_extensions.rb b/config/initializers/tag_extensions.rb