From 6ad4bdaec0a10b1f9cf62445619b3a4bf4827365 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Thu, 1 Dec 2011 16:52:01 -0500
Subject: [PATCH] also provide asset_paths in jasmine.yml for adding paths

---
 lib/jasmine/headless/files_list.rb           |  5 +++++
 spec/lib/jasmine/headless/files_list_spec.rb | 23 +++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/jasmine/headless/files_list.rb b/lib/jasmine/headless/files_list.rb
index c7e9241..bfafd89 100644
--- a/lib/jasmine/headless/files_list.rb
+++ b/lib/jasmine/headless/files_list.rb
@@ -98,6 +98,7 @@ module Jasmine::Headless
       @search_paths = [ Jasmine::Core.path, Jasmine::Headless.root.join('vendor/assets/javascripts').to_s ]
       @search_paths += self.class.vendor_asset_paths
       @search_paths += src_dir.collect { |dir| File.expand_path(dir) }
+      @search_paths += asset_paths.collect { |dir| File.expand_path(dir) }
       @search_paths += spec_dir.collect { |dir| File.expand_path(dir) }
 
       @search_paths
@@ -232,6 +233,10 @@ module Jasmine::Headless
       @spec_dir ||= config_dir_or_pwd('spec_dir')
     end
 
+    def asset_paths
+      @asset_paths ||= config_dir_or_pwd('asset_paths')
+    end
+
     def spec_file_searches
       @searches['spec_files']
     end
diff --git a/spec/lib/jasmine/headless/files_list_spec.rb b/spec/lib/jasmine/headless/files_list_spec.rb
index 45765e4..111e281 100644
--- a/spec/lib/jasmine/headless/files_list_spec.rb
+++ b/spec/lib/jasmine/headless/files_list_spec.rb
@@ -56,11 +56,13 @@ describe Jasmine::Headless::FilesList do
 
     let(:config) { {
       'src_dir' => src_dir,
-      'spec_dir' => spec_dir
+      'spec_dir' => spec_dir,
+      'asset_paths' => asset_paths
     } }
 
     let(:src_dir) { 'src dir' }
     let(:spec_dir) { 'spec dir' }
+    let(:asset_paths) { [] }
     let(:path) { 'path' }
 
     before do
@@ -85,14 +87,25 @@ describe Jasmine::Headless::FilesList do
       end
     end
 
-    context 'src_dir is an array' do
+    context 'multiple dirs' do
       let(:dir_1) { 'dir 1' }
       let(:dir_2) { 'dir 2' }
 
-      let(:src_dir) { [ dir_1, dir_2 ] }
+      context 'src_dir is an array' do
+        let(:src_dir) { [ dir_1, dir_2 ] }
 
-      it 'should take the src dir and spec dirs' do
-        files_list.search_paths.should == [ Jasmine::Core.path, vendor_path, File.expand_path(dir_1), File.expand_path(dir_2), File.expand_path(spec_dir) ]
+        it 'should take the src dir and spec dirs' do
+          files_list.search_paths.should == [ Jasmine::Core.path, vendor_path, File.expand_path(dir_1), File.expand_path(dir_2), File.expand_path(spec_dir) ]
+        end
+      end
+
+      context 'asset_paths has entries' do
+        let(:src_dir) { dir_1 }
+        let(:asset_paths) { [ dir_2 ] }
+
+        it 'should take the src dir and spec dirs' do
+          files_list.search_paths.should == [ Jasmine::Core.path, vendor_path, File.expand_path(dir_1), File.expand_path(dir_2), File.expand_path(spec_dir) ]
+        end
       end
     end
   end