Merge remote-tracking branch 'origin/1.0.1-alpha-1'

kajornsakp · Jan 2, 2020 · 11b540e · 11b540e
2 parents 66857ec + f2ac594
commit 11b540e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/plugin/src/main/kotlin/com/facebook/testing/screenshot/build/PullScreenshotsTask.kt b/plugin/src/main/kotlin/com/facebook/testing/screenshot/build/PullScreenshotsTask.kt
@@ -81,8 +81,14 @@ open class PullScreenshotsTask : ScreenshotTask() {
           add("--record")
         }
 
-        if (verify || record) {
-          add(extension.recordDir)
+        if (extension.variantRecord) {
+          if (verify || record) {
+            add(extension.recordDir + variant.flavorName.toLowerCase() + "/")
+          }
+        } else {
+          if (verify || record) {
+            add(extension.recordDir)
+          }
         }
 
         if (verify && extension.failureDir != null) {

diff --git a/plugin/src/main/kotlin/com/facebook/testing/screenshot/build/ScreenshotsPlugin.kt b/plugin/src/main/kotlin/com/facebook/testing/screenshot/build/ScreenshotsPlugin.kt
@@ -36,6 +36,8 @@ open class ScreenshotsPluginExtension {
   var referenceDir: String? = null
   /** The directory to save failed screenshots */
   var failureDir: String? = null
+  /** Using variant name as subdirectory for reference images */
+  var variantRecord = false
 }
 
 class ScreenshotsPlugin : Plugin<Project> {