hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 1 Activity

feature/remove-office-data-import #155

Merged
hsh-michaelhoennig merged 14 commits from feature/remove-office-data-import into master 2025-02-05 09:29:44 +01:00
Conversation 0 Commits 14 Files Changed 6 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b1f5f4e40e - Show all commits

2
src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
View File

@ -92,7 +92,7 @@ import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TE
}) })
@DirtiesContext @DirtiesContext
@Import({ Context.class, JpaAttempt.class, LiquibaseConfig.class }) @Import({ Context.class, JpaAttempt.class, LiquibaseConfig.class })
@ActiveProfiles({ "without-test-data", "liquibase-migration-test" }) @ActiveProfiles({ "without-test-data", "liquibase-migration" })
@TestMethodOrder(MethodOrderer.OrderAnnotation.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@ExtendWith(OrderedDependedTestsExtension.class) @ExtendWith(OrderedDependedTestsExtension.class)
@Sql(value = "/db/released-only-office-schema-with-import-test-data.sql", executionPhase = BEFORE_TEST_CLASS) @Sql(value = "/db/released-only-office-schema-with-import-test-data.sql", executionPhase = BEFORE_TEST_CLASS)

2
src/test/java/net/hostsharing/hsadminng/hs/migration/ImportOfficeData.java
View File

@ -56,7 +56,7 @@ import java.io.File;
"hsadminng.superuser=${HSADMINNG_SUPERUSER:import-superuser@hostsharing.net}", "hsadminng.superuser=${HSADMINNG_SUPERUSER:import-superuser@hostsharing.net}",
"spring.liquibase.contexts=only-office,without-test-data" "spring.liquibase.contexts=only-office,without-test-data"
}) })
@ActiveProfiles({"without-test-data"}) @ActiveProfiles("without-test-data")
@DirtiesContext @DirtiesContext
@Import({ Context.class, JpaAttempt.class }) @Import({ Context.class, JpaAttempt.class })
@TestMethodOrder(MethodOrderer.OrderAnnotation.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class)