diff options
author | James Lopez <james@jameslopez.es> | 2016-06-14 11:20:47 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-06-14 11:20:47 +0300 |
commit | 77794579078a9c65a4e9ee4fa8d94113104f69b3 (patch) | |
tree | 5d71ce5255b4c611bf2e9da9823a20edc0ab71c1 /spec/lib/gitlab/import_export | |
parent | 9ff1990422eebc11e9c4b523b3b4a58d56943af2 (diff) |
fix merge
Diffstat (limited to 'spec/lib/gitlab/import_export')
-rw-r--r-- | spec/lib/gitlab/import_export/reader_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/gitlab/import_export/reader_spec.rb b/spec/lib/gitlab/import_export/reader_spec.rb index d7029c2efe6..109522fa626 100644 --- a/spec/lib/gitlab/import_export/reader_spec.rb +++ b/spec/lib/gitlab/import_export/reader_spec.rb @@ -57,25 +57,25 @@ describe Gitlab::ImportExport::Reader, lib: true do end it 'generates the correct hash for a relation with included attributes' do - setup_yaml(project_tree: [:issues], included_attributes: {issues: [:name, :description]}) + setup_yaml(project_tree: [:issues], included_attributes: { issues: [:name, :description] }) expect(described_class.new(shared: shared).project_tree).to match(include: [{ issues: { only: [:name, :description] } }]) end it 'generates the correct hash for a relation with excluded attributes' do - setup_yaml(project_tree: [:issues], excluded_attributes: {issues: [:name]}) + setup_yaml(project_tree: [:issues], excluded_attributes: { issues: [:name] }) expect(described_class.new(shared: shared).project_tree).to match(include: [{ issues: { except: [:name] } }]) end it 'generates the correct hash for a relation with both excluded and included attributes' do - setup_yaml(project_tree: [:issues], excluded_attributes: {issues: [:name]}, included_attributes: {issues: [:description]}) + setup_yaml(project_tree: [:issues], excluded_attributes: { issues: [:name] }, included_attributes: { issues: [:description] }) - expect(described_class.new(shared: shared).project_tree).to match(include: [{ issues: { except: [:name], only: [:description]} }]) + expect(described_class.new(shared: shared).project_tree).to match(include: [{ issues: { except: [:name], only: [:description] } }]) end it 'generates the correct hash for a relation with custom methods' do - setup_yaml(project_tree: [:issues], methods: {issues: [:name]}) + setup_yaml(project_tree: [:issues], methods: { issues: [:name] }) expect(described_class.new(shared: shared).project_tree).to match(include: [{ issues: { methods: [:name] } }]) end |