Download as
Browse Code »

Commit 7d7001637efa0f961efcb25e7125045c11010475

Authored by Antonio Terceiro
1 parent 384a932a
Exists in master and in 90 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, 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 @@
  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 18 }
19 19  
20 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 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 1 . $(dirname $0)/test_helper.sh
2 2  
3 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 5 assertEquals "Location: https://softwarepublico.dev/" "$redirect"
6 6 }
7 7  
... ...