From 591ec7afde160ab95c514eeca659af4f20208dc4 Mon Sep 17 00:00:00 2001 From: Dmytrii Nagirniak Date: Thu, 15 Dec 2011 13:14:16 +1100 Subject: [PATCH] Be more agnostic to ORMs when using columns. This will allow using FG with neo4j still preserving semantics for other ORMs. --- lib/factory_girl/step_definitions.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/factory_girl/step_definitions.rb b/lib/factory_girl/step_definitions.rb index 62b3dc7..ee4c1cc 100644 --- a/lib/factory_girl/step_definitions.rb +++ b/lib/factory_girl/step_definitions.rb @@ -114,13 +114,14 @@ FactoryGirl.factories.each do |factory| if factory.build_class.respond_to?(:columns) factory.build_class.columns.each do |column| - human_column_name = column.name.downcase.gsub('_', ' ') + name = column.respond_to?(:name) ? column.name : column.to_s + human_column_name = name.downcase.gsub('_', ' ') Given /^an? #{human_name} exists with an? #{human_column_name} of "([^"]*)"$/i do |value| - FactoryGirl.create(factory.name, column.name => value) + FactoryGirl.create(factory.name, name => value) end Given /^(\d+) #{human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value| - FactoryGirl.create_list(factory.name, count.to_i, column.name => value) + FactoryGirl.create_list(factory.name, count.to_i, name => value) end end end