updating constraintlayout, rxjava and robolectric (#227)

instacart · Sep 7, 2021 · 4f929e1 · 4f929e1
1 parent eed8eb0
commit 4f929e1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -9,7 +9,7 @@ ext {
     mockitoVersion = "3.3.3"
     mockitoKotlinVersion = "1.6.0"
     okhttpVersion = "3.13.1"
-    robolectricVersion = "4.1" // be aware of updating https://github.com/robolectric/robolectric/pull/4736
+    robolectricVersion = "4.6.1"
     truthVersion = "1.0.1"
     composeVersion = "1.0.1"
 
@@ -35,7 +35,7 @@ ext {
                     collection      : [
                             ktx: "androidx.collection:collection-ktx:$androidXVersion"
                     ],
-                    constraintlayout: "androidx.constraintlayout:constraintlayout:1.1.3",
+                    constraintlayout: "androidx.constraintlayout:constraintlayout:2.1.0",
                     lifecycle       : [
                             runtime   : "androidx.lifecycle:lifecycle-runtime:$lifecycleVersion",
                             extensions: "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
@@ -62,7 +62,7 @@ ext {
             kotlin               : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion",
             kotlinReflect        : "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion",
             robolectric          : "org.robolectric:robolectric:$robolectricVersion",
-            rxjava               : "io.reactivex.rxjava3:rxjava:3.0.4",
+            rxjava               : "io.reactivex.rxjava3:rxjava:3.1.1",
             rxandroid            : "io.reactivex.rxjava3:rxandroid:3.0.0",
             rxrelays             : "com.jakewharton.rxrelay3:rxrelay:3.0.0",
             truth                : "com.google.truth:truth:$truthVersion"

diff --git a/formula-android-tests/src/main/AndroidManifest.xml b/formula-android-tests/src/main/AndroidManifest.xml
@@ -14,5 +14,26 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity android:name="com.instacart.formula.ActivityUpdateTest$TestActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.instacart.formula.ActivityLifecycleEventTest$TestActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.instacart.formula.ActivityUpdateTimingTest$TestActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 </manifest>
diff --git a/formula-android-tests/src/test/java/com/instacart/formula/FragmentFlowRenderViewTest.kt b/formula-android-tests/src/test/java/com/instacart/formula/FragmentFlowRenderViewTest.kt
@@ -20,6 +20,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
+import org.robolectric.annotation.LooperMode
 
 @RunWith(AndroidJUnit4::class)
 class FragmentFlowRenderViewTest {
@@ -130,6 +131,7 @@ class FragmentFlowRenderViewTest {
         assertThat(activity.renderCalls).containsExactly(contract to "update").inOrder()
     }
 
+    @LooperMode(LooperMode.Mode.LEGACY)
     @Test fun `delegates back press to current render model`() {
         navigateToTaskDetail()
 

diff --git a/formula-android-tests/src/test/java/com/instacart/formula/FragmentLifecycleStateTest.kt b/formula-android-tests/src/test/java/com/instacart/formula/FragmentLifecycleStateTest.kt
@@ -16,6 +16,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
+import org.robolectric.annotation.LooperMode
 
 @RunWith(AndroidJUnit4::class)
 class FragmentLifecycleStateTest {
@@ -70,6 +71,7 @@ class FragmentLifecycleStateTest {
         assertThat(events).containsExactly(false, true).inOrder()
     }
 
+    @LooperMode(LooperMode.Mode.LEGACY)
     @Test fun `navigate forward`() {
         navigateToTaskDetail()