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-02-05 15:09:15 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-05 15:09:15 +0300
commit20d564f1064622ef0623434372ac3ceb03173331 (patch)
tree000d95440566cd189ea774168c9756bcc8fc5fae /spec/models/lfs_object_spec.rb
parent26384c9a61da9922b8fa4b8351d4e42d51661b37 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/lfs_object_spec.rb')
-rw-r--r--spec/models/lfs_object_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/models/lfs_object_spec.rb b/spec/models/lfs_object_spec.rb
index 44445429d3e..51713906d06 100644
--- a/spec/models/lfs_object_spec.rb
+++ b/spec/models/lfs_object_spec.rb
@@ -44,8 +44,8 @@ describe LfsObject do
end
describe '#project_allowed_access?' do
- set(:lfs_object) { create(:lfs_objects_project).lfs_object }
- set(:project) { create(:project) }
+ let_it_be(:lfs_object) { create(:lfs_objects_project).lfs_object }
+ let_it_be(:project, reload: true) { create(:project) }
it 'returns true when project is linked' do
create(:lfs_objects_project, lfs_object: lfs_object, project: project)
@@ -58,9 +58,9 @@ describe LfsObject do
end
context 'when project is a member of a fork network' do
- set(:fork_network) { create(:fork_network) }
- set(:fork_network_root_project) { fork_network.root_project }
- set(:fork_network_membership) { create(:fork_network_member, project: project, fork_network: fork_network) }
+ let_it_be(:fork_network) { create(:fork_network) }
+ let_it_be(:fork_network_root_project, reload: true) { fork_network.root_project }
+ let_it_be(:fork_network_membership) { create(:fork_network_member, project: project, fork_network: fork_network) }
it 'returns true for all members when forked project is linked' do
create(:lfs_objects_project, lfs_object: lfs_object, project: project)