Merge pull request #17063 from wordpress-mobile/uitests/un-ignore-screenshots

Un-ignore screenshot tests and exclude them properly instead

Author: AliSoftware

Gemfile.lock

@@ -274,7 +274,7 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane (~> 2)
-  fastlane-plugin-wpmreleasetoolkit (~> 5.2)
+  fastlane-plugin-wpmreleasetoolkit (~> 5.4)
   nokogiri
   rmagick (~> 4.1)
 

WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/JPScreenshotTest.java

@@ -11,7 +11,6 @@
 import com.google.android.libraries.cloudtesting.screenshots.ScreenShotter;
 
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
@@ -96,7 +95,6 @@ public static String buildScreenshotName(Screenshots screen) {
         }
     }
 
-    @Ignore("Ignored until there's a way to exclude tests on FTL properly, via `--test-targets` option.")
     @Test
     public void jPScreenshotTest() {
         if (BuildConfig.IS_JETPACK_APP) {

WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java

@@ -9,7 +9,6 @@
 import com.google.android.libraries.cloudtesting.screenshots.ScreenShotter;
 
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
@@ -50,7 +49,6 @@ public class WPScreenshotTest extends BaseTest {
 
     private DemoModeEnabler mDemoModeEnabler = new DemoModeEnabler();
 
-    @Ignore("Ignored until there's a way to exclude tests on FTL properly, via `--test-targets` option.")
     @Test
     public void wPScreenshotTest() {
         if (!BuildConfig.IS_JETPACK_APP) {

fastlane/Pluginfile

@@ -7,4 +7,4 @@ group :screenshots, optional: true do
 end
 
 # gem 'fastlane-plugin-wpmreleasetoolkit', git: 'git@github.com:wordpress-mobile/release-toolkit.git', branch: 'trunk'
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 5.2'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 5.4'

fastlane/lanes/test.rb

@@ -28,6 +28,7 @@
      version: 28,
      test_apk_path: File.join(apk_dir, 'androidTest', 'wordpressVanilla', 'debug', 'org.wordpress.android-wordpress-vanilla-debug-androidTest.apk'),
      apk_path: File.join(apk_dir, 'wordpressVanilla', 'debug', 'org.wordpress.android-wordpress-vanilla-debug.apk'),
+     test_targets: 'notPackage org.wordpress.android.ui.screenshots',
      results_output_dir: File.join(PROJECT_ROOT_FOLDER, 'build', 'instrumented-tests')
    )
   end