Merge pull request #2292 from element-hq/feature/bma/gitSha

Git sha and branch in log

features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt

@@ -202,6 +202,8 @@ class DefaultBugReporter @Inject constructor(
                     // add some github labels
                     builder.addFormDataPart("label", buildMeta.versionName)
                     builder.addFormDataPart("label", buildMeta.flavorDescription)
+                    builder.addFormDataPart("branch_name", buildMeta.gitBranchName)
+
                     if (crashCallStack.isNotEmpty() && withCrashLogs) {
                         builder.addFormDataPart("label", "crash")
                     }

features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt

@@ -80,7 +80,7 @@ class DefaultBugReporterTest {
         server.shutdown()
         assertThat(onUploadCancelledCalled).isFalse()
         assertThat(onUploadFailedCalled).isFalse()
-        assertThat(progressValues.size).isEqualTo(11)
+        assertThat(progressValues.size).isEqualTo(EXPECTED_NUMBER_OF_PROGRESS_VALUE)
         assertThat(onUploadSucceedCalled).isTrue()
     }
 
@@ -131,7 +131,7 @@ class DefaultBugReporterTest {
         assertThat(onUploadCancelledCalled).isFalse()
         assertThat(onUploadFailedCalled).isTrue()
         assertThat(onUploadFailedReason).isEqualTo("An error body")
-        assertThat(progressValues.size).isEqualTo(11)
+        assertThat(progressValues.size).isEqualTo(EXPECTED_NUMBER_OF_PROGRESS_VALUE)
         assertThat(onUploadSucceedCalled).isFalse()
     }
 
@@ -153,4 +153,8 @@ class DefaultBugReporterTest {
             bugReporterUrlProvider = { server.url("/") }
         )
     }
+
+    companion object {
+        private const val EXPECTED_NUMBER_OF_PROGRESS_VALUE = 12
+    }
 }