remove gitolite stub

Dmitriy Zaporozhets
1 parent 935b6ae6
Showing 3 changed files with 21 additions and 24 deletions Show diff stats
spec/spec_helper.rb
spec/support/gitolite_stub.rb
spec/support/stubbed_repository.rb
@@ -24,7 +24,6 @@ RSpec.configure do |config|
   config.mock_with :rspec
   config.include LoginHelpers, type: :request
-  config.include GitoliteStub
   config.include FactoryGirl::Syntax::Methods
   config.include Devise::TestHelpers, type: :controller
@@ -34,8 +33,6 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = false
   config.before do
-    stub_gitolite!
-
     # Use tmp dir for FS manipulations
     temp_repos_path = Rails.root.join('tmp', 'test-git-base-path')
     Gitlab.config.gitolite.stub(repos_path: temp_repos_path)
@@ -1,21 +0,0 @@
-module GitoliteStub
-  def stub_gitolite!
-    stub_gitlab_gitolite
-    stub_gitolite_admin
-  end
-
-  def stub_gitolite_admin
-    gitolite_admin = double('Gitolite::GitoliteAdmin')
-    gitolite_admin.as_null_object
-
-    Gitolite::GitoliteAdmin.stub(new: gitolite_admin)
-  end
-
-  def stub_gitlab_gitolite
-    gitolite_config = double('Gitlab::GitoliteConfig')
-    gitolite_config.stub(apply: ->() { yield(self) })
-    gitolite_config.as_null_object
-
-    Gitlab::GitoliteConfig.stub(new: gitolite_config)
-  end
-end
 require "repository"
 require "project"
+require "shell"
 # Stubs out all Git repository access done by models so that specs can run
 # against fake repositories without Grit complaining that they don't exist.
@@ -36,3 +37,23 @@ class GitLabTestRepo &lt; Repository
     @repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))
   end
 end
+
+module Gitlab
+  class Shell
+    def add_repository name
+      true
+    end
+
+    def remove_repository name
+      true
+    end
+
+    def add_key name, key
+      true
+    end
+
+    def remove_key key
+      true
+    end
+  end
+end
	@@ -1,21 +0,0 @@	@@ -1,21 +0,0 @@
1	-module GitoliteStub
2	- def stub_gitolite!
3	- stub_gitlab_gitolite
4	- stub_gitolite_admin
5	- end
6	-
7	- def stub_gitolite_admin
8	- gitolite_admin = double('Gitolite::GitoliteAdmin')
9	- gitolite_admin.as_null_object
10	-
11	- Gitolite::GitoliteAdmin.stub(new: gitolite_admin)
12	- end
13	-
14	- def stub_gitlab_gitolite
15	- gitolite_config = double('Gitlab::GitoliteConfig')
16	- gitolite_config.stub(apply: ->() { yield(self) })
17	- gitolite_config.as_null_object
18	-
19	- Gitlab::GitoliteConfig.stub(new: gitolite_config)
20	- end
21	-end
1	require "repository"	1	require "repository"
2	require "project"	2	require "project"
		3	+require "shell"
3		4
4	# Stubs out all Git repository access done by models so that specs can run	5	# Stubs out all Git repository access done by models so that specs can run
5	# against fake repositories without Grit complaining that they don't exist.	6	# against fake repositories without Grit complaining that they don't exist.
	@@ -36,3 +37,23 @@ class GitLabTestRepo < Repository		@@ -36,3 +37,23 @@ class GitLabTestRepo < Repository
36	@repo \|\|= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))	37	@repo \|\|= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))
37	end	38	end
38	end	39	end
		40	+
		41	+module Gitlab
		42	+ class Shell
		43	+ def add_repository name
		44	+ true
		45	+ end
		46	+
		47	+ def remove_repository name
		48	+ true
		49	+ end
		50	+
		51	+ def add_key name, key
		52	+ true
		53	+ end
		54	+
		55	+ def remove_key key
		56	+ true
		57	+ end
		58	+ end
		59	+end