move query from view to model, add network controller spec

avinoth · avinoth · commit 63d048c95c28 · 2015-01-18T19:50:13.000+05:30
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -1,6 +1,7 @@
 class AdminController < BaseAdminController
 
   def index
+    @networks = Network.where('protips_count_cache > 0').order('protips_count_cache desc')
   end
 
   def teams
diff --git a/app/models/network.rb b/app/models/network.rb
@@ -96,7 +96,7 @@ def create_slug!
 
   def tag_with_name!
     unless self.tag_list.include? self.name
-      self.tag_list = (self.tag_list + [self.name, self.slug])
+      self.tag_list.add(self.slug)
     end
   end
 
@@ -240,4 +240,8 @@ def assign_members
     end
   end
 
+  def recent_protips_count
+    self.protips.where('protips.created_at > ?', 1.week.ago).count
+  end
+
 end
diff --git a/app/views/admin/index.html.slim b/app/views/admin/index.html.slim
@@ -71,10 +71,10 @@
       h4 Pro tips created in networks in past week
     section
       ul.networks
-        -Network.where('protips_count_cache > 0').order('protips_count_cache desc').each do |network|
+        -@networks.each do |network|
           li.network
             span.name= link_to network.name, network_path(network)
-            span.created_at= network.protips.where('created_at > ?', 1.week.ago).count
+            span.created_at= network.recent_protips_count
 
   .widget.orange
     header
diff --git a/spec/controllers/networks_controller_spec.rb b/spec/controllers/networks_controller_spec.rb
@@ -0,0 +1,21 @@
+RSpec.describe NetworksController, type: :controller do
+  let(:current_user) { Fabricate(:user) }
+
+  before { controller.send :sign_in, current_user }
+
+  def valid_attributes
+    {
+      name: 'Rust'
+    }
+  end
+
+  describe 'Create network' do
+    describe 'with valid attributes' do
+      it 'creates a network and adds to tags' do
+        expect do
+          post :create, { network: valid_attributes}, valid_session
+        end.to change(Tag, :count).by(1)
+      end
+    end
+  end
+end
