diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-04-26 14:23:36 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-04-26 14:23:36 +0900 |
commit | 4eb67ccff350d181e60e4666e459a364cd36b064 (patch) | |
tree | c2c3e606b364dc5f1eee3320cba9f8312be7e634 /spec/factories | |
parent | 0262ed904d293fba9ceb0e3d79f62ffe8e8a239f (diff) | |
parent | 55f07cc32e7684b21e0c1662c70128df14c6abf7 (diff) | |
download | gitlab-ce-4eb67ccff350d181e60e4666e459a364cd36b064.tar.gz |
Merge branch 'master' into live-trace-v2
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/deploy_tokens.rb | 8 | ||||
-rw-r--r-- | spec/factories/projects.rb | 13 |
2 files changed, 19 insertions, 2 deletions
diff --git a/spec/factories/deploy_tokens.rb b/spec/factories/deploy_tokens.rb index 5fea4a9d5a6..017e866e69c 100644 --- a/spec/factories/deploy_tokens.rb +++ b/spec/factories/deploy_tokens.rb @@ -10,5 +10,13 @@ FactoryBot.define do trait :revoked do revoked true end + + trait :gitlab_deploy_token do + name DeployToken::GITLAB_DEPLOY_TOKEN_NAME + end + + trait :expired do + expires_at { Date.today - 1.month } + end end end diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index 1ae6152a1f0..1904615778c 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -147,7 +147,15 @@ FactoryBot.define do # We delete hooks so that gitlab-shell will not try to authenticate with # an API that isn't running - FileUtils.rm_r(File.join(project.repository_storage_path, "#{project.disk_path}.git", 'hooks')) + project.gitlab_shell.rm_directory(project.repository_storage, + File.join("#{project.disk_path}.git", 'hooks')) + end + end + + trait :stubbed_repository do + after(:build) do |project| + allow(project).to receive(:empty_repo?).and_return(false) + allow(project.repository).to receive(:empty?).and_return(false) end end @@ -165,7 +173,8 @@ FactoryBot.define do after(:create) do |project| raise "Failed to create repository!" unless project.create_repository - FileUtils.rm_r(File.join(project.repository_storage_path, "#{project.disk_path}.git", 'refs')) + project.gitlab_shell.rm_directory(project.repository_storage, + File.join("#{project.disk_path}.git", 'refs')) end end |