Dont init repo on every create(:repo)

Dmitriy Zaporozhets
1 parent 541d8994
Showing 7 changed files with 18 additions and 11 deletions Show diff stats
app/helpers/commits_helper.rb
app/models/gollum_wiki.rb
lib/gitlab/git/commit.rb
spec/factories.rb
spec/models/commit_spec.rb
spec/models/gollum_wiki_spec.rb
spec/support/test_env.rb
@@ -147,10 +147,6 @@ module CommitsHelper
   protected
-  def no_commit_message
-    "--no commit message"
-  end
-
   # Private: Returns a link to a person. If the person has a matching user and
   # is a member of the current @project it will link to the team member page.
   # Otherwise it will link to the person email as specified in the commit.
@@ -90,13 +90,17 @@ class GollumWiki
   private
   def create_repo!
-    if gitlab_shell.add_repository(path_with_namespace)
+    if init_repo(path_with_namespace)
       Gollum::Wiki.new(path_to_repo)
     else
       raise CouldNotCreateWikiError
     end
   end
+  def init_repo(path_with_namespace)
+    gitlab_shell.add_repository(path_with_namespace)
+  end
+
   def commit_details(action, message = nil, title = nil)
     commit_message = message || default_message(action, title)
@@ -144,6 +144,10 @@ module Gitlab
       rescue
         true
       end
+
+      def no_commit_message
+        "--no commit message"
+      end
     end
   end
 end
@@ -86,9 +86,9 @@ FactoryGirl.define do
       target_branch "master" # pretend bcf03b5d~3
       source_branch "stable" # pretend bcf03b5d
       st_commits do
-        [Commit.new(project.repo.commit('bcf03b5d')),
-         Commit.new(project.repo.commit('bcf03b5d~1')),
-         Commit.new(project.repo.commit('bcf03b5d~2'))]
+        [Commit.new(project.repository.commit('bcf03b5d')),
+         Commit.new(project.repository.commit('bcf03b5d~1')),
+         Commit.new(project.repository.commit('bcf03b5d~2'))]
       end
       st_diffs do
         project.repo.diff("bcf03b5d~3", "bcf03b5d")
@@ -120,6 +120,7 @@ FactoryGirl.define do
     factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff]
     trait :on_commit do
+      project factory: :project_with_code
       commit_id     "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
       noteable_type "Commit"
     end
@@ -129,6 +130,7 @@ FactoryGirl.define do
     end
     trait :on_merge_request do
+      project factory: :project_with_code
       noteable_id   1
       noteable_type "MergeRequest"
     end
 require 'spec_helper'
 describe Commit do
-  let(:commit) { create(:project).repository.commit }
+  let(:commit) { create(:project_with_code).repository.commit }
   describe '#title' do
@@ -81,7 +81,7 @@ describe GollumWiki do
     end
     it "raises CouldNotCreateWikiError if it can't create the wiki repository" do
-      Gitlab::Shell.any_instance.stub(:add_repository).and_return(false)
+      GollumWiki.any_instance.stub(:init_repo).and_return(false)
       expect { GollumWiki.new(project, user).wiki }.to raise_exception(GollumWiki::CouldNotCreateWikiError)
     end
   end
@@ -17,11 +17,12 @@ module TestEnv
     repos_path = Rails.root.join('tmp', 'test-git-base-path')
     Gitlab.config.gitlab_shell.stub(repos_path: repos_path)
-    Gitlab::Shell.any_instance.stub(:add_repository) do |path|
+    GollumWiki.any_instance.stub(:init_repo) do |path|
       create_temp_repo(File.join(repos_path, "#{path}.git"))
     end
     Gitlab::Shell.any_instance.stub(
+      add_repository: true,
       mv_repository: true,
       remove_repository: true,
       add_key: true,
1	require 'spec_helper'	1	require 'spec_helper'
2		2
3	describe Commit do	3	describe Commit do
4	- let(:commit) { create(:project).repository.commit }	4	+ let(:commit) { create(:project_with_code).repository.commit }
5		5
6		6
7	describe '#title' do	7	describe '#title' do
	@@ -81,7 +81,7 @@ describe GollumWiki do		@@ -81,7 +81,7 @@ describe GollumWiki do
81	end	81	end
82		82
83	it "raises CouldNotCreateWikiError if it can't create the wiki repository" do	83	it "raises CouldNotCreateWikiError if it can't create the wiki repository" do
84	- Gitlab::Shell.any_instance.stub(:add_repository).and_return(false)	84	+ GollumWiki.any_instance.stub(:init_repo).and_return(false)
85	expect { GollumWiki.new(project, user).wiki }.to raise_exception(GollumWiki::CouldNotCreateWikiError)	85	expect { GollumWiki.new(project, user).wiki }.to raise_exception(GollumWiki::CouldNotCreateWikiError)
86	end	86	end
87	end	87	end