fix(vcs): get bitbucket branch ordered by modification date (#7406)

* fix(vcs): get bitbucket branch ordered by modification date

Signed-off-by: richard.le-terrier <[email protected]>

* fix: it tests

Signed-off-by: richard.le-terrier <[email protected]>

* fix: it tests

Signed-off-by: Yvonnick Esnault <[email protected]>

* fix: it tests

Signed-off-by: Yvonnick Esnault <[email protected]>

---------

Signed-off-by: richard.le-terrier <[email protected]>
Signed-off-by: Yvonnick Esnault <[email protected]>
Co-authored-by: Yvonnick Esnault <[email protected]>

Author: richardlt

engine/vcs/bitbucketserver/client_branch.go

@@ -85,7 +85,7 @@ func (b *bitbucketClient) Branch(ctx context.Context, fullname string, filters s
 	}
 
 	branches := BranchResponse{}
-	path := fmt.Sprintf("/projects/%s/repos/%s/branches?filterText=%s", t[0], t[1], url.QueryEscape(filters.BranchName))
+	path := fmt.Sprintf("/projects/%s/repos/%s/branches?orderBy=MODIFICATION&filterText=%s", t[0], t[1], url.QueryEscape(filters.BranchName))
 
 	if err := b.do(ctx, "GET", "core", path, nil, nil, &branches, Options{DisableCache: filters.NoCache}); err != nil {
 		return nil, sdk.WrapError(err, "Unable to get branch %s %s", filters.BranchName, path)

tests/03_clictl_admin_organization.yml

@@ -7,7 +7,7 @@ testcases:
   steps:
   - script: {{.cdsctl}} -f {{.cdsctl.config}} admin organization list --format json
     assertions:
-    - result.systemoutjson.__len__ ShouldEqual 2
+    - result.systemoutjson ShouldHaveLength 2
 - name: Remove an organization
   steps:
   - script: {{.cdsctl}} -f {{.cdsctl.config}} admin organization delete my-org --force

tests/03_clictl_template_apply_detached.yml

@@ -45,7 +45,7 @@ testcases:
     path: ./fixtures/template/simple/export-detached/*.yml
     assertions:
     - result.err ShouldEqual ""
-    - result.md5sum.fixtures_template_simple_export-detached_first-environment.env.yml ShouldEqual "{{.readWorkflowSourceFiles.md5sum_fixtures_template_simple_workflow-detached_first-environment}}"
-    - result.md5sum.fixtures_template_simple_export-detached_first-pipeline.pip.yml ShouldEqual "{{.readWorkflowSourceFiles.md5sum_fixtures_template_simple_workflow-detached_first-pipeline}}"
-    - result.md5sum.fixtures_template_simple_export-detached_second-pipeline.pip.yml ShouldEqual "{{.readWorkflowSourceFiles.md5sum_fixtures_template_simple_workflow-detached_second-pipeline}}"
-    - result.md5sum.fixtures_template_simple_export-detached_itcliwkf.yml ShouldEqual "{{.readWorkflowSourceFiles.md5sum_fixtures_template_simple_workflow-detached_itcliwkf}}"
+    - result.md5sum.fixtures_template_simple_export-detached_First-environment.env.yml ShouldEqual "{{.readWorkflowSourceFiles.md5sum_fixtures_template_simple_workflow-detached_first-environment}}"
+    - result.md5sum.fixtures_template_simple_export-detached_First-pipeline.pip.yml ShouldEqual "{{.readWorkflowSourceFiles.md5sum_fixtures_template_simple_workflow-detached_first-pipeline}}"
+    - result.md5sum.fixtures_template_simple_export-detached_Second-pipeline.pip.yml ShouldEqual "{{.readWorkflowSourceFiles.md5sum_fixtures_template_simple_workflow-detached_second-pipeline}}"
+    - result.md5sum.fixtures_template_simple_export-detached_ITCLIWKF.yml ShouldEqual "{{.readWorkflowSourceFiles.md5sum_fixtures_template_simple_workflow-detached_itcliwkf}}"

tests/04_sc_workflow_edit_scheduler.yml

@@ -22,7 +22,7 @@ testcases:
           - result.code ShouldEqual 0
       - script: "{{.cdsctl}} -f {{.cdsctl.config}} workflow export ITSCWRKFLW16 ITSCWRKFLW16-WORKFLOW --format json"
         assertions:
-          - result.systemoutjson.hooks.itscwrkflw16-pipeline.itscwrkflw16-pipeline0.config.cron ShouldEqual '10 * * * *'
+          - result.systemoutjson.hooks.ITSCWRKFLW16-PIPELINE.ITSCWRKFLW16-PIPELINE0.config.cron ShouldEqual '10 * * * *'
 
   - name: get-imported-workflow
     steps:
@@ -38,7 +38,7 @@ testcases:
     steps:
       - script: "{{.cdsctl}} -f {{.cdsctl.config}} admin hooks list --filter workflow_id={{.get-imported-workflow.workflow_id}} --format json"
         assertions:
-          - result.systemoutjson.systemoutjson0.cron ShouldEqual '10 * * * *'
+          - result.systemoutjson.systemoutjson0.Cron ShouldEqual '10 * * * *'
 
   - name: update workflow
     steps:
@@ -47,7 +47,7 @@ testcases:
           - result.code ShouldEqual 0
       - script: "{{.cdsctl}} -f {{.cdsctl.config}} workflow export ITSCWRKFLW16 ITSCWRKFLW16-WORKFLOW --format json"
         assertions:
-          - result.systemoutjson.hooks.itscwrkflw16-pipeline.itscwrkflw16-pipeline0.config.cron ShouldEqual '20 * * * *'
+          - result.systemoutjson.hooks.ITSCWRKFLW16-PIPELINE.ITSCWRKFLW16-PIPELINE0.config.cron ShouldEqual '20 * * * *'
 
   - name: get-updated-workflow
     steps:
@@ -63,4 +63,4 @@ testcases:
     steps:
       - script: "{{.cdsctl}} -f {{.cdsctl.config}} admin hooks list --filter workflow_id={{.get-updated-workflow.workflow_id}} --format json"
         assertions:
-          - result.systemoutjson.systemoutjson0.cron ShouldEqual '20 * * * *'
+          - result.systemoutjson.systemoutjson0.Cron ShouldEqual '20 * * * *'

tests/04_sc_workflow_run_notif.yml

@@ -56,7 +56,7 @@ testcases:
     url: '{{.smtpmock.url}}/messages/[email protected]'
     assertions:
     - result.statuscode ShouldEqual 200
-    - result.bodyjson.__len__ ShouldEqual 1
+    - result.bodyjson ShouldHaveLength 1
     retry: 10
     delay: 3
   - type: http
@@ -75,15 +75,15 @@ testcases:
     url: '{{.smtpmock.url}}/messages/[email protected]'
     assertions:
     - result.statuscode ShouldEqual 200
-    - result.bodyjson.__len__ ShouldEqual 1
+    - result.bodyjson ShouldHaveLength 1
     retry: 10
     delay: 3
   - type: http
     method: GET
     url: '{{.smtpmock.url}}/messages/[email protected]'
     assertions:
     - result.statuscode ShouldEqual 200
-    - result.bodyjson.__len__ ShouldEqual 1
+    - result.bodyjson ShouldHaveLength 1
     retry: 10
     delay: 3
 
@@ -113,6 +113,6 @@ testcases:
     url: '{{.smtpmock.url}}/messages/[email protected]'
     assertions:
     - result.statuscode ShouldEqual 200
-    - result.bodyjson.__len__ ShouldEqual 1
+    - result.bodyjson ShouldHaveLength 1
     retry: 30
     delay: 1