Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regenerated models #56

Merged
merged 2 commits into from
Jul 31, 2022
Merged

Regenerated models #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be53b34
Regenerated models
nafg Jul 30, 2022
87fe9c3
Test: queue name is the default so omitted
nafg Jul 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generated-models/src/main/scala/io/github/nafg/mergify/models/generated/Action.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ object Action {
case class Queue(
/** The name of the merge queue where to move the pull request.
*/
name: String = "",
name: String = "default",
/** Merge method to use. Possible values are merge, squash, rebase or fast-forward. fast-forward is not supported on
* queues with speculative_checks > 1, batch_size > 1, or with allow_inplace_checks set to false.
*/
Expand Down
16 changes: 6 additions & 10 deletions plugin/src/test/scala/io/github/nafg/mergify/sbt/Test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ class Test extends munit.FunSuite {
)
)

val yaml = mergify.toYaml

assertEquals(
yaml,
"""defaults: {}
|queue_rules:
| - name: default
Expand All @@ -37,9 +34,9 @@ class Test extends munit.FunSuite {
| - author=scala-steward
| - check-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11)
| actions:
| queue:
| name: default
|""".stripMargin
| queue: {}
|""".stripMargin,
mergify.toYaml
)
}

Expand All @@ -51,7 +48,6 @@ class Test extends munit.FunSuite {
)

assertEquals(
thing.toYaml,
"""defaults: {}
|queue_rules:
| - name: default
Expand All @@ -65,9 +61,9 @@ class Test extends munit.FunSuite {
| - assignee=someone
| - -draft
| actions:
| queue:
| name: default
|""".stripMargin
| queue: {}
|""".stripMargin,
thing.toYaml
)
}
}