[RC 6.7] fix the breaking tests for 6.7.0 (#661)

* [Student][6.7 hotfix] Fix for conferences group crash

* Revert "[Student][6.7 hotfix] Fix for conferences group crash"

This reverts commit 5aef896.

* fix the breaking tests for 6.7.0

apps/student/src/androidTest/java/com/instructure/student/ui/interaction/LoginInteractionTest.kt

@@ -33,12 +33,15 @@ class LoginInteractionTest : StudentTest() {
         // Should be able to search for and select a school in the "What's your school's name?" page
     }
 
+    @Stub
     @Test
-    @TestMetaData(Priority.P0, FeatureCategory.LOGIN, TestCategory.INTERACTION, false)
+    @TestMetaData(Priority.P0, FeatureCategory.LOGIN, TestCategory.INTERACTION, true)
     fun testLogin_qrTutorialPageLoads() {
         // Should be able to view and assert page objects on the QR tutorial page
+        /* Disabled while the remote config flag is off
         loginLandingPage.clickQRCodeButton()
         qrLoginPage.assertPageObjects()
         qrLoginPage.clickForA11y()
+         */
     }
 }

apps/student/src/androidTest/java/com/instructure/student/ui/pages/LoginLandingPage.kt

@@ -32,12 +32,12 @@ class LoginLandingPage : BasePage() {
     private val findMySchoolButton by OnViewWithId(R.id.findMySchool)
     private val canvasNetworkTextView by OnViewWithId(R.id.canvasNetwork)
     private val previousLoginWrapper by OnViewWithId(R.id.previousLoginWrapper, autoAssert = false)
-    private val previousLoginTitleText by  OnViewWithId(R.id.previousLoginTitleText, autoAssert = false)
-    private val previousLoginDivider by  OnViewWithId(R.id.previousLoginDivider, autoAssert = false)
-    private val previousLoginRecyclerView by  OnViewWithId(R.id.previousLoginRecyclerView, autoAssert = false)
+    private val previousLoginTitleText by OnViewWithId(R.id.previousLoginTitleText, autoAssert = false)
+    private val previousLoginDivider by OnViewWithId(R.id.previousLoginDivider, autoAssert = false)
+    private val previousLoginRecyclerView by OnViewWithId(R.id.previousLoginRecyclerView, autoAssert = false)
     private val canvasWordmarkView by OnViewWithId(R.id.canvasWordmark, autoAssert = false)
     private val appDescriptionTypeTextView by OnViewWithId(R.id.appDescriptionType, autoAssert = false)
-    private val qrCodeButton by OnViewWithId(R.id.qrLogin, autoAssert = true)
+    private val qrCodeButton by OnViewWithId(R.id.qrLogin, autoAssert = false)
 
     fun clickFindMySchoolButton() {
         findMySchoolButton.click()