Download as
Browse Code »

Commit 384a932a56b63dc989dbffc4724092255069c69f

Authored by Antonio Terceiro
1 parent 3ded9ec6
Exists in master and in 65 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Failing test: gitlab should redirect using the correct hostname 

It seems that colab is not passing Host: to its backends
Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
cookbooks/gitlab/templates/gitlab.yml.erb
  Diff comments   View file @384a932
1 production: &base 1 production: &base
2 gitlab: 2 gitlab:
3 - host: localhost 3 + host: softwarepublico.dev
4 relative_url_root: /gitlab 4 relative_url_root: /gitlab
5 port: 80 # Set to 443 if using HTTPS 5 port: 80 # Set to 443 if using HTTPS
6 https: false # Set to true if using HTTPS 6 https: false # Set to true if using HTTPS
test/gitlab_test.sh
  Diff comments   View file @384a932
@@ -17,4 +17,9 @@ test_static_content_served_correctly() { @@ -17,4 +17,9 @@ test_static_content_served_correctly() {
17 assertTrue 'gitlab static content served by nginx' "run_on integration curl --head http://localhost:8081/gitlab/assets/$file | grep 'Content-Type: text/css'" 17 assertTrue 'gitlab static content served by nginx' "run_on integration curl --head http://localhost:8081/gitlab/assets/$file | grep 'Content-Type: text/css'"
18 } 18 }
19 19
  20 +test_redirects_to_the_correct_host() {
  21 + redirect=$(curl-host softwarepublico.dev --head https://softwarepublico.dev/gitlab/dashboard/projects | grep Location:)
  22 + assertEquals "Location: https://softwarepublico.dev/gitlab/users/sign_in" "$redirect"
  23 +}
  24 +
20 . shunit2 25 . shunit2