2 files changed, 41 insertions, 0 deletions
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 358630b..995e0ec 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -492,6 +492,22 @@ class UsersControllerTest < ActionController::TestCase
     end
   end
 
+  context "Viewing ones own favorites" do
+    setup {
+      login_as(:johan)
+      @user = users(:johan)
+      @merge_request = merge_requests(:moes_to_johans)
+      @user.favorites.create(:watchable => @merge_request)
+      @project = projects(:johans)
+      @user.favorites.create(:watchable => @project)      
+    }
+
+    should "render all" do
+      get :show, :id => @user.login
+      assert_response :success
+    end
+  end
+  
   context 'Creation from OpenID' do
     setup do
       @valid_session_options = {:openid_url => 'http://moe.example/', :openid_nickname => 'schmoe'}
diff --git a/test/unit/favorite_test.rb b/test/unit/favorite_test.rb
index ac62b00..643b8f7 100644
--- a/test/unit/favorite_test.rb
+++ b/test/unit/favorite_test.rb
@@ -73,5 +73,30 @@ class FavoriteTest < ActiveSupport::TestCase
       assert favorite.event_exists?
     end
   end
+
+  context "Watching merge requests" do
+    setup {
+      @user = users(:mike)
+    }
+
+    should "return the target repository's project as project" do
+      merge_request = merge_requests(:moes_to_johans)
+      favorite = @user.favorites.create(:watchable => merge_request)
+      assert_equal(merge_request.target_repository.project,
+        favorite.project)
+    end
+  end
+  
+  context "Watching projects" do
+    setup {
+      @user = users(:moe)
+    }
+
+    should "return the project as project" do
+      @project = projects(:johans)
+      favorite = @user.favorites.create(:watchable => @project)
+      assert_equal @project, favorite.project
+    end
+  end
   
 end