summaryrefslogtreecommitdiff
path: root/spec/models/project_spec.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-12-05 13:29:41 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-12-05 13:29:41 +0100
commit9429514e303bdceee0621b5c4bf02ad8ca0a7add (patch)
treea7bc5cc425601c4ea73ff9a9be90eebc21a93b17 /spec/models/project_spec.rb
parentb9d8d85e20af046c7dbe11c69fd3252f0486b9b2 (diff)
parent3138fcdcd70fd30fea74deff537b9836d6c94d21 (diff)
downloadgitlab-ce-9429514e303bdceee0621b5c4bf02ad8ca0a7add.tar.gz
Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clusters
Diffstat (limited to 'spec/models/project_spec.rb')
-rw-r--r--spec/models/project_spec.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 521b7bd70ba..000d5b7126d 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -315,7 +315,6 @@ describe Project do
it { is_expected.to delegate_method(:empty_repo?).to(:repository) }
it { is_expected.to delegate_method(:members).to(:team).with_prefix(true) }
- it { is_expected.to delegate_method(:count).to(:forks).with_prefix(true) }
it { is_expected.to delegate_method(:name).to(:owner).with_prefix(true).with_arguments(allow_nil: true) }
end
@@ -1717,8 +1716,7 @@ describe Project do
expect(RepositoryForkWorker).to receive(:perform_async).with(
project.id,
forked_from_project.repository_storage_path,
- forked_from_project.disk_path,
- project.namespace.full_path).and_return(import_jid)
+ forked_from_project.disk_path).and_return(import_jid)
expect(project.add_import_job).to eq(import_jid)
end
@@ -2473,7 +2471,7 @@ describe Project do
it 'returns the number of forks' do
project = build(:project)
- allow(project.forks).to receive(:count).and_return(1)
+ expect_any_instance_of(Projects::ForksCountService).to receive(:count).and_return(1)
expect(project.forks_count).to eq(1)
end