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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-24 21:09:51 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-24 21:09:51 +0300
commit12ce3cc57c9f97bacdbb1ea361df833c7fb4350d (patch)
treef6cb314174929aeac893be68b62894d5234652ee /spec/factories/pages_deployments.rb
parenta17eb314cff10a779ef550b1eb203ec9a61afdb9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories/pages_deployments.rb')
-rw-r--r--spec/factories/pages_deployments.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/spec/factories/pages_deployments.rb b/spec/factories/pages_deployments.rb
index 1bea003d683..20b8e4782df 100644
--- a/spec/factories/pages_deployments.rb
+++ b/spec/factories/pages_deployments.rb
@@ -4,9 +4,12 @@ FactoryBot.define do
factory :pages_deployment, class: 'PagesDeployment' do
project
file_store { ObjectStorage::SUPPORTED_STORES.first }
- size { 1.megabytes }
- # TODO: replace with proper file uploaded in https://gitlab.com/gitlab-org/gitlab/-/issues/245295
- file { "dummy string" }
+ after(:build) do |deployment, _evaluator|
+ deployment.file = fixture_file_upload(
+ Rails.root.join("spec/fixtures/pages.zip")
+ )
+ deployment.size = deployment.file.size
+ end
end
end