Improve coverage of User model and fix found bugs

Found bugs:
 - User#any_pending_project_acceptances? was returning true even if all
   acceptances were already accepted
 - User#answered_all_multi_choice_questions? didn't work with grouped
   multiple choice questions

Side note : scopes in Question need cleaning (eg. unanswered should just
select unanswered questions (not unanswered and grouped like it does now))

1 files changed, 4 insertions, 2 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index cb6afbe..4982a13 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -133,7 +133,7 @@ class User < ActiveRecord::Base
   end
 
   def any_pending_project_acceptances?
-    (ProjectAcceptance.count :conditions => { :accepting_nick => nick }) > 0
+    (ProjectAcceptance.count :conditions => { :accepting_nick => nick, :accepted => false}) > 0
   end
 
   # This returns named scope, so it's efficient to use
@@ -148,7 +148,7 @@ class User < ActiveRecord::Base
 
   def answered_all_multi_choice_questions?
     Question.multiple_choice.ungrouped_questions_of_user(id).unanswered(id).count == 0 &&
-      Question.multiple_choice.grouped_questions_of_user(id).unanswered(id).count == 0
+      Question.multiple_choice.grouped_questions_of_user(id).unanswered_grouped(id).count == 0
   end
 
   def required_questions_count
@@ -195,6 +195,8 @@ class User < ActiveRecord::Base
     end
 
     def changes_allowed_for_recruiter?
+      return mentor_picked_up_or_resigned? if mentor_changed?
+
       # make sure recruiters change only what they are allowed to
       return false unless only_changed?(:question_categories, :role, :nick)