src/test/kotlin/integration/Article routes.kt

@@ -1,18 +1,18 @@
 package integration
 
-import integration.asserts.`And have property`
-import integration.asserts.`And the response should not be null`
-import integration.asserts.`Then the response should be`
-import integration.asserts.`when`.`When I send a GET request`
-import integration.asserts.`when`.`When I send a POST request`
-import integration.asserts.`whish contains`
-import integration.asserts.and
-import integration.asserts.given.`Given I have article created by workgroup`
-import integration.asserts.given.`Given I have article`
-import integration.asserts.given.`Given I have articles`
-import integration.asserts.given.`Given I have citizen`
-import integration.asserts.given.`Given I have workgroup`
-import integration.asserts.given.`authenticated as`
+import integration.steps.`And have property`
+import integration.steps.`And the response should not be null`
+import integration.steps.`Then the response should be`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.`whish contains`
+import integration.steps.and
+import integration.steps.given.`Given I have article created by workgroup`
+import integration.steps.given.`Given I have article`
+import integration.steps.given.`Given I have articles`
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`Given I have workgroup`
+import integration.steps.given.`authenticated as`
 import io.ktor.http.HttpStatusCode.Companion.OK
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Tags

src/test/kotlin/integration/Citizen routes.kt

@@ -1,14 +1,14 @@
 package integration
 
-import integration.asserts.`And have property`
-import integration.asserts.`And the response should not be null`
-import integration.asserts.`Then the response should be`
-import integration.asserts.`when`.`When I send a GET request`
-import integration.asserts.`when`.`When I send a PUT request`
-import integration.asserts.`whish contains`
-import integration.asserts.and
-import integration.asserts.given.`Given I have citizen`
-import integration.asserts.given.`authenticated as`
+import integration.steps.`And have property`
+import integration.steps.`And the response should not be null`
+import integration.steps.`Then the response should be`
+import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a PUT request`
+import integration.steps.`whish contains`
+import integration.steps.and
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`authenticated as`
 import io.ktor.http.HttpStatusCode.Companion.BadRequest
 import io.ktor.http.HttpStatusCode.Companion.Created
 import io.ktor.http.HttpStatusCode.Companion.OK

src/test/kotlin/integration/Login routes.kt

@@ -1,11 +1,11 @@
 package integration
 
-import integration.asserts.`And the response should not be null`
-import integration.asserts.`Then the response should be`
-import integration.asserts.`and should contains`
-import integration.asserts.`when`.`When I send a POST request`
-import integration.asserts.given.`Given I have citizen`
-import integration.asserts.given.`authenticated as`
+import integration.steps.`And the response should not be null`
+import integration.steps.`Then the response should be`
+import integration.steps.`and should contains`
+import integration.steps.`when`.`When I send a POST request`
+import integration.steps.given.`Given I have citizen`
+import integration.steps.given.`authenticated as`
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.HttpStatusCode.Companion.NoContent
 import org.junit.jupiter.api.Tag

src/test/kotlin/integration/Register routes.kt

@@ -1,7 +1,7 @@
 package integration
 
-import integration.asserts.`Then the response should be`
-import integration.asserts.`when`.`When I send a POST request`
+import integration.steps.`Then the response should be`
+import integration.steps.`when`.`When I send a POST request`
 import io.ktor.http.HttpStatusCode
 import org.amshove.kluent.`should be null`
 import org.amshove.kluent.`should contain`

src/test/kotlin/integration/steps/given/Article.kt

@@ -1,4 +1,4 @@
-package integration.asserts.given
+package integration.steps.given
 
 import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.ArticleForUpdate

src/test/kotlin/integration/steps/given/Auth.kt

@@ -1,4 +1,4 @@
-package integration.asserts.given
+package integration.steps.given
 
 import com.auth0.jwt.JWT
 import fr.dcproject.component.auth.jwt.JwtConfig

src/test/kotlin/integration/steps/given/Citizen.kt

@@ -1,4 +1,4 @@
-package integration.asserts.given
+package integration.steps.given
 
 import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.auth.UserForCreate

src/test/kotlin/integration/steps/given/Workgroup.kt

@@ -1,4 +1,4 @@
-package integration.asserts.given
+package integration.steps.given
 
 import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.auth.UserForCreate
@@ -13,7 +13,6 @@ import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member.Role.MASTER
 import io.ktor.server.testing.TestApplicationEngine
 import org.joda.time.DateTime
 import org.koin.core.context.GlobalContext
-import org.koin.test.get
 import java.util.UUID
 
 fun TestApplicationEngine.`Given I have workgroup`(

src/test/kotlin/integration/steps/then/request.kt

@@ -1,4 +1,4 @@
-package integration.asserts
+package integration.steps
 
 import com.jayway.jsonpath.JsonPath
 import io.ktor.http.HttpStatusCode

src/test/kotlin/integration/steps/when/request.kt

@@ -1,4 +1,4 @@
-package integration.asserts.`when`
+package integration.steps.`when`
 
 import io.ktor.http.ContentType
 import io.ktor.http.HttpHeaders