Add repository user as a watcher when creating a new repository

2 files changed, 11 insertions, 1 deletions

diff --git a/test/unit/favorite_test.rb b/test/unit/favorite_test.rb
index 0b1b9f8..2c9bbf2 100644
--- a/test/unit/favorite_test.rb
+++ b/test/unit/favorite_test.rb
@@ -37,13 +37,14 @@ class FavoriteTest < ActiveSupport::TestCase
   context "Watching a repository" do
     setup do
       @user, @project, @repo = create_favorited_repo
+      @user.favorites.destroy_all
     end
 
     should "be linked with user's favorites" do
       favorite = @user.favorites.build(:watchable => @repo)
       assert_equal @repo, favorite.watchable
       assert_equal @user, favorite.user
-      assert favorite.save
+      favorite.save!
       assert @user.favorites.include?(favorite)
     end
 
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 112b99e..d15be86 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -1048,7 +1048,16 @@ class RepositoryTest < ActiveSupport::TestCase
       assert_equal(100,
         @repository.next_merge_request_sequence_number)
     end
+  end
 
+  should "add the owner as a watcher when creating a clone" do
+    user = users(:mike)
+    repo = Repository.new_by_cloning(repositories(:johans), "mike")
+    repo.user = repo.owner = user
+    assert_difference("user.favorites.reload.count") do
+      repo.save!
+    end
+    assert repo.reload.watched_by?(user)
   end
 
 end