diff --git a/.jira.d/config.yml b/.jira.d/config.yml index 8271253..7ed6421 100644 --- a/.jira.d/config.yml +++ b/.jira.d/config.yml @@ -1,2 +1,5 @@ config: stop: true +password-source: pass +endpoint: https://go-jira.atlassian.net +user: admin diff --git a/Makefile b/Makefile index 376798c..f027754 100644 --- a/Makefile +++ b/Makefile @@ -77,10 +77,6 @@ version: clean: rm -rf ./$(NAME) -export GNUPGHOME=$(CWD)/t/.gnupg -export PASSWORD_STORE_DIR=$(CWD)/t/.password-store -export JIRACLOUD=1 - prove: chmod -R g-rwx,o-rwx $(GNUPGHOME) OSHT_VERBOSE=1 prove -v diff --git a/t/000setup.t b/t/000setup.t index 98f47a4..8211919 100755 --- a/t/000setup.t +++ b/t/000setup.t @@ -3,6 +3,8 @@ eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)" cd $(dirname $0) jira="../jira --user admin" +. env.sh + SKIP test -n "$JIRACLOUD" # using Jira Cloud at go-jira.atlassian.net PLAN 15 diff --git a/t/010login.t b/t/010login.t index a3fc9db..c1e5786 100755 --- a/t/010login.t +++ b/t/010login.t @@ -2,6 +2,7 @@ eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)" cd $(dirname $0) jira=../jira +. env.sh SKIP test -n "$JIRACLOUD" # using Jira Cloud at go-jira.atlassian.net diff --git a/t/100basic.t b/t/100basic.t index 526c866..2bdeb5a 100755 --- a/t/100basic.t +++ b/t/100basic.t @@ -2,13 +2,7 @@ eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)" cd $(dirname $0) jira="../jira" -export JIRA_LOG_FORMAT="%{level:-5s} %{message}" - -export COLUMNS=149 -ENDPOINT="http://localhost:8080" -if [ -n "$JIRACLOUD" ]; then - ENDPOINT="https://go-jira.atlassian.net" -fi +. env.sh PLAN 86 diff --git a/t/200scrum.t b/t/200scrum.t index cc81e95..6acb05c 100755 --- a/t/200scrum.t +++ b/t/200scrum.t @@ -2,12 +2,7 @@ eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)" cd $(dirname $0) jira="../jira" -export JIRA_LOG_FORMAT="%{level:-5s} %{message}" - -ENDPOINT="http://localhost:8080" -if [ -n "$JIRACLOUD" ]; then - ENDPOINT="https://go-jira.atlassian.net" -fi +. env.sh PLAN 84 diff --git a/t/300kanban.t b/t/300kanban.t index 1a107ed..6feb046 100755 --- a/t/300kanban.t +++ b/t/300kanban.t @@ -2,12 +2,7 @@ eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)" cd $(dirname $0) jira="../jira" -export JIRA_LOG_FORMAT="%{level:-5s} %{message}" - -ENDPOINT="http://localhost:8080" -if [ -n "$JIRACLOUD" ]; then - ENDPOINT="https://go-jira.atlassian.net" -fi +. env.sh PLAN 86 diff --git a/t/400project.t b/t/400project.t index 70754ea..0c5e883 100755 --- a/t/400project.t +++ b/t/400project.t @@ -2,12 +2,7 @@ eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)" cd $(dirname $0) jira="../jira" -export JIRA_LOG_FORMAT="%{level:-5s} %{message}" - -ENDPOINT="http://localhost:8080" -if [ -n "$JIRACLOUD" ]; then - ENDPOINT="https://go-jira.atlassian.net" -fi +. env.sh PLAN 84 diff --git a/t/500process.t b/t/500process.t index 8bace7d..8b4d2f0 100755 --- a/t/500process.t +++ b/t/500process.t @@ -2,12 +2,7 @@ eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)" cd $(dirname $0) jira="../jira" -export JIRA_LOG_FORMAT="%{level:-5s} %{message}" - -ENDPOINT="http://localhost:8080" -if [ -n "$JIRACLOUD" ]; then - ENDPOINT="https://go-jira.atlassian.net" -fi +. env.sh PLAN 84 diff --git a/t/600task.t b/t/600task.t index 7a4526a..1319206 100755 --- a/t/600task.t +++ b/t/600task.t @@ -2,12 +2,7 @@ eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)" cd $(dirname $0) jira="../jira" -export JIRA_LOG_FORMAT="%{level:-5s} %{message}" - -ENDPOINT="http://localhost:8080" -if [ -n "$JIRACLOUD" ]; then - ENDPOINT="https://go-jira.atlassian.net" -fi +. env.sh PLAN 82 diff --git a/t/env.sh b/t/env.sh new file mode 100644 index 0000000..bd388f9 --- /dev/null +++ b/t/env.sh @@ -0,0 +1,6 @@ +export JIRA_LOG_FORMAT="%{level:-5s} %{message}" +export ENDPOINT="https://go-jira.atlassian.net" +export GNUPGHOME=$(pwd)/.gnupg +export PASSWORD_STORE_DIR=$(pwd)/.password-store +export JIRACLOUD=1 +