Don't attempt to create a committership delete event when deleting a user

2 files changed, 11 insertions, 0 deletions

diff --git a/app/models/committership.rb b/app/models/committership.rb
index 0eeaedf..1097a45 100644
--- a/app/models/committership.rb
+++ b/app/models/committership.rb
@@ -146,6 +146,7 @@ class Committership < ActiveRecord::Base
     end
 
     def add_removed_committer_event
+      return unless repository
       repository.project.create_event(Action::REMOVE_COMMITTER, repository,
                                       creator, committer.title)
     end
diff --git a/test/unit/committership_test.rb b/test/unit/committership_test.rb
index b69283e..28a3e0e 100644
--- a/test/unit/committership_test.rb
+++ b/test/unit/committership_test.rb
@@ -234,4 +234,14 @@ class CommittershipTest < ActiveSupport::TestCase
       assert_equal [:commit, :review], @cs.permission_list.sort_by(&:to_s)
     end
   end
+
+  should "explode on destroy if there's no repository" do
+    # The repository will be gone if we're deleting the
+    # user/repository and it cascades down to the committership
+    cs = new_committership
+    cs.save!
+    assert_nothing_raised(NoMethodError) do
+      cs.repository.user.destroy
+    end
+  end
 end