Commit 971e4bfe authored by David Fernandez's avatar David Fernandez

Merge branch 'helm_fix_context_path' into 'master'

Fix helm context path

See merge request gitlab-org/gitlab!65770
parents dfe060f0 50147826
...@@ -45,7 +45,7 @@ module Packages ...@@ -45,7 +45,7 @@ module Packages
channel: CHANNEL channel: CHANNEL
) )
{ {
'contextPath' => expose_url(path.delete_suffix(INDEX_YAML_SUFFIX)) 'contextPath' => path.delete_suffix(INDEX_YAML_SUFFIX)
} }
end end
end end
......
...@@ -37,7 +37,7 @@ RSpec.shared_examples 'process helm service index request' do |user_type, status ...@@ -37,7 +37,7 @@ RSpec.shared_examples 'process helm service index request' do |user_type, status
expect(yaml_response.keys).to contain_exactly('apiVersion', 'entries', 'generated', 'serverInfo') expect(yaml_response.keys).to contain_exactly('apiVersion', 'entries', 'generated', 'serverInfo')
expect(yaml_response['entries']).to be_a(Hash) expect(yaml_response['entries']).to be_a(Hash)
expect(yaml_response['entries'].keys).to contain_exactly(package.name) expect(yaml_response['entries'].keys).to contain_exactly(package.name)
expect(yaml_response['serverInfo']).to eq({ 'contextPath' => "http://localhost/api/v4/projects/#{project.id}/packages/helm" }) expect(yaml_response['serverInfo']).to eq({ 'contextPath' => "/api/v4/projects/#{project.id}/packages/helm" })
package_entry = yaml_response['entries'][package.name] package_entry = yaml_response['entries'][package.name]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment