summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-04-11 10:03:19 +0200
committerAzul <azul@leap.se>2014-04-11 10:07:23 +0200
commit636692f9921bd695d726695d2d46c91f5a6e56f3 (patch)
treea7cc0b89007bd273ae7719f31c16e052a141fec7 /test
parent32136605ddd405a0bf47f3b795b22fd4b49465b5 (diff)
move engines into engines directory
Also renamed help to support so it's harder to confuse it with documentation
Diffstat (limited to 'test')
-rw-r--r--test/factories.rb4
-rw-r--r--test/test_helper.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/test/factories.rb b/test/factories.rb
index 980e2aa..ac9333c 100644
--- a/test/factories.rb
+++ b/test/factories.rb
@@ -1,6 +1,8 @@
-Dir.glob(Rails.root.join('*','test','factories.rb')) do |factory_file|
+ENGINE_FACTORY_FILES = Rails.root.join('engines','*','test','factories.rb')
+Dir.glob(ENGINE_FACTORY_FILES) do |factory_file|
require factory_file
end
+
FactoryGirl.define do
factory :user do
diff --git a/test/test_helper.rb b/test/test_helper.rb
index b844b90..d001ac7 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -8,7 +8,7 @@ require 'mocha/setup'
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
# Load support files from all engines
-Dir["#{File.dirname(__FILE__)}/../*/test/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/../engines/*/test/support/**/*.rb"].each { |f| require f }
class ActiveSupport::TestCase
# Add more helper methods to be used by all tests here...