github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #8527 from dokku/8500-allow-format-json-with-global-on-report-subcommands

Browse Source 
Accept --global on :report subcommands
This commit is contained in:
Jose Diaz-Gonzalez
2026-04-29 12:14:54 -04:00
committed by GitHub
parent 1a45fef839 0f78f81d71
commit abb7faa503
61 changed files with 1375 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/unit/builder-dockerfile.bats
View File

@@ -12,6 +12,31 @@ teardown() {
destroy_app
}
@test "(builder-dockerfile:report) --global --format json" {
run /bin/bash -c "dokku builder-dockerfile:report --global --format json | jq -e ."
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku builder-dockerfile:report --global --format json | jq -r '.\"global-dockerfile-path\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "Dockerfile"
run /bin/bash -c "dokku builder-dockerfile:report --global --format json | jq -r 'has(\"dockerfile-path\")'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "false"
run /bin/bash -c "dokku builder-dockerfile:report --global"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "global builder-dockerfile information"
}
@test "(builder-dockerfile:set)" {
run deploy_app dockerfile
echo "output: $output"

34
tests/unit/builder.bats
View File

@@ -175,6 +175,40 @@ teardown() {
assert_line 0 "herokuish"
}
@test "(builder:report) --global --format json" {
run /bin/bash -c "dokku builder:set --global selected dockerfile"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku builder:report --global --format json | jq -e ."
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku builder:report --global --format json | jq -r '.\"builder-global-selected\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "dockerfile"
run /bin/bash -c "dokku builder:report --global --format json | jq -r 'has(\"builder-selected\")'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "false"
run /bin/bash -c "dokku builder:report --global"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku builder:set --global selected"
echo "output: $output"
echo "status: $status"
assert_success
}
@test "(builder:set)" {
run deploy_app python
echo "output: $output"

14
tests/unit/certs.bats
View File

@@ -41,6 +41,20 @@ teardown() {
assert_output "$help_output"
}
@test "(certs:report) --global --format json" {
run /bin/bash -c "dokku certs:report --global --format json | jq -e ."
echo "output: $output"
echo "status: $status"
assert_success
assert_output "{}"
run /bin/bash -c "dokku certs:report --global"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "global ssl information"
}
@test "(certs) certs:add" {
run /bin/bash -c "dokku certs:add $TEST_APP $BATS_TMPDIR/tls/server.crt $BATS_TMPDIR/tls/server.key"
echo "output: $output"

35
tests/unit/checks.bats
View File

@@ -16,6 +16,41 @@ teardown() {
global_teardown
}
@test "(checks:report) --global --format json" {
run /bin/bash -c "dokku checks:set --global wait-to-retire 90"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku checks:report --global --format json | jq -e ."
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku checks:report --global --format json | jq -r '.\"global-wait-to-retire\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "90"
run /bin/bash -c "dokku checks:report --global --format json | jq -r 'has(\"wait-to-retire\")'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "false"
run /bin/bash -c "dokku checks:report --global"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "global checks information"
run /bin/bash -c "dokku checks:set --global wait-to-retire"
echo "output: $output"
echo "status: $status"
assert_success
}
@test "(checks) checks:help" {
run /bin/bash -c "dokku checks"
echo "output: $output"

18
tests/unit/cron.bats
View File

@@ -102,6 +102,24 @@ teardown() {
assert_output_contains "python3 task.py daily"
}
@test "(cron:report) --global --format json" {
run /bin/bash -c "dokku cron:report --global --format json | jq -e ."
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku cron:report --global --format json | jq -r 'has(\"cron-maintenance\")'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "false"
run /bin/bash -c "dokku cron:report --global"
echo "output: $output"
echo "status: $status"
assert_success
}
@test "(cron) create [multiple]" {
run deploy_app python dokku@$DOKKU_DOMAIN:$TEST_APP template_cron_file_valid_multiple
echo "output: $output"

19
tests/unit/domains.bats
View File

@@ -28,6 +28,25 @@ teardown() {
assert_output "$help_output"
}
@test "(domains:report) --global --format json" {
run /bin/bash -c "dokku domains:report --global --format json | jq -e ."
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku domains:report --global --format json | jq -r 'keys[]' | grep -v 'global-' | wc -l"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "0"
run /bin/bash -c "dokku domains:report --global"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Global domains information"
}
@test "(domains) domains" {
run /bin/bash -c "dokku domains:report $TEST_APP 2>/dev/null | grep ${TEST_APP}.${DOKKU_DOMAIN}"
echo "output: $output"

28
tests/unit/git_3.bats
View File

@@ -831,3 +831,31 @@ teardown() {
assert_failure
assert_output_contains "--format flag cannot be specified when specifying an info flag"
}
@test "(git:report) --global" {
run /bin/bash -c "dokku git:report --global"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "global git information"
assert_output_contains "Git global deploy branch"
}
@test "(git:report) --global --format json" {
run /bin/bash -c "dokku git:report --global --format json | jq -e ."
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku git:report --global --format json | jq -r '.\"global-deploy-branch\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "master"
run /bin/bash -c "dokku git:report --global --format json | jq -r 'has(\"deploy-branch\")'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "false"
}

35
tests/unit/network.bats
View File

@@ -31,6 +31,41 @@ teardown() {
assert_output "$help_output"
}
@test "(network:report) --global --format json" {
run /bin/bash -c "dokku network:set --global tld dokku.test"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku network:report --global --format json | jq -e ."
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku network:report --global --format json | jq -r '.\"network-global-tld\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "dokku.test"
run /bin/bash -c "dokku network:report --global --format json | jq -r 'has(\"network-tld\")'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "false"
run /bin/bash -c "dokku network:report --global"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "--global"
run /bin/bash -c "dokku network:set --global tld"
echo "output: $output"
echo "status: $status"
assert_success
}
@test "(network) network:set bind-all-interfaces" {
run deploy_app
echo "output: $output"

19
tests/unit/nginx-vhosts_1.bats
View File

@@ -62,6 +62,25 @@ teardown() {
assert_output_contains "--format flag cannot be specified when specifying an info flag"
}
@test "(nginx:report) --global --format json" {
run /bin/bash -c "dokku nginx:report --global --format json | jq -e ."
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:report --global --format json | jq -r 'keys[]' | grep -v 'global-' | wc -l"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "0"
run /bin/bash -c "dokku nginx:report --global"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "global nginx information"
}
@test "(nginx-vhosts) proxy:build-config (domains:disable/enable)" {
run deploy_app
echo "output: $output"