From 17f3ef408d14382d63ec2b64ee935be5bce284bd Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 22 Jul 2011 14:47:47 -0400 Subject: [PATCH] Fix find_definitions to expand the path instead of always prepending . --- features/find_definitions.feature | 15 +++++++++++++ .../step_definitions/factory_girl_steps.rb | 8 +++++++ lib/factory_girl/find_definitions.rb | 6 +++-- spec/factory_girl/find_definitions_spec.rb | 22 +++++++++---------- 4 files changed, 38 insertions(+), 13 deletions(-) diff --git a/features/find_definitions.feature b/features/find_definitions.feature index d24976d..6303232 100644 --- a/features/find_definitions.feature +++ b/features/find_definitions.feature @@ -14,6 +14,21 @@ Feature: Factory girl can find factory definitions correctly | name | | awesome!!! | + Scenario: Find definitions with an absolute path + Given a file named "awesome_factories.rb" with: + """ + FactoryGirl.define do + factory :awesome_category, :parent => :category do + name "awesome!!!" + end + end + """ + When "awesome_factories.rb" is added to Factory Girl's file definitions path as an absolute path + And I create a "awesome_category" instance from Factory Girl + Then I should find the following for the last category: + | name | + | awesome!!! | + Scenario: Find definitions with a folder Given a file named "nested/great_factories.rb" with: """ diff --git a/features/step_definitions/factory_girl_steps.rb b/features/step_definitions/factory_girl_steps.rb index 3af93a6..5bb03f0 100644 --- a/features/step_definitions/factory_girl_steps.rb +++ b/features/step_definitions/factory_girl_steps.rb @@ -5,6 +5,14 @@ When /^"([^"]*)" is added to Factory Girl's file definitions path$/ do |file_nam FactoryGirl.find_definitions end +When /^"([^"]*)" is added to Factory Girl's file definitions path as an absolute path$/ do |file_name| + new_factory_file = File.expand_path(File.join(current_dir, file_name.gsub(".rb", ""))) + + FactoryGirl.definition_file_paths ||= [] + FactoryGirl.definition_file_paths << new_factory_file + FactoryGirl.find_definitions +end + When /^I create a "([^"]*)" instance from Factory Girl$/ do |factory_name| FactoryGirl.create(factory_name) end diff --git a/lib/factory_girl/find_definitions.rb b/lib/factory_girl/find_definitions.rb index 307fa1c..0c6dc9b 100644 --- a/lib/factory_girl/find_definitions.rb +++ b/lib/factory_girl/find_definitions.rb @@ -11,11 +11,13 @@ module FactoryGirl def self.find_definitions #:nodoc: definition_file_paths.each do |path| - require("./#{path}.rb") if File.exists?("#{path}.rb") + path = File.expand_path(path) + + require("#{path}.rb") if File.exists?("#{path}.rb") if File.directory? path Dir[File.join(path, '**', '*.rb')].sort.each do |file| - require "./#{file}" + require file end end end diff --git a/spec/factory_girl/find_definitions_spec.rb b/spec/factory_girl/find_definitions_spec.rb index 1b0c118..6daec8f 100644 --- a/spec/factory_girl/find_definitions_spec.rb +++ b/spec/factory_girl/find_definitions_spec.rb @@ -10,7 +10,7 @@ end RSpec::Matchers.define :require_definitions_from do |file| match do |given| - @has_received = have_received.method_missing(:require, file) + @has_received = have_received.method_missing(:require, File.expand_path(file)) @has_received.matches?(given) end @@ -47,7 +47,7 @@ describe "definition loading" do describe "with factories.rb" do in_directory_with_files 'factories.rb' it_should_behave_like "finds definitions" do - it { should require_definitions_from('./factories.rb') } + it { should require_definitions_from('factories.rb') } end end @@ -55,14 +55,14 @@ describe "definition loading" do describe "with a factories file under #{dir}" do in_directory_with_files File.join(dir, 'factories.rb') it_should_behave_like "finds definitions" do - it { should require_definitions_from("./#{dir}/factories.rb") } + it { should require_definitions_from("#{dir}/factories.rb") } end end describe "with a factories file under #{dir}/factories" do in_directory_with_files File.join(dir, 'factories', 'post_factory.rb') it_should_behave_like "finds definitions" do - it { should require_definitions_from("./#{dir}/factories/post_factory.rb") } + it { should require_definitions_from("#{dir}/factories/post_factory.rb") } end end @@ -70,8 +70,8 @@ describe "definition loading" do in_directory_with_files File.join(dir, 'factories', 'post_factory.rb'), File.join(dir, 'factories', 'person_factory.rb') it_should_behave_like "finds definitions" do - it { should require_definitions_from("./#{dir}/factories/post_factory.rb") } - it { should require_definitions_from("./#{dir}/factories/person_factory.rb") } + it { should require_definitions_from("#{dir}/factories/post_factory.rb") } + it { should require_definitions_from("#{dir}/factories/person_factory.rb") } end end @@ -91,9 +91,9 @@ describe "definition loading" do File.join(dir, 'factories', 'post_factory.rb'), File.join(dir, 'factories', 'person_factory.rb') it_should_behave_like "finds definitions" do - it { should require_definitions_from("./#{dir}/factories.rb") } - it { should require_definitions_from("./#{dir}/factories/post_factory.rb") } - it { should require_definitions_from("./#{dir}/factories/person_factory.rb") } + it { should require_definitions_from("#{dir}/factories.rb") } + it { should require_definitions_from("#{dir}/factories/post_factory.rb") } + it { should require_definitions_from("#{dir}/factories/person_factory.rb") } end end @@ -101,8 +101,8 @@ describe "definition loading" do in_directory_with_files File.join(dir, 'factories', 'subdirectory', 'post_factory.rb'), File.join(dir, 'factories', 'subdirectory', 'person_factory.rb') it_should_behave_like "finds definitions" do - it { should require_definitions_from("./#{dir}/factories/subdirectory/post_factory.rb") } - it { should require_definitions_from("./#{dir}/factories/subdirectory/person_factory.rb") } + it { should require_definitions_from("#{dir}/factories/subdirectory/post_factory.rb") } + it { should require_definitions_from("#{dir}/factories/subdirectory/person_factory.rb") } end end end