Commit a39cfb54 authored by Robert Speicher's avatar Robert Speicher

Simplify StubbedRepository after GitHost changes from master

parent 77d06454
...@@ -9,34 +9,19 @@ module StubbedRepository ...@@ -9,34 +9,19 @@ module StubbedRepository
# will overwrite our stub, so use alias_method to ensure it's our stub # will overwrite our stub, so use alias_method to ensure it's our stub
# getting called. # getting called.
alias_method :update_repository, :fake_update_repository
alias_method :destroy_repository, :fake_destroy_repository
alias_method :repository_delete_key, :fake_repository_delete_key
alias_method :path_to_repo, :fake_path_to_repo alias_method :path_to_repo, :fake_path_to_repo
alias_method :satellite, :fake_satellite alias_method :satellite, :fake_satellite
end end
def fake_update_repository
true
end
def fake_destroy_repository
true
end
def fake_repository_delete_key
true
end
def fake_path_to_repo def fake_path_to_repo
if new_record? if new_record? || path == 'newproject'
# There are a couple Project specs that expect the Project's path to be # There are a couple Project specs and features that expect the Project's
# in the returned path, so let's patronize them. # path to be in the returned path, so let's patronize them.
File.join(Rails.root, 'tmp', 'tests', path) File.join(Rails.root, 'tmp', 'tests', path)
else else
# For everything else, just give it the path to one of our real seeded # For everything else, just give it the path to one of our real seeded
# repos. # repos.
File.join(Rails.root, 'tmp', 'tests', 'gitlabhq_1') File.join(Rails.root, 'tmp', 'tests', 'gitlabhq_0')
end end
end end
...@@ -55,6 +40,6 @@ module StubbedRepository ...@@ -55,6 +40,6 @@ module StubbedRepository
end end
end end
[Project, Key, ProtectedBranch, UsersProject].each do |c| [Project, ProtectedBranch, UsersProject].each do |c|
c.send(:include, StubbedRepository) c.send(:include, StubbedRepository)
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment