diff options
| author | James Lopez <james@jameslopez.es> | 2016-09-07 10:04:20 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-09-09 14:56:10 +0200 |
| commit | 37fbb15a2967523d41887f55b6f38e6d74bd6d7f (patch) | |
| tree | a2aad9e59b9b95530f5f1383d9dc9ec09e16d77d /spec/support/import_export | |
| parent | 0f15e971fc8c06a4c76eaaad16abe4229816a676 (diff) | |
| download | gitlab-ce-37fbb15a2967523d41887f55b6f38e6d74bd6d7f.tar.gz | |
refactored some stuff and added new models / attributes after rebase
Diffstat (limited to 'spec/support/import_export')
| -rw-r--r-- | spec/support/import_export/configuration_helper.rb | 6 | ||||
| -rw-r--r-- | spec/support/import_export/export_file_helper.rb | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/spec/support/import_export/configuration_helper.rb b/spec/support/import_export/configuration_helper.rb index 3276313df51..f752508d48c 100644 --- a/spec/support/import_export/configuration_helper.rb +++ b/spec/support/import_export/configuration_helper.rb @@ -23,9 +23,7 @@ module ConfigurationHelper attributes end - def associations_for(model_class) - model_class.reflect_on_all_associations.map do |association| - association.name.to_s - end + def associations_for(safe_model) + safe_model.reflect_on_all_associations.map { |assoc| assoc.name.to_s } end end diff --git a/spec/support/import_export/export_file_helper.rb b/spec/support/import_export/export_file_helper.rb index de066f1cd66..7e75ed9793b 100644 --- a/spec/support/import_export/export_file_helper.rb +++ b/spec/support/import_export/export_file_helper.rb @@ -120,10 +120,6 @@ module ExportFileHelper false end - def associations_for(safe_model) - safe_model.reflect_on_all_associations.map { |assoc| assoc.name.to_s } - end - # Compares model attributes with those those found in the hash # and returns true if there is a match, ignoring some excluded attributes. def safe_model?(model, excluded_attributes, parent) |