summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-08-28 18:51:23 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-08-28 18:51:23 +0800
commit3a4da8ce8b57aa430720de75397a38c2be0fc6c0 (patch)
treeb383641b30c0c243b87832c42b3225362fdd7a6d
parent081e2fce8240f86f991b0bd3653ef6756f2cf9aa (diff)
downloadgitlab-ce-3a4da8ce8b57aa430720de75397a38c2be0fc6c0.tar.gz
Fix tests
-rw-r--r--app/models/repository.rb6
-rw-r--r--spec/models/project_spec.rb10
2 files changed, 8 insertions, 8 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index c247fb840ce..b917eb4c302 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -1,9 +1,9 @@
require 'securerandom'
class Repository
- REF_MERGE_REQUEST = 'merge-requests'
- REF_KEEP_AROUND = 'keep-around'
- REF_ENVIRONMENTS = 'environments'
+ REF_MERGE_REQUEST = 'merge-requests'.freeze
+ REF_KEEP_AROUND = 'keep-around'.freeze
+ REF_ENVIRONMENTS = 'environments'.freeze
RESERVED_REFS_NAMES = %W[
heads
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 7631207b1d0..11717ba39e8 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1563,14 +1563,14 @@ describe Project do
describe 'project import state transitions' do
context 'state transition: [:started] => [:finished]' do
- let(:housecleaning_service) { spy(:housecleaning_service) }
+ let(:after_import_service) { spy(:after_import_service) }
let(:housekeeping_service) { spy(:housekeeping_service) }
before do
- allow(Projects::HousecleaningService)
- .to receive(:new) { housecleaning_service }
+ allow(Projects::AfterImportService)
+ .to receive(:new) { after_import_service }
- allow(housecleaning_service)
+ allow(after_import_service)
.to receive(:execute) { housekeeping_service.execute }
allow(Projects::HousekeepingService)
@@ -1589,7 +1589,7 @@ describe Project do
project.import_finish
- expect(housecleaning_service).to have_received(:execute)
+ expect(after_import_service).to have_received(:execute)
expect(housekeeping_service).to have_received(:execute)
end