Merge branch 'sh-fix-project-mirrors-mix-http-ssh-creds-ce' into 'master'
Add clear_credentials method to ProjectImportData See merge request gitlab-org/gitlab-ce!24373
This commit is contained in:
commit
09d9b11513
|
@ -30,4 +30,8 @@ class ProjectImportData < ActiveRecord::Base
|
|||
def merge_credentials(hash)
|
||||
self.credentials = credentials.to_h.merge(hash) unless hash.empty?
|
||||
end
|
||||
|
||||
def clear_credentials
|
||||
self.credentials = {}
|
||||
end
|
||||
end
|
||||
|
|
|
@ -39,4 +39,15 @@ describe ProjectImportData do
|
|||
expect(row.credentials).to eq({ 'number' => 10, 'foo' => 'bar' })
|
||||
end
|
||||
end
|
||||
|
||||
describe '#clear_credentials' do
|
||||
it 'clears out the Hash' do
|
||||
row = described_class.new
|
||||
|
||||
row.merge_credentials('number' => 10)
|
||||
row.clear_credentials
|
||||
|
||||
expect(row.credentials).to eq({})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue