diff options
author | Gabriel Mazetto <brodock@gmail.com> | 2019-01-22 04:33:32 +0100 |
---|---|---|
committer | Gabriel Mazetto <brodock@gmail.com> | 2019-01-22 13:55:18 +0100 |
commit | d391dfb4acd1c75857b1578c449b0e508fc8a0ed (patch) | |
tree | 8899b80cb615dd518efe2b8a614c177ab0ca0b89 /spec/migrations | |
parent | 7a7948e64b2d5bd9f00f9f58862b0a0599e78c83 (diff) | |
download | gitlab-ce-d391dfb4acd1c75857b1578c449b0e508fc8a0ed.tar.gz |
Refactored AfterRenameService to reduce coupling
We still rely on the Dirty API for project rename (before/after) values,
but we don't access the dirty api from the service class anymore.
The previous value is now part of the initialization, which makes it
easier to test and the behavior is clearer.
The same was done with the `rename_repo` on the Storage classes, we now
provide before and after values as part of the method signature.
Diffstat (limited to 'spec/migrations')
-rw-r--r-- | spec/migrations/rename_more_reserved_project_names_spec.rb | 5 | ||||
-rw-r--r-- | spec/migrations/rename_reserved_project_names_spec.rb | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/spec/migrations/rename_more_reserved_project_names_spec.rb b/spec/migrations/rename_more_reserved_project_names_spec.rb index baf16c2ce53..80ae209e9d1 100644 --- a/spec/migrations/rename_more_reserved_project_names_spec.rb +++ b/spec/migrations/rename_more_reserved_project_names_spec.rb @@ -37,9 +37,8 @@ describe RenameMoreReservedProjectNames, :delete do .to receive(:execute) .and_raise(Projects::AfterRenameService::RenameFailedError) - allow(Projects::AfterRenameService) - .to receive(:new) - .with(project) + expect(migration) + .to receive(:after_rename_service) .and_return(service) end diff --git a/spec/migrations/rename_reserved_project_names_spec.rb b/spec/migrations/rename_reserved_project_names_spec.rb index 7818aa0d560..93e5c032287 100644 --- a/spec/migrations/rename_reserved_project_names_spec.rb +++ b/spec/migrations/rename_reserved_project_names_spec.rb @@ -41,9 +41,8 @@ describe RenameReservedProjectNames, :migration, schema: :latest do .to receive(:execute) .and_raise(Projects::AfterRenameService::RenameFailedError) - allow(Projects::AfterRenameService) - .to receive(:new) - .with(project) + expect(migration) + .to receive(:after_rename_service) .and_return(service) end |