diff --git a/spec/lib/builders/html_spec.rb b/spec/lib/builders/html_spec.rb index 99c2592..24ee4d8 100644 --- a/spec/lib/builders/html_spec.rb +++ b/spec/lib/builders/html_spec.rb @@ -431,10 +431,12 @@ def expect_scripts(result, urls = []) it "adds link to debug JS if CONFIG.load_debug = true" do # figure expected urls... t = @project.target_for(:debug) + t.config.combine_javascript = true url = t.manifest_for(:language => :en).build!.entry_for('javascript.js').url url = /#{Regexp.escape url}/ @target.config.combine_javascript = true + @target.config.load_debug = true result = @builder.javascripts_for_client result.should =~ url diff --git a/spec/lib/builders/test_spec.rb b/spec/lib/builders/test_spec.rb index 8bb79d9..351ea42 100644 --- a/spec/lib/builders/test_spec.rb +++ b/spec/lib/builders/test_spec.rb @@ -62,6 +62,7 @@ it "adds javascript for test" do # figure expected urls... t = @project.target_for(:qunit) + t.config.combine_javascript = true url = t.manifest_for(:language => :en).build!.entry_for('javascript.js').url url = /#{Regexp.escape url}/ diff --git a/spec/lib/models/manifest/add_transform_spec.rb b/spec/lib/models/manifest/add_transform_spec.rb index 58c145c..9398937 100644 --- a/spec/lib/models/manifest/add_transform_spec.rb +++ b/spec/lib/models/manifest/add_transform_spec.rb @@ -15,6 +15,7 @@ :source_path => File.join('source', 'foobar.js'), :build_path => File.join('build', 'foobar.js'), :staging_path => File.join('staging', 'foobar.js'), + :cache_path => File.join('cache', 'foobar.js'), :url => File.join('url', 'foobar.js') end