Download as
Browse Code »

Commit 7d7001637efa0f961efcb25e7125045c11010475

Authored by Antonio Terceiro
1 parent 384a932a
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

Extract logic for greping headers 

We need to remove the trailing \r's
Showing 3 changed files with 10 additions and 2 deletions   Show diff stats
test/bin/grep-header 0 → 100755
  Diff comments   View file @7d70016
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
  1 +#!/bin/sh
  2 +
  3 +set -eu
  4 +
  5 +header="$1"
  6 +
  7 +sed -e "/^$header:/ !d; s/\r//"
  8 +
test/gitlab_test.sh
  Diff comments   View file @7d70016
@@ -18,7 +18,7 @@ test_static_content_served_correctly() { @@ -18,7 +18,7 @@ test_static_content_served_correctly() {
18 } 18 }
19 19
20 test_redirects_to_the_correct_host() { 20 test_redirects_to_the_correct_host() {
21 - redirect=$(curl-host softwarepublico.dev --head https://softwarepublico.dev/gitlab/dashboard/projects | grep Location:) 21 + redirect=$(curl-host softwarepublico.dev --head https://softwarepublico.dev/gitlab/dashboard/projects | grep-header Location)
22 assertEquals "Location: https://softwarepublico.dev/gitlab/users/sign_in" "$redirect" 22 assertEquals "Location: https://softwarepublico.dev/gitlab/users/sign_in" "$redirect"
23 } 23 }
24 24
test/reverse_proxy_test.sh
  Diff comments   View file @7d70016
1 . $(dirname $0)/test_helper.sh 1 . $(dirname $0)/test_helper.sh
2 2
3 test_redirect_http_to_https() { 3 test_redirect_http_to_https() {
4 - local redirect="$(curl --header 'Host: softwarepublico.dev' --head http://$reverseproxy/ | sed -e '/Location:/ !d; s/\r//')" 4 + local redirect="$(curl --header 'Host: softwarepublico.dev' --head http://$reverseproxy/ | grep-header Location)"
5 assertEquals "Location: https://softwarepublico.dev/" "$redirect" 5 assertEquals "Location: https://softwarepublico.dev/" "$redirect"
6 } 6 }
7 7