fix: 🐛 reorder output of triggers to make more sense

joscha · Oct 17, 2019 · eacebd4 · eacebd4
1 parent 303b4ed
commit eacebd4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/__tests__/__snapshots__/index.spec.ts.snap b/src/__tests__/__snapshots__/index.spec.ts.snap
@@ -284,14 +284,14 @@ exports[`buildkite-graph general serialization complex yaml 1`] = `
   - wait: ~
   - label: Update checkpoint
     command: production/test/jobs/advance_branch.sh \\"checkpoint/web/green/editor\\"
-  - label: Deploy to tech
-    trigger: web-deploy
+  - trigger: web-deploy
+    label: Deploy to tech
     build:
       env:
         FLAVOR: tech
         RELEASE_PATH: some/path/
-  - label: Deploy to usertesting
-    trigger: web-deploy
+  - trigger: web-deploy
+    label: Deploy to usertesting
     build:
       env:
         FLAVOR: usertesting

diff --git a/src/__tests__/__snapshots__/trigger.spec.ts.snap b/src/__tests__/__snapshots__/trigger.spec.ts.snap
@@ -78,16 +78,16 @@ Object {
 
 exports[`buildkite-graph Steps Trigger async yaml 1`] = `
 "steps:
-  - label: Label
-    trigger: another
+  - trigger: another
+    label: Label
     async: true
 "
 `;
 
 exports[`buildkite-graph Steps Trigger async yaml 2`] = `
 "steps:
-  - label: Label
-    trigger: another
+  - trigger: another
+    label: Label
 "
 `;
 
@@ -370,8 +370,8 @@ Object {
 
 exports[`buildkite-graph Steps Trigger limit branches yaml 1`] = `
 "steps:
-  - branches: master
-    trigger: another
+  - trigger: another
+    branches: master
 "
 `;
 
@@ -402,7 +402,7 @@ Object {
 
 exports[`buildkite-graph Steps Trigger with a label yaml 1`] = `
 "steps:
-  - label: Trigger another pipeline
-    trigger: another
+  - trigger: another
+    label: Trigger another pipeline
 "
 `;
diff --git a/src/base.ts b/src/base.ts
@@ -70,8 +70,8 @@ export class LabeledStep extends BranchLimitedStep {
 
     async toJson(): Promise<object> {
         return {
-            ...(await super.toJson()),
             label: this.label,
+            ...(await super.toJson()),
         };
     }
 }

diff --git a/src/steps/trigger.ts b/src/steps/trigger.ts
@@ -34,8 +34,8 @@ export class TriggerStep extends LabeledStep implements Serializable {
 
     async toJson(): Promise<object> {
         return {
-            ...(await super.toJson()),
             trigger: this.trigger,
+            ...(await super.toJson()),
             async: this._async || undefined,
             build: await (this.build as BuildImpl<this>).toJson(),
         };