(fix) Only return CI builds in duration timeline (#182)

craigatk · Sep 25, 2020 · 5c32274 · 5c32274
1 parent 95c57c9
commit 5c32274
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/functional-test/cypress/integration/repository_timeline.spec.js b/functional-test/cypress/integration/repository_timeline.spec.js
@@ -8,6 +8,7 @@ context("repository timeline", () => {
 
         cy.readFile("cypress/fixtures/grouped-passing-tests-with-git.json").then(
             (resultsBlob) => {
+                resultsBlob.metadata.ci = true;
                 resultsBlob.metadata.git.repoName = repoName;
 
                 cy.loadGroupedFixtureData(resultsBlob, "");
@@ -16,6 +17,7 @@ context("repository timeline", () => {
 
         cy.readFile("cypress/fixtures/grouped-passing-tests-with-git.json").then(
             (resultsBlob) => {
+                resultsBlob.metadata.ci = true;
                 resultsBlob.metadata.git.repoName = repoName;
 
                 cy.loadGroupedFixtureData(resultsBlob, "");

diff --git a/...r-app/src/main/kotlin/projektor/repository/testrun/RepositoryTestRunDatabaseRepository.kt b/...r-app/src/main/kotlin/projektor/repository/testrun/RepositoryTestRunDatabaseRepository.kt
@@ -33,7 +33,7 @@ class RepositoryTestRunDatabaseRepository(private val dslContext: DSLContext) :
                                 it.and(GIT_METADATA.PROJECT_NAME.isNull)
                             else
                                 it.and(GIT_METADATA.PROJECT_NAME.eq(projectName))
-                        }.and((RESULTS_METADATA.CI.isNull).or(RESULTS_METADATA.CI.eq(true))))
+                        }.and(RESULTS_METADATA.CI.eq(true)))
                         .orderBy(TEST_RUN.CREATED_TIMESTAMP.asc())
                         .fetchResultSet()
 

diff --git a/...p/src/test/kotlin/projektor/repository/testrun/RepositoryTestRunDatabaseRepositoryTest.kt b/...p/src/test/kotlin/projektor/repository/testrun/RepositoryTestRunDatabaseRepositoryTest.kt
@@ -43,21 +43,14 @@ class RepositoryTestRunDatabaseRepositoryTest : DatabaseRepositoryTestCase() {
         val timeline = runBlocking { repositoryTestRunDatabaseRepository.fetchRepositoryTestRunTimeline(repoName, projectName) }
         assertNotNull(timeline)
 
-        expectThat(timeline.timelineEntries).hasSize(2)
+        expectThat(timeline.timelineEntries).hasSize(1)
 
         val firstEntry = timeline.timelineEntries[0]
         expectThat(firstEntry) {
             get { publicId }.isEqualTo(firstRunCITruePublicId.id)
             get { totalTestCount }.isEqualTo(20)
             get { cumulativeDuration }.isEqualTo(BigDecimal("25.000"))
         }
-
-        val secondEntry = timeline.timelineEntries[1]
-        expectThat(secondEntry) {
-            get { publicId }.isEqualTo(secondRunCINullPublicId.id)
-            get { totalTestCount }.isEqualTo(30)
-            get { cumulativeDuration }.isEqualTo(BigDecimal("35.000"))
-        }
     }
 
     @Test

diff --git a/.../src/test/kotlin/projektor/repository/testrun/RepositoryTestRunTimelineApplicationTest.kt b/.../src/test/kotlin/projektor/repository/testrun/RepositoryTestRunTimelineApplicationTest.kt
@@ -31,14 +31,17 @@ class RepositoryTestRunTimelineApplicationTest : ApplicationTestCase() {
                 val firstTestRun = createTestRun(firstRunPublicId, 20, BigDecimal("10.001"))
                 testRunDao.insert(firstTestRun)
                 testRunDBGenerator.addGitMetadata(firstTestRun, repoName, true, "main", null)
+                testRunDBGenerator.addResultsMetadata(firstTestRun, true)
 
                 val secondTestRun = createTestRun(secondRunPublicId, 30, BigDecimal("15.001"))
                 testRunDao.insert(secondTestRun)
                 testRunDBGenerator.addGitMetadata(secondTestRun, repoName, true, "main", null)
+                testRunDBGenerator.addResultsMetadata(secondTestRun, true)
 
                 val thirdTestRun = createTestRun(thirdRunPublicId, 45, BigDecimal("25.001"))
                 testRunDao.insert(thirdTestRun)
                 testRunDBGenerator.addGitMetadata(thirdTestRun, repoName, true, "main", null)
+                testRunDBGenerator.addResultsMetadata(thirdTestRun, true)
             }.apply {
                 expectThat(response.status()).isEqualTo(HttpStatusCode.OK)
 
@@ -86,14 +89,17 @@ class RepositoryTestRunTimelineApplicationTest : ApplicationTestCase() {
                 val firstTestRun = createTestRun(firstRunPublicId, 20, BigDecimal("10.001"))
                 testRunDao.insert(firstTestRun)
                 testRunDBGenerator.addGitMetadata(firstTestRun, repoName, true, "main", projectName)
+                testRunDBGenerator.addResultsMetadata(firstTestRun, true)
 
                 val secondTestRun = createTestRun(secondRunPublicId, 30, BigDecimal("15.001"))
                 testRunDao.insert(secondTestRun)
                 testRunDBGenerator.addGitMetadata(secondTestRun, repoName, true, "main", projectName)
+                testRunDBGenerator.addResultsMetadata(secondTestRun, true)
 
                 val thirdTestRun = createTestRun(thirdRunPublicId, 45, BigDecimal("25.001"))
                 testRunDao.insert(thirdTestRun)
                 testRunDBGenerator.addGitMetadata(thirdTestRun, repoName, true, "main", projectName)
+                testRunDBGenerator.addResultsMetadata(thirdTestRun, true)
             }.apply {
                 expectThat(response.status()).isEqualTo(HttpStatusCode.OK)