Fixes #15042 - Use a single fixture dir (Katello#6309)

shlomizadok · Sep 13, 2016 · f371390 · f371390
1 parent e64e6d8
commit f371390
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ bundler.d/local*.rb
 config/initializers/_local*.rb
 config/initializers/local*.rb
 lib/tasks/local*.rb
+test/fixtures/all_fixtures
 doc/graphs/*.svg
 .ruby-version
 .ruby-gemset

diff --git a/test/katello_test_helper.rb b/test/katello_test_helper.rb
@@ -74,7 +74,9 @@ module FixtureTestCase
 
     Katello::FixturesSupport.set_fixture_classes(self)
 
-    self.fixture_path = Dir.mktmpdir("katello_fixtures")
+    self.fixture_path = "#{Katello::Engine.root}/test/fixtures/all_fixtures/"
+    FileUtils.rm_rf(self.fixture_path) if File.directory?(self.fixture_path)
+    Dir.mkdir(self.fixture_path)
     FileUtils.cp(Dir.glob("#{Katello::Engine.root}/test/fixtures/models/*"), self.fixture_path)
     FileUtils.cp(Dir.glob("#{Rails.root}/test/fixtures/*"), self.fixture_path)
     fixtures(:all)