Merge pull request #137 from cobudget/fix_user_merger

stop admin from merging a user into itself then destroying it

app/services/user_service.rb

@@ -25,6 +25,11 @@ def self.fetch_recent_activity_for(user:)
   end
 
   def self.merge_users(user_to_kill:, user_to_keep:)
+    if user_to_kill == user_to_keep 
+      puts "nope" unless Rails.env.test?
+      return
+    end
+
     user_to_kill.memberships.each do |membership|
       memberships = Membership.where(group: membership.group, member: [user_to_keep, user_to_kill])
 

spec/models/bucket_spec.rb

@@ -48,7 +48,7 @@
         Timecop.return
 
         bucket.reload
-        expect(bucket.live_at).to eq(current_time - 1.hour)
+        expect(bucket.live_at).to be_within(1).of(current_time - 1.hour)
       end
     end
 

spec/services/user_service_spec.rb

@@ -161,6 +161,15 @@
       @comment_to_transfer =      create(:comment,                   user: @user_to_kill)
     end
 
+    context "admin submits same user to both keep and kill" do
+      it "does not kill the user" do
+        UserService.merge_users(user_to_keep: @user_to_keep, user_to_kill: @user_to_keep)
+
+        @user_to_keep.reload
+        expect(@user_to_keep.persisted?).to be true
+      end
+    end
+
     context "transfering memebership is going to double up membership for a group," do
       before do
         @existing_membership = create(:membership, member: @user_to_keep, group: @group)