Merge branch 'pr/46'

lib/travis/api/app/responders/xml.rb

@@ -34,7 +34,7 @@ module Travis::Api::App::Responders
       def data
         {
           name:     resource.slug,
-          url:      [Travis.config.domain, resource.slug].join('/'),
+          url:      File.join("https://", Travis.config.domain, resource.slug),
           activity: activity,
           label:    last_build.try(:number),
           status:   status,

spec/integration/v2/repositories_spec.rb

@@ -74,6 +74,7 @@ describe 'Repos' do
   it 'GET /repos/1/cc.xml' do
     response = get "repos/#{repo.id}/cc.xml"
     response.should deliver_cc_xml_for(Repository.by_slug('svenfuchs/minimal').first)
+    response.content_type.should eq('application/xml;charset=utf-8')
   end
 
   it 'GET /repos/svenfuchs/minimal' do

spec/spec_helper.rb

@@ -14,6 +14,7 @@ require 'support/matchers'
 
 Travis.logger = Logger.new(StringIO.new)
 Travis::Api::App.setup
+Travis.config.domain = "www.example.com"
 
 module TestHelpers
   include Sinatra::TestHelpers

spec/support/matchers.rb

@@ -62,7 +62,7 @@ RSpec::Matchers.define :deliver_cc_xml_for do |repo|
       "expected #{body} to be a valid cc.xml"
     end
 
-    body.include?('<Projects>') && body.include?(%(name="#{repo.slug}"))
+    body.include?('<Projects>') && body.include?(%(name="#{repo.slug}")) && body.include?("https://www.example.com/#{repo.slug}")
   end
 end