From a39cfb54616fe156ba43ac3df2b771c3a11d2879 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Tue, 28 Aug 2012 20:57:54 -0400 Subject: [PATCH] Simplify StubbedRepository after GitHost changes from master --- spec/support/stubbed_repository.rb | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/spec/support/stubbed_repository.rb b/spec/support/stubbed_repository.rb index fa6c4c9..637754b 100644 --- a/spec/support/stubbed_repository.rb +++ b/spec/support/stubbed_repository.rb @@ -9,34 +9,19 @@ module StubbedRepository # will overwrite our stub, so use alias_method to ensure it's our stub # 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 :satellite, :fake_satellite - end - - def fake_update_repository - true - end - - def fake_destroy_repository - true - end - - def fake_repository_delete_key - true + alias_method :path_to_repo, :fake_path_to_repo + alias_method :satellite, :fake_satellite end def fake_path_to_repo - if new_record? - # There are a couple Project specs that expect the Project's path to be - # in the returned path, so let's patronize them. + if new_record? || path == 'newproject' + # There are a couple Project specs and features that expect the Project's + # path to be in the returned path, so let's patronize them. File.join(Rails.root, 'tmp', 'tests', path) else # For everything else, just give it the path to one of our real seeded # repos. - File.join(Rails.root, 'tmp', 'tests', 'gitlabhq_1') + File.join(Rails.root, 'tmp', 'tests', 'gitlabhq_0') end end @@ -55,6 +40,6 @@ module StubbedRepository end end -[Project, Key, ProtectedBranch, UsersProject].each do |c| +[Project, ProtectedBranch, UsersProject].each do |c| c.send(:include, StubbedRepository) end -- libgit2 0.21.2