Skip to content

Commit 8d5ec44

Browse files
adamnfish-guadamnfish-gu
committed
Apply scalafmt
1 parent f1f4fb5 commit 8d5ec44

5 files changed

Lines changed: 39 additions & 28 deletions

File tree

‎cli/src/test/scala/com/gu/devenv/ReleasesTest.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ReleasesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyChec
5454

5555
result match {
5656
case UpdateCheckResult.DevMode(_) => succeed
57-
case other => fail(s"Expected DevMode but got: $other")
57+
case other => fail(s"Expected DevMode but got: $other")
5858
}
5959
}
6060
}
@@ -69,7 +69,7 @@ class ReleasesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyChec
6969

7070
result match {
7171
case UpdateCheckResult.DevMode(_) => succeed
72-
case other => fail(s"Expected DevMode but got: $other")
72+
case other => fail(s"Expected DevMode but got: $other")
7373
}
7474
}
7575
}

‎core/src/test/scala/com/gu/devenv/integration/CheckIntegrationTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.scalatest.matchers.should.Matchers
1111
import java.nio.file.Files
1212

1313
class CheckIntegrationTest extends AnyFreeSpec with Matchers with TryValues {
14-
14+
1515
"check" - {
1616
"checking an uninitialized directory" - {
1717
"should return NotInitialized result" in {

‎core/src/test/scala/com/gu/devenv/integration/GenerateIntegrationTest.scala‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,10 @@ class GenerateIntegrationTest extends AnyFreeSpec with Matchers with TryValues {
258258
val devcontainerDir = tempDir.resolve(".devcontainer")
259259

260260
Devenv.init(devcontainerDir, modules).success.value
261-
Files.writeString(devcontainerDir.resolve("devenv.yaml"), projectConfigWithMultipleModules)
261+
Files.writeString(
262+
devcontainerDir.resolve("devenv.yaml"),
263+
projectConfigWithMultipleModules
264+
)
262265

263266
Devenv.generate(devcontainerDir, userConfigDir, modules).success.value
264267

‎core/src/test/scala/com/gu/devenv/integration/IntegrationTestHelpers.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.gu.devenv.integration
22

3-
import com.gu.devenv.modules.Modules.{Module, ModuleConfig, builtInModules}
3+
import com.gu.devenv.modules.Modules.{builtInModules, Module, ModuleConfig}
44

55
import java.nio.file.{Files, Path}
66
import scala.jdk.CollectionConverters.*

‎core/src/test/scala/com/gu/devenv/modules/ModulesTest.scala‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
3030

3131
"adds features to empty config" in {
3232
forAll(genFeatures) { features =>
33-
val baseConfig = ProjectConfig(name = "test")
33+
val baseConfig = ProjectConfig(name = "test")
3434
val contribution = ModuleContribution(features = features)
3535

3636
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -45,7 +45,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
4545

4646
"merges features with existing config (explicit features take precedence)" in {
4747
forAll(genFeatures, genFeatures) { (moduleFeatures, explicitFeatures) =>
48-
val baseConfig = ProjectConfig(name = "test", features = explicitFeatures)
48+
val baseConfig = ProjectConfig(name = "test", features = explicitFeatures)
4949
val contribution = ModuleContribution(features = moduleFeatures)
5050

5151
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -67,8 +67,8 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
6767
val genMount: Gen[Mount] = Gen.oneOf(
6868
Gen.alphaNumStr.suchThat(_.nonEmpty).map(Mount.ShortMount(_)),
6969
for {
70-
source <- Gen.alphaNumStr.suchThat(_.nonEmpty)
71-
target <- Gen.alphaNumStr.suchThat(_.nonEmpty)
70+
source <- Gen.alphaNumStr.suchThat(_.nonEmpty)
71+
target <- Gen.alphaNumStr.suchThat(_.nonEmpty)
7272
mountType <- Gen.oneOf("volume", "bind", "tmpfs")
7373
} yield Mount.ExplicitMount(source, target, mountType)
7474
)
@@ -77,7 +77,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
7777

7878
"adds mounts to empty config" in {
7979
forAll(genMounts) { mounts =>
80-
val baseConfig = ProjectConfig(name = "test")
80+
val baseConfig = ProjectConfig(name = "test")
8181
val contribution = ModuleContribution(mounts = mounts)
8282

8383
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -88,7 +88,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
8888

8989
"prepends mounts to existing config" in {
9090
forAll(genMounts, genMounts) { (moduleMounts, existingMounts) =>
91-
val baseConfig = ProjectConfig(name = "test", mounts = existingMounts)
91+
val baseConfig = ProjectConfig(name = "test", mounts = existingMounts)
9292
val contribution = ModuleContribution(mounts = moduleMounts)
9393

9494
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -105,7 +105,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
105105

106106
"adds vscode plugins to empty config" in {
107107
forAll(genVscodePlugins) { plugins =>
108-
val baseConfig = ProjectConfig(name = "test")
108+
val baseConfig = ProjectConfig(name = "test")
109109
val contribution = ModuleContribution(plugins = Plugins(vscode = plugins, intellij = Nil))
110110

111111
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -117,8 +117,12 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
117117
"prepends vscode plugins to existing config" in {
118118
forAll(genVscodePlugins, genVscodePlugins) { (modulePlugins, existingPlugins) =>
119119
val baseConfig =
120-
ProjectConfig(name = "test", plugins = Plugins(vscode = existingPlugins, intellij = Nil))
121-
val contribution = ModuleContribution(plugins = Plugins(vscode = modulePlugins, intellij = Nil))
120+
ProjectConfig(
121+
name = "test",
122+
plugins = Plugins(vscode = existingPlugins, intellij = Nil)
123+
)
124+
val contribution =
125+
ModuleContribution(plugins = Plugins(vscode = modulePlugins, intellij = Nil))
122126

123127
val result = Modules.applyModuleContribution(baseConfig, contribution)
124128

@@ -134,7 +138,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
134138

135139
"adds intellij plugins to empty config" in {
136140
forAll(genIntellijPlugins) { plugins =>
137-
val baseConfig = ProjectConfig(name = "test")
141+
val baseConfig = ProjectConfig(name = "test")
138142
val contribution = ModuleContribution(plugins = Plugins(vscode = Nil, intellij = plugins))
139143

140144
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -146,8 +150,12 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
146150
"prepends intellij plugins to existing config" in {
147151
forAll(genIntellijPlugins, genIntellijPlugins) { (modulePlugins, existingPlugins) =>
148152
val baseConfig =
149-
ProjectConfig(name = "test", plugins = Plugins(vscode = Nil, intellij = existingPlugins))
150-
val contribution = ModuleContribution(plugins = Plugins(vscode = Nil, intellij = modulePlugins))
153+
ProjectConfig(
154+
name = "test",
155+
plugins = Plugins(vscode = Nil, intellij = existingPlugins)
156+
)
157+
val contribution =
158+
ModuleContribution(plugins = Plugins(vscode = Nil, intellij = modulePlugins))
151159

152160
val result = Modules.applyModuleContribution(baseConfig, contribution)
153161

@@ -167,7 +175,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
167175

168176
"adds containerEnv to empty config" in {
169177
forAll(genEnvList) { envVars =>
170-
val baseConfig = ProjectConfig(name = "test")
178+
val baseConfig = ProjectConfig(name = "test")
171179
val contribution = ModuleContribution(containerEnv = envVars)
172180

173181
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -178,7 +186,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
178186

179187
"prepends containerEnv to existing config" in {
180188
forAll(genEnvList, genEnvList) { (moduleEnv, existingEnv) =>
181-
val baseConfig = ProjectConfig(name = "test", containerEnv = existingEnv)
189+
val baseConfig = ProjectConfig(name = "test", containerEnv = existingEnv)
182190
val contribution = ModuleContribution(containerEnv = moduleEnv)
183191

184192
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -199,7 +207,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
199207

200208
"adds remoteEnv to empty config" in {
201209
forAll(genEnvList) { envVars =>
202-
val baseConfig = ProjectConfig(name = "test")
210+
val baseConfig = ProjectConfig(name = "test")
203211
val contribution = ModuleContribution(remoteEnv = envVars)
204212

205213
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -210,7 +218,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
210218

211219
"prepends remoteEnv to existing config" in {
212220
forAll(genEnvList, genEnvList) { (moduleEnv, existingEnv) =>
213-
val baseConfig = ProjectConfig(name = "test", remoteEnv = existingEnv)
221+
val baseConfig = ProjectConfig(name = "test", remoteEnv = existingEnv)
214222
val contribution = ModuleContribution(remoteEnv = moduleEnv)
215223

216224
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -223,15 +231,15 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
223231

224232
"postCreateCommands field" - {
225233
val genCommand: Gen[Command] = for {
226-
cmd <- Gen.alphaNumStr.suchThat(_.nonEmpty)
234+
cmd <- Gen.alphaNumStr.suchThat(_.nonEmpty)
227235
workDir <- Gen.alphaNumStr.suchThat(_.nonEmpty)
228236
} yield Command(cmd, workDir)
229237

230238
val genCommands: Gen[List[Command]] = Gen.listOf(genCommand)
231239

232240
"adds postCreateCommands to empty config" in {
233241
forAll(genCommands) { commands =>
234-
val baseConfig = ProjectConfig(name = "test")
242+
val baseConfig = ProjectConfig(name = "test")
235243
val contribution = ModuleContribution(postCreateCommands = commands)
236244

237245
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -242,7 +250,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
242250

243251
"prepends postCreateCommands to existing config" in {
244252
forAll(genCommands, genCommands) { (moduleCommands, existingCommands) =>
245-
val baseConfig = ProjectConfig(name = "test", postCreateCommand = existingCommands)
253+
val baseConfig = ProjectConfig(name = "test", postCreateCommand = existingCommands)
246254
val contribution = ModuleContribution(postCreateCommands = moduleCommands)
247255

248256
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -259,7 +267,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
259267

260268
"adds capAdd to empty config" in {
261269
forAll(genCapAdd) { capabilities =>
262-
val baseConfig = ProjectConfig(name = "test")
270+
val baseConfig = ProjectConfig(name = "test")
263271
val contribution = ModuleContribution(capAdd = capabilities)
264272

265273
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -270,7 +278,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
270278

271279
"prepends capAdd to existing config" in {
272280
forAll(genCapAdd, genCapAdd) { (moduleCapAdd, existingCapAdd) =>
273-
val baseConfig = ProjectConfig(name = "test", capAdd = existingCapAdd)
281+
val baseConfig = ProjectConfig(name = "test", capAdd = existingCapAdd)
274282
val contribution = ModuleContribution(capAdd = moduleCapAdd)
275283

276284
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -287,7 +295,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
287295

288296
"adds securityOpt to empty config" in {
289297
forAll(genSecurityOpt) { securityOptions =>
290-
val baseConfig = ProjectConfig(name = "test")
298+
val baseConfig = ProjectConfig(name = "test")
291299
val contribution = ModuleContribution(securityOpt = securityOptions)
292300

293301
val result = Modules.applyModuleContribution(baseConfig, contribution)
@@ -298,7 +306,7 @@ class ModulesTest extends AnyFreeSpec with Matchers with ScalaCheckPropertyCheck
298306

299307
"prepends securityOpt to existing config" in {
300308
forAll(genSecurityOpt, genSecurityOpt) { (moduleSecurityOpt, existingSecurityOpt) =>
301-
val baseConfig = ProjectConfig(name = "test", securityOpt = existingSecurityOpt)
309+
val baseConfig = ProjectConfig(name = "test", securityOpt = existingSecurityOpt)
302310
val contribution = ModuleContribution(securityOpt = moduleSecurityOpt)
303311

304312
val result = Modules.applyModuleContribution(baseConfig, contribution)

0 commit comments

Comments
 (0)