From 2316041580c16b30fb994cecf01292842e83945f Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 22 Nov 2011 10:51:46 -0500 Subject: [PATCH] ok i actually want a bundled asset --- lib/jasmine/headless/files_list.rb | 4 ++-- spec/lib/jasmine/headless/files_list_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/jasmine/headless/files_list.rb b/lib/jasmine/headless/files_list.rb index 9130ab2..f34fb38 100644 --- a/lib/jasmine/headless/files_list.rb +++ b/lib/jasmine/headless/files_list.rb @@ -70,7 +70,7 @@ module Jasmine::Headless end def files - required_files.collect { |file| file.send(:required_assets).collect { |asset| asset.pathname.to_s } }.flatten.uniq + required_files.collect { |file| file.to_a.collect { |asset| asset.pathname.to_s } }.flatten.uniq end def spec_files @@ -233,7 +233,7 @@ module Jasmine::Headless end def add_path(path, type) - asset = sprockets_environment.find_asset(path, :bundle => false) + asset = sprockets_environment.find_asset(path) @required_files << asset diff --git a/spec/lib/jasmine/headless/files_list_spec.rb b/spec/lib/jasmine/headless/files_list_spec.rb index 8e9d571..219f5b3 100644 --- a/spec/lib/jasmine/headless/files_list_spec.rb +++ b/spec/lib/jasmine/headless/files_list_spec.rb @@ -122,8 +122,8 @@ describe Jasmine::Headless::FilesList do let(:path_two) { 'two' } let(:path_three) { 'three' } - let(:file_one) { stub(:required_assets => [ asset_one, asset_two ] ) } - let(:file_two) { stub(:required_assets => [ asset_two, asset_three ] ) } + let(:file_one) { stub(:to_a => [ asset_one, asset_two ] ) } + let(:file_two) { stub(:to_a => [ asset_two, asset_three ] ) } let(:asset_one) { stub(:pathname => Pathname(path_one)) } let(:asset_two) { stub(:pathname => Pathname(path_two)) }