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

Move git scripted tests from p17 to p18 #193

Merged
merged 1 commit into from
Dec 23, 2021
Merged

Move git scripted tests from p17 to p18 #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions plugin/src/sbt-test/scalafmt-sbt/sbt/.scalafmt18.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version = 2.0.0
style = IntelliJ
maxColumn = 42
4 changes: 4 additions & 0 deletions plugin/src/sbt-test/scalafmt-sbt/sbt/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ lazy val p17 = project.settings(
}
}
)
lazy val p18 = project.settings(
scalafmtConfig := file(".scalafmt18.conf"),
scalaVersion := "2.12.1"
)

def assertContentsEqual(file: File, expected: String): Unit = {
val obtained =
Expand Down
57 changes: 28 additions & 29 deletions plugin/src/sbt-test/scalafmt-sbt/sbt/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,50 +142,49 @@ $ delete p17/src/main/scala/Test2.scala
$ copy-file changes/good.scala p17/src/main/scala/Test2.scala
> p17/scalafmtCheck
> p17/scalafmt
$ delete p17/src/main/scala/Test.scala

# set up git
$ exec git init -b main p17
$ exec git init -b main p18
# filter dirty files
> set p17/scalafmtFilter := ("diff-dirty")
> set p18/scalafmtFilter := ("diff-dirty")
# dirty but should succeed
$ copy-file changes/good.scala p17/src/main/scala/TestGood.scala
> p17/scalafmtCheck
$ copy-file changes/good.scala p18/src/main/scala/TestGood.scala
> p18/scalafmtCheck
# dirty and should fail
$ copy-file changes/bad.scala p17/src/main/scala/TestBad.scala
-> p17/scalafmtCheck
$ copy-file changes/bad.scala p18/src/main/scala/TestBad.scala
-> p18/scalafmtCheck
# tracked yet still fail
$ exec git -C p17 add "src/main/scala/TestBad.scala"
-> p17/scalafmtCheck
$ exec git -C p18 add "src/main/scala/TestBad.scala"
-> p18/scalafmtCheck
# no longer dirty, should succeed
$ exec git -C p17 commit -m 'added TestBad.scala'
> p17/scalafmtCheck
$ exec git -C p18 commit -m 'added TestBad.scala'
> p18/scalafmtCheck
# filter tracked modifications since branch=main
> set p17/scalafmtFilter := ("diff-ref=main")
> set p18/scalafmtFilter := ("diff-ref=main")
# TestBad is checked in, TestGood not tracked
> p17/scalafmtCheck
> p18/scalafmtCheck
# copy but unchanged
$ copy-file changes/bad.scala p17/src/main/scala/TestBad.scala
> p17/scalafmtCheck
$ copy-file changes/bad.scala p18/src/main/scala/TestBad.scala
> p18/scalafmtCheck
# copy to new file but untracked
$ copy-file changes/bad.scala p17/src/main/scala/TestBad2.scala
> p17/scalafmtCheck
$ copy-file changes/bad.scala p18/src/main/scala/TestBad2.scala
> p18/scalafmtCheck
# now track it
$ exec git -C p17 add "src/main/scala/TestBad2.scala"
-> p17/scalafmtCheck
$ exec git -C p18 add "src/main/scala/TestBad2.scala"
-> p18/scalafmtCheck
# now commit it, no longer modified
$ exec git -C p17 commit -m 'added TestBad2.scala'
> p17/scalafmtCheck
$ exec git -C p18 commit -m 'added TestBad2.scala'
> p18/scalafmtCheck
# don't filter but fail after all errors
> set p17/scalafmtFilter := ("")
$ copy-file changes/invalid.scala p17/src/main/scala/TestInvalid1.scala
$ copy-file changes/invalid.scala p17/src/main/scala/TestInvalid2.scala
-> p17/scalafmt
> set p18/scalafmtFilter := ("")
$ copy-file changes/invalid.scala p18/src/main/scala/TestInvalid1.scala
$ copy-file changes/invalid.scala p18/src/main/scala/TestInvalid2.scala
-> p18/scalafmt
# fail after all errors
> set p17/scalafmtLogOnEachError := true
-> p17/scalafmt
> set p17/scalafmtFailOnErrors := false
> p17/scalafmt
> set p18/scalafmtLogOnEachError := true
-> p18/scalafmt
> set p18/scalafmtFailOnErrors := false
> p18/scalafmt

$ copy-file changes/target/managed.scala project/target/managed.scala
$ copy-file changes/x/Something.scala project/x/Something.scala
Expand Down