Download as
Browse Code »

Commit ff7b3a785415dff549c8ebaa0014e482fc83364a

Authored by Antonio Terceiro
1 parent 91a1d114
Exists in master and in 67 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, button_suspension_points_remove, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, 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, mailinglist_page_title, 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_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, 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

tests: hit the externally available locations 

All direct access is now forbidden by the firewall on each host
Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
test/colab_test.sh
  Diff comments   View file @ff7b3a7
@@ -21,16 +21,16 @@ test_nginx_responds() { @@ -21,16 +21,16 @@ test_nginx_responds() {
21 } 21 }
22 22
23 test_nginx_virtualhost() { 23 test_nginx_virtualhost() {
24 - local title="$(curl --header 'Host: softwarepublico.dev' http://$integration/dashboard | grep '<title>' | sed -e 's/^\s*//')" 24 + local title="$(curl --header 'Host: softwarepublico.dev' http://$config_external_hostname/dashboard | grep '<title>' | sed -e 's/^\s*//')"
25 assertEquals "<title>Home - Colab</title>" "$title" 25 assertEquals "<title>Home - Colab</title>" "$title"
26 } 26 }
27 27
28 test_reverse_proxy_gitlab() { 28 test_reverse_proxy_gitlab() {
29 - assertTrue 'Reverse proxy for gitlab' "curl --header 'Host: softwarepublico.dev' http://$integration/gitlab/public/projects | grep -i '<meta.*gitlab.*>'" 29 + assertTrue 'Reverse proxy for gitlab' "curl --header 'Host: softwarepublico.dev' http://$config_external_hostname/gitlab/public/projects | grep -i '<meta.*gitlab.*>'"
30 } 30 }
31 31
32 test_reverse_proxy_noosfero() { 32 test_reverse_proxy_noosfero() {
33 - assertTrue 'Reverse proxy for noosfero' "curl --header 'Host: softwarepublico.dev' http://$integration/social/search/people | grep -i '<meta.*noosfero.*>'" 33 + assertTrue 'Reverse proxy for noosfero' "curl --header 'Host: softwarepublico.dev' http://$config_external_hostname/social/search/people | grep -i '<meta.*noosfero.*>'"
34 } 34 }
35 35
36 load_shunit2 36 load_shunit2
test/mailman_test.sh
  Diff comments   View file @ff7b3a7
@@ -21,7 +21,7 @@ test_mailman_delivery() { @@ -21,7 +21,7 @@ test_mailman_delivery() {
21 } 21 }
22 22
23 test_mailman_web_interface() { 23 test_mailman_web_interface() {
24 - local title="$(curl --location --header 'Host: listas.softwarepublico.dev' http://$integration/mailman/cgi-bin/listinfo | grep -i '<title>')" 24 + local title="$(curl --location --header 'Host: listas.softwarepublico.dev' http://$config_external_hostname/mailman/cgi-bin/listinfo | grep -i '<title>')"
25 assertEquals "<TITLE>listas.softwarepublico.dev Mailing Lists</TITLE>" "$title" 25 assertEquals "<TITLE>listas.softwarepublico.dev Mailing Lists</TITLE>" "$title"
26 } 26 }
27 27
test/noosfero_test.sh
  Diff comments   View file @ff7b3a7
@@ -19,12 +19,12 @@ test_reverse_proxy_noosfero() { @@ -19,12 +19,12 @@ test_reverse_proxy_noosfero() {
19 } 19 }
20 20
21 test_reverse_proxy_static_files() { 21 test_reverse_proxy_static_files() {
22 - local content_type="$(curl-host softwarepublico.dev --head http://$social/social/images/noosfero-network.png | grep-header Content-Type)" 22 + local content_type="$(curl-host softwarepublico.dev --head http://$config_external_hostname/social/images/noosfero-network.png | grep-header Content-Type)"
23 assertEquals "Content-Type: image/png" "$content_type" 23 assertEquals "Content-Type: image/png" "$content_type"
24 } 24 }
25 25
26 test_redirect_with_correct_hostname_behind_proxy() { 26 test_redirect_with_correct_hostname_behind_proxy() {
27 - local redirect="$(curl-host softwarepublico.dev --head https://softwarepublico.dev/social/search/contents | grep-header Location)" 27 + local redirect="$(curl-host softwarepublico.dev --head https://$config_external_hostname/social/search/contents | grep-header Location)"
28 assertEquals "Location: https://softwarepublico.dev/social/search/articles" "$redirect" 28 assertEquals "Location: https://softwarepublico.dev/social/search/articles" "$redirect"
29 } 29 }
30 30