From 28da2a8bdc8fd5cbb05a32933c0ab1c56202481f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 21 Feb 2013 11:44:33 +0200
Subject: [PATCH] Monkeypatch satellite call for merge request in tests

---
 app/controllers/merge_requests_controller.rb | 2 ++
 spec/support/stubbed_repository.rb           | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb
index bf6652726d2..f92d9976b43 100644
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -1,3 +1,5 @@
+require 'gitlab/satellite/satellite'
+
 class MergeRequestsController < ProjectResourceController
   before_filter :module_enabled
   before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]
diff --git a/spec/support/stubbed_repository.rb b/spec/support/stubbed_repository.rb
index 434cab6516e..347989634c0 100644
--- a/spec/support/stubbed_repository.rb
+++ b/spec/support/stubbed_repository.rb
@@ -1,5 +1,6 @@
 require "repository"
 require "project"
+require "merge_request"
 require "shell"
 
 # Stubs out all Git repository access done by models so that specs can run
@@ -32,6 +33,12 @@ class Project
   end
 end
 
+class MergeRequest
+  def can_be_merged
+    true
+  end
+end
+
 class GitLabTestRepo < Repository
   def repo
     @repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))