Commit cd74d278ea235001ccaea9813d386893183cb1dc
1 parent
4408f0bf
Exists in
master
and in
64 other branches
Fix tests
Showing
3 changed files
with
5 additions
and
5 deletions
Show diff stats
test/colab_test.sh
| @@ -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://$config_external_hostname/dashboard | grep '<title>' | sed -e 's/^\s*//')" | 24 | + local title="$(curl --header 'Host: softwarepublico.dev' https://$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://$config_external_hostname/gitlab/public/projects | grep -i '<meta.*gitlab.*>'" | 29 | + assertTrue 'Reverse proxy for gitlab' "curl --header 'Host: softwarepublico.dev' https://$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://$config_external_hostname/social/search/people | grep -i '<meta.*noosfero.*>'" | 33 | + assertTrue 'Reverse proxy for noosfero' "curl --header 'Host: softwarepublico.dev' https://$config_external_hostname/social/search/people | grep -i '<meta.*noosfero.*>'" |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | load_shunit2 | 36 | load_shunit2 |
test/noosfero_test.sh
| @@ -19,7 +19,7 @@ test_reverse_proxy_noosfero() { | @@ -19,7 +19,7 @@ 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://$config_external_hostname/social/images/noosfero-network.png | grep-header Content-Type)" | 22 | + local content_type="$(curl-host softwarepublico.dev --head https://$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 |
test/redis_test.sh
| @@ -5,7 +5,7 @@ test_redis_running() { | @@ -5,7 +5,7 @@ test_redis_running() { | ||
| 5 | } | 5 | } |
| 6 | 6 | ||
| 7 | test_redis_listens_on_local_network() { | 7 | test_redis_listens_on_local_network() { |
| 8 | - assertTrue 'redis listening on local network' 'netcat -z -w 1 $database 6379' | 8 | + assertTrue 'redis listening on local network' 'run_on integration redis-cli -h database get foo' |
| 9 | } | 9 | } |
| 10 | 10 | ||
| 11 | load_shunit2 | 11 | load_shunit2 |