Merge #50

50: Pass block-workflow parameter to until_front_of_line step [semver:patch] r=eddiewebb a=mu-bro ### Motivation, issues **_block-workflow_** parameter is not passed from **queue/block_workflow** job to **until_front_of_line** step, therefore block-workflow is always set to 'false'. Co-authored-by: Ilya Artamonov <[email protected]> Co-authored-by: ilya.artamonov <[email protected]> Co-authored-by: Eddie Webb <[email protected]>
eddiewebb · Jan 13, 2020 · 2a0544d · 2a0544d
2 parents 56bf4a7 + 6d73812
commit 2a0544d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/jobs/block_workflow.yml b/src/jobs/block_workflow.yml
@@ -35,6 +35,7 @@ resource_class: small
 steps:
   - until_front_of_line:
       consider-branch: <<parameters.consider-branch>>
+      block-workflow: <<parameters.block-workflow>>
       time: <<parameters.time>>
       dont-quit: <<parameters.dont-quit>>
       only-on-branch: <<parameters.only-on-branch>>

diff --git a/test/test_expansion.bats b/test/test_expansion.bats
@@ -355,3 +355,25 @@ function setup {
 
 }
 
+
+@test "Default job sets block workflow properly" {
+  # given
+  process_config_with test/inputs/fulljob.yml
+
+  # when
+  assert_jq_match '.jobs | length' 1 #only 1 job
+  assert_jq_match '.jobs["Single File"].steps | length' 1 #only 1 steps
+
+  jq -r '.jobs["Single File"].steps[0].run.command' $JSON_PROJECT_CONFIG > ${BATS_TMPDIR}/script-${BATS_TEST_NUMBER}.bash
+
+  export CIRCLECI_API_KEY="madethisup"
+  export CIRCLE_BUILD_NUM="2"
+  export CIRCLE_JOB="singlejob"
+  export CIRCLE_PROJECT_USERNAME="madethisup"
+  export CIRCLE_PROJECT_REPONAME="madethisup"
+  export CIRCLE_REPOSITORY_URL="madethisup"
+  export CIRCLE_BRANCH="madethisup"
+
+  run bash ${BATS_TMPDIR}/script-${BATS_TEST_NUMBER}.bash
+  assert_contains_text "Orb parameter block-workflow is true."
+}