diff options
author | Stan Hu <stanhu@gmail.com> | 2019-01-14 22:44:36 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-01-14 22:45:46 +0300 |
commit | 27ba546ec8dec5a64f030ec50aa53c447e1628d4 (patch) | |
tree | d98daa4e65b5e8c86e368fc4c09600672ada9898 | |
parent | 1a5de8955ae173946c9814645b3dc0d88a9e4de9 (diff) |
Add clear_credentials method to ProjectImportData
This backports changes made in
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9134.
-rw-r--r-- | app/models/project_import_data.rb | 4 | ||||
-rw-r--r-- | spec/models/project_import_data_spec.rb | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb index 525725034a5..aa0c121fe99 100644 --- a/app/models/project_import_data.rb +++ b/app/models/project_import_data.rb @@ -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 diff --git a/spec/models/project_import_data_spec.rb b/spec/models/project_import_data_spec.rb index e9910c0a5d1..fe47811f074 100644 --- a/spec/models/project_import_data_spec.rb +++ b/spec/models/project_import_data_spec.rb @@ -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 |