summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2017-08-16 04:49:54 +0200
committerGabriel Mazetto <brodock@gmail.com>2017-08-22 06:33:20 +0200
commitd17a7be8308b06b7077a7cffc5d258148ee08c87 (patch)
tree3c5e5f47644f5d605649ee977654788d4f512739 /spec
parent78823675b24e82e73a523ad98f1dec78bec6976c (diff)
downloadgitlab-ce-d17a7be8308b06b7077a7cffc5d258148ee08c87.tar.gz
Refactor project and storage types
Diffstat (limited to 'spec')
-rw-r--r--spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb2
-rw-r--r--spec/models/project_spec.rb8
-rw-r--r--spec/workers/namespaceless_project_destroy_worker_spec.rb2
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb b/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
index 12cac1d033d..b47f3314926 100644
--- a/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
+++ b/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
@@ -4,7 +4,7 @@ require Rails.root.join('db', 'post_migrate', '20170502101023_cleanup_namespacel
describe CleanupNamespacelessPendingDeleteProjects do
before do
# Stub after_save callbacks that will fail when Project has no namespace
- allow_any_instance_of(Project).to receive(:ensure_storage_path_exist).and_return(nil)
+ allow_any_instance_of(Project).to receive(:ensure_storage_path_exists).and_return(nil)
allow_any_instance_of(Project).to receive(:update_project_statistics).and_return(nil)
end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 87f31e2a588..6b646393696 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -2334,11 +2334,11 @@ describe Project do
end
end
- describe '#ensure_storage_path_exist' do
+ describe '#ensure_storage_path_exists' do
it 'delegates to gitlab_shell to ensure namespace is created' do
expect(gitlab_shell).to receive(:add_namespace).with(project.repository_storage_path, project.base_dir)
- project.ensure_storage_path_exist
+ project.ensure_storage_path_exists
end
end
@@ -2425,11 +2425,11 @@ describe Project do
end
end
- describe '#ensure_storage_path_exist' do
+ describe '#ensure_storage_path_exists' do
it 'delegates to gitlab_shell to ensure namespace is created' do
expect(gitlab_shell).to receive(:add_namespace).with(project.repository_storage_path, '6b/86')
- project.ensure_storage_path_exist
+ project.ensure_storage_path_exists
end
end
diff --git a/spec/workers/namespaceless_project_destroy_worker_spec.rb b/spec/workers/namespaceless_project_destroy_worker_spec.rb
index f2706254284..817e103fd9a 100644
--- a/spec/workers/namespaceless_project_destroy_worker_spec.rb
+++ b/spec/workers/namespaceless_project_destroy_worker_spec.rb
@@ -5,7 +5,7 @@ describe NamespacelessProjectDestroyWorker do
before do
# Stub after_save callbacks that will fail when Project has no namespace
- allow_any_instance_of(Project).to receive(:ensure_storage_path_exist).and_return(nil)
+ allow_any_instance_of(Project).to receive(:ensure_storage_path_exists).and_return(nil)
allow_any_instance_of(Project).to receive(:update_project_statistics).and_return(nil)
end