diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/factories/terraform | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/factories/terraform')
-rw-r--r-- | spec/factories/terraform/state.rb | 6 | ||||
-rw-r--r-- | spec/factories/terraform/state_version.rb | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/spec/factories/terraform/state.rb b/spec/factories/terraform/state.rb index d80c1315e28..c54a8aedbc6 100644 --- a/spec/factories/terraform/state.rb +++ b/spec/factories/terraform/state.rb @@ -2,7 +2,7 @@ FactoryBot.define do factory :terraform_state, class: 'Terraform::State' do - project { create(:project) } + project { association(:project) } sequence(:name) { |n| "state-#{n}" } @@ -14,12 +14,12 @@ FactoryBot.define do trait :locked do sequence(:lock_xid) { |n| "lock-#{n}" } locked_at { Time.current } - locked_by_user { create(:user) } + locked_by_user { association(:user) } end trait :with_version do after(:create) do |state| - create(:terraform_state_version, :with_file, terraform_state: state) + create(:terraform_state_version, terraform_state: state) end end diff --git a/spec/factories/terraform/state_version.rb b/spec/factories/terraform/state_version.rb index b45bd01fd3c..c6bd08815cf 100644 --- a/spec/factories/terraform/state_version.rb +++ b/spec/factories/terraform/state_version.rb @@ -4,6 +4,7 @@ FactoryBot.define do factory :terraform_state_version, class: 'Terraform::StateVersion' do terraform_state factory: :terraform_state created_by_user factory: :user + build { association(:ci_build, project: terraform_state.project) } sequence(:version) file { fixture_file_upload('spec/fixtures/terraform/terraform.tfstate', 'application/json') } |