sprout 1.0.8.pre → 1.0.9.pre

data/lib/sprout/test/sprout_test_case.rb

@@ -174,9 +174,12 @@ module SproutTestCase # :nodoc:[all]
   # path by checking each parent directory.
   def find_fixtures path
     # Return nil if path is nil or is not a file:
-    return nil if(path.nil? || !File.exists?(path))
+    find_fixtures_error(path) if(find_reached_root?(path))
     # Get the parent directory if path is a file:
     path = File.dirname(path) if !File.directory? path
+    if(should_create_fixtures_for?(path))
+      FileUtils.makedirs File.join(path, FIXTURES_NAME)
+    end
     # Check for a folder at "#{path}/fixtures":
     fixture_path = File.join(path, FIXTURES_NAME)
     # Return the fixtures folder if found:
@@ -185,6 +188,19 @@ module SproutTestCase # :nodoc:[all]
     return find_fixtures File.dirname(path) unless File.dirname(path) == path
   end
 
+  def should_create_fixtures_for? path
+    basename = File.basename path
+    return basename == 'test' || basename == 'tests'
+  end
+
+  def find_fixtures_error path
+    raise Sprout::Errors::UsageError.new "Request to find a fixtures folder failed at: #{path}"
+  end
+
+  def find_reached_root? path
+    return (path.nil? || !File.exists?(path) || File.dirname(path) == path)
+  end
+
 end
 
   # TODO: Consider adding these:

data/lib/sprout/version.rb

@@ -6,7 +6,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 0
-      TINY  = 8
+      TINY  = 9
       RELEASE = 'pre'
 
       STRING = [MAJOR, MINOR, TINY, RELEASE].join('.')

data/test/unit/sprout_test.rb

@@ -3,6 +3,34 @@ require File.dirname(__FILE__) + '/test_helper'
 class SproutTest < Test::Unit::TestCase
   include SproutTestCase
 
+  context "The SproutTestCase" do
+
+    context "find_fixtures" do
+
+      setup do
+        @from = File.join(fixtures, 'sprout_test_case', 'test', 'other')
+        @expected_fixtures = File.join(fixtures, 'sprout_test_case', 'test', 'fixtures')
+        FileUtils.makedirs @from
+      end
+
+      teardown do
+        remove_file File.join(fixtures, 'sprout_test_case')
+      end
+
+      should "find_fixtures within a test folder" do
+        result = find_fixtures @from
+        assert_equal @expected_fixtures, result
+      end
+
+      should "throw if reaches system root" do
+        assert_raises Sprout::Errors::UsageError do
+          find_fixtures File.dirname(File.dirname(File.dirname(__FILE__)))
+        end
+      end
+    end
+
+  end
+
   context "Errors" do
     include Sprout::Errors
 
@@ -20,7 +48,7 @@ class SproutTest < Test::Unit::TestCase
       VersionRequirementNotMetError
     ].each do |error|
 
-      should "be available to instiate a #{error.to_s}" do
+      should "be available to instantiate a #{error.to_s}" do
         error.new
       end
     end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 8
+  - 9
   - pre
-  version: 1.0.8.pre
+  version: 1.0.9.pre
 platform: ruby
 authors: 
 - Luke Bayes