Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-05-04 12:45:16 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-05-07 15:10:04 +0300
commit92482e01b45c337c0b9d761efd0297fc97ffcac0 (patch)
treedb5b98ede77dd50d0d0a67c49763036bdff5828e /spec/factories
parent965d0394d371f427ad0423bda2a6dc8867b31563 (diff)
Bump Gitaly to 0.98.0
Hooks were run for wikis, but given the internal API wasn't responding failures happended, as seen on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18693
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/project_wikis.rb2
-rw-r--r--spec/factories/projects.rb7
2 files changed, 8 insertions, 1 deletions
diff --git a/spec/factories/project_wikis.rb b/spec/factories/project_wikis.rb
index db2eb4fc863..4d21ed47f39 100644
--- a/spec/factories/project_wikis.rb
+++ b/spec/factories/project_wikis.rb
@@ -2,7 +2,7 @@ FactoryBot.define do
factory :project_wiki do
skip_create
- project
+ association :project, :wiki_repo
user { project.creator }
initialize_with { new(project, user) }
end
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index a6128903546..9ab57af1c60 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -193,6 +193,13 @@ FactoryBot.define do
trait :wiki_repo do
after(:create) do |project|
raise 'Failed to create wiki repository!' unless project.create_wiki
+
+ # We delete hooks so that gitlab-shell will not try to authenticate with
+ # an API that isn't running
+ project.gitlab_shell.rm_directory(
+ project.repository_storage,
+ File.join("#{project.wiki.repository.disk_path}.git", "hooks")
+ )
end
end