From 7996358f013b9376cb4780c5a9689d97a06ba8d1 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 2 Apr 2013 20:17:24 +0200 Subject: [PATCH] Fix fetching log in firefox when Location header is unavailable --- assets/scripts/app/models/log.coffee | 2 +- assets/scripts/spec/unit/log_request_spec.coffee | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 assets/scripts/spec/unit/log_request_spec.coffee diff --git a/assets/scripts/app/models/log.coffee b/assets/scripts/app/models/log.coffee index 125cdec9..f24711d5 100644 --- a/assets/scripts/app/models/log.coffee +++ b/assets/scripts/app/models/log.coffee @@ -64,7 +64,7 @@ Travis.Log.Request = Em.Object.extend endpoint = Travis.config.api_endpoint staging = if endpoint.match(/-staging/) then '-staging' else '' host = endpoint.replace(/^https?:\/\//, '').split('.').slice(-2).join('.') - "https://s3.amazonaws.com/archive#{staging}.#{host}#{path}/jobs/#{@id}/log.txt" + "https://s3.amazonaws.com/archive#{staging}.#{host}/jobs/#{@get('id')}/log.txt" isJson: (xhr, body) -> # Firefox can't see the Content-Type header on the xhr response due to the wrong diff --git a/assets/scripts/spec/unit/log_request_spec.coffee b/assets/scripts/spec/unit/log_request_spec.coffee new file mode 100644 index 00000000..3ec57d18 --- /dev/null +++ b/assets/scripts/spec/unit/log_request_spec.coffee @@ -0,0 +1,6 @@ +describe 'Travis.Log.Request', -> + it 'constructs s3 url for log', -> + Travis.config.api_endpoint = 'api.travis-ci.org' + request = Travis.Log.Request.create(id: 10) + s3Url = "https://s3.amazonaws.com/archive.travis-ci.org/jobs/10/log.txt" + expect( request.s3Url() ).toEqual(s3Url)