diff options
author | Stan Hu <stanhu@gmail.com> | 2019-04-20 13:27:54 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-04-20 13:27:54 +0000 |
commit | 10bf3bbc904c96d5d7633f58cb93cf6927e18c8e (patch) | |
tree | e4b6118887e52c14e9c8847de7eb9b1cb38b523e /spec | |
parent | 9c2b37d7c4621f8284530565fa1d361b12502715 (diff) | |
parent | a02e22438de38e4eca64e45c324af10626b3975c (diff) | |
download | gitlab-ce-10bf3bbc904c96d5d7633f58cb93cf6927e18c8e.tar.gz |
Merge branch 'jv-dedup-activerecord' into 'master'
Fix wrong use of ActiveRecord in PoolRepository
See merge request gitlab-org/gitlab-ce!27464
Diffstat (limited to 'spec')
-rw-r--r-- | spec/factories/pool_repositories.rb | 1 | ||||
-rw-r--r-- | spec/models/pool_repository_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/spec/factories/pool_repositories.rb b/spec/factories/pool_repositories.rb index 36e54cf44b4..8cac666069c 100644 --- a/spec/factories/pool_repositories.rb +++ b/spec/factories/pool_repositories.rb @@ -5,6 +5,7 @@ FactoryBot.define do before(:create) do |pool| pool.source_project = create(:project, :repository) + pool.source_project.update!(pool_repository: pool) end trait :scheduled do diff --git a/spec/models/pool_repository_spec.rb b/spec/models/pool_repository_spec.rb index e5a3a3ad66e..ae00f9df89e 100644 --- a/spec/models/pool_repository_spec.rb +++ b/spec/models/pool_repository_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' describe PoolRepository do describe 'associations' do it { is_expected.to belong_to(:shard) } - it { is_expected.to have_one(:source_project) } + it { is_expected.to belong_to(:source_project) } it { is_expected.to have_many(:member_projects) } end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 9f6a0b53281..bb0257e7456 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -4702,6 +4702,8 @@ describe Project do it 'returns that pool repository' do expect(subject).not_to be_empty expect(subject[:pool_repository]).to be_persisted + + expect(project.reload.pool_repository).to eq(subject[:pool_repository]) end end end |