summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-01 09:21:31 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-01 09:21:31 +0300
commit7bb71bb088e17578482e7f934147b0fd11c7ad0e (patch)
tree2e44c8dfe576057940ed71326c7f0434a8c1a37a
parent458631c5ba8c830021bd7c219affdb0afe6f0efe (diff)
downloadgitlab-ce-7bb71bb088e17578482e7f934147b0fd11c7ad0e.tar.gz
Fix stubbed repo
-rw-r--r--app/models/repository.rb4
-rw-r--r--spec/support/stubbed_repository.rb8
2 files changed, 4 insertions, 8 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 048795b22ab..be6502ebf5c 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -24,11 +24,11 @@ class Repository
end
def method_missing(m, *args, &block)
- @raw_repository.send(m, *args, &block)
+ raw_repository.send(m, *args, &block)
end
def respond_to?(method)
- return true if @raw_repository.respond_to?(method)
+ return true if raw_repository.respond_to?(method)
super
end
diff --git a/spec/support/stubbed_repository.rb b/spec/support/stubbed_repository.rb
index 68c380e6f4f..3dfdb3539fb 100644
--- a/spec/support/stubbed_repository.rb
+++ b/spec/support/stubbed_repository.rb
@@ -10,7 +10,7 @@ class Project
if path == "empty" || !path
nil
else
- GitLabTestRepo.new(path_with_namespace)
+ GitLabTestRepo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'), 'master')
end
end
@@ -39,11 +39,7 @@ class MergeRequest
end
end
-class GitLabTestRepo < Gitlab::Git::Repository
- def repo
- @repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))
- end
-
+class GitLabTestRepo < Repository
# patch repo size (in mb)
def size
12.45