Fix following teams

rohitpaulk · rohitpaulk · commit 0662cee216f6 · 2015-02-05T13:27:22.000+05:30
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -336,17 +336,17 @@ def team_ids
   end
 
   def following_team?(team)
-    followed_teams.collect(&:team_id).include?(team.id.to_s)
+    followed_teams.collect(&:team_id).include?(team.id)
   end
 
   def follow_team!(team)
-    followed_teams.create!(team_id: team.id.to_s)
+    followed_teams.create!(team: team)
     generate_event(team: team)
   end
 
   def unfollow_team!(team)
-    followed_teams = self.followed_teams.where(team_id: team.id.to_s).all
-    followed_teams.each(&:destroy)
+    followed_teams = self.followed_teams.where(team_id: team.id)
+    followed_teams.destroy_all
   end
 
   def teams_being_followed
diff --git a/spec/controllers/teams_controller_spec.rb b/spec/controllers/teams_controller_spec.rb
@@ -7,7 +7,6 @@
   before { controller.send :sign_in, current_user }
 
   it 'allows user to follow team' do
-    pending "Fix User#follow_team first"
     post :follow, id: team.id, format: :js
 
     expect(response).to be_success
@@ -16,7 +15,6 @@
   end
 
   it 'allows user to stop follow team' do
-    pending "Fix User#follow_team first"
     current_user.follow_team!(team)
     current_user.reload
     expect(current_user.following_team?(team)).to eq(true)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -381,7 +381,7 @@ class AlsoNotaBadge < BadgeBase
     end
   end
 
-  describe 'following' do
+  describe 'following users' do
     let(:user) { Fabricate(:user) }
     let(:other_user) { Fabricate(:user) }
 
@@ -412,6 +412,24 @@ class AlsoNotaBadge < BadgeBase
     end
   end
 
+  describe 'following teams' do
+    let(:user) { Fabricate(:user) }
+    let(:team) { Fabricate(:team) }
+
+    it 'can follow a team' do
+      user.follow_team!(team)
+      user.reload
+      expect(user.following_team?(team)).to eq(true)
+    end
+
+    it 'can unfollow a team' do
+      user.follow_team!(team)
+      user.unfollow_team!(team)
+      user.reload
+      expect(user.following_team?(team)).to eq(false)
+    end
+  end
+
   describe 'skills' do
     let(:user) { Fabricate(:user) }
 
