Monkeypatch satellite call for merge request in tests

Dmitriy Zaporozhets
1 parent 42ce2c10
Showing 2 changed files with 9 additions and 0 deletions Show diff stats
app/controllers/merge_requests_controller.rb
spec/support/stubbed_repository.rb
+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]
 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'))
	1	+require 'gitlab/satellite/satellite'
	2	+
1	3	class MergeRequestsController < ProjectResourceController
2	4	before_filter :module_enabled
3	5	before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]
...	...
1	1	require "repository"
2	2	require "project"
	3	+require "merge_request"
3	4	require "shell"
4	5
5	6	# Stubs out all Git repository access done by models so that specs can run
...	...	@@ -32,6 +33,12 @@ class Project
32	33	end
33	34	end
34	35
	36	+class MergeRequest
	37	+ def can_be_merged
	38	+ true
	39	+ end
	40	+end
	41	+
35	42	class GitLabTestRepo < Repository
36	43	def repo
37	44	@repo \|\|= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))
...	...