deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Monkeypatch satellite call for merge request in tests

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-21 11:44:33 +02:00
parent 42ce2c1080
commit 28da2a8bdc
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/merge_requests_controller.rb
View file

@ -1,3 +1,5 @@
require 'gitlab/satellite/satellite'
class MergeRequestsController < ProjectResourceController class MergeRequestsController < ProjectResourceController
before_filter :module_enabled before_filter :module_enabled
before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status] before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]

7
spec/support/stubbed_repository.rb
View file

@ -1,5 +1,6 @@
require "repository" require "repository"
require "project" require "project"
require "merge_request"
require "shell" require "shell"
# Stubs out all Git repository access done by models so that specs can run # Stubs out all Git repository access done by models so that specs can run
@ -32,6 +33,12 @@ class Project
end end
end end
class MergeRequest
def can_be_merged
true
end
end
class GitLabTestRepo < Repository class GitLabTestRepo < Repository
def repo def repo
@repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq')) @repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))