@@ -36,11 +36,11 @@ class BuildsController < ApplicationController @build = @project.find_build(params[:build]) render :text => "Build #{params[:build].inspect} not found", :status => 404 and return unless @build - path = File.join(@build.artifacts_directory, params[:path]) + path = @build.artifact(params[:path]) if File.directory? path - if File.exists?(path + '/index.html') - redirect_to :path => File.join(params[:path], 'index.html') + if File.exists?(File.join(path, 'index.html')) + redirect_to request.request_uri + '/index.html' else # TODO: generate an index from directory contents render :text => "this should be an index of #{params[:path]}" app/controllers/builds_controller.rb @@ -139,8 +139,8 @@ EOF :controller => 'builds', :action => 'show', :project => project, :build => to_param) end - def artifact(file_name) - File.join(artifacts_directory, file_name) + def artifact(path) + File.join(artifacts_directory, path) end def contents_for_display(file) app/models/build.rb @@ -170,7 +170,7 @@ class BuildsControllerTest < ActionController::TestCase get :artifact, :project => project.name, :build => '1', :path => 'foo' - assert_redirected_to :path => ['foo/index.html'] + assert_redirected_to 'http://test.host/builds/my_project/1/foo/index.html' end end test/functional/builds_controller_test.rb 52cb3161aadfd2e1e64458b4537631f048def8ef Alex Verkhovsky alexey.verkhovsky@gmail.com http://github.com/thoughtworks/cruisecontrol.rb/commit/c44b5959232810f9988b2d3cb9a8dcebd9dad5e5 c44b5959232810f9988b2d3cb9a8dcebd9dad5e5 2009-09-29T17:35:36-07:00 2009-09-29T17:35:36-07:00 Fixed an arttifact URL generation bug introduced by uprade to Rails 2.3 0a216c71fad729a1fc7f343ffab1a81b1fc8d03f Alex Verkhovsky alexey.verkhovsky@gmail.com