[ui-core]: Update backend tests

Author: ramprasadagarwal

apps/useradmin/src/useradmin/tests.py

@@ -1041,7 +1041,8 @@ def test_user_admin(self):
       )
       # Now make sure FUNNY_NAME can't log back in
       response = c_reg.get('/useradmin/users/edit/%s' % (FUNNY_NAME_QUOTED,))
-      assert response.status_code == 302 and "login" in response["location"], "Inactivated user gets redirected to login page"
+      # New behavior: Returns 200 with JavaScript redirect instead of HTTP 302
+      assert response.status_code == 200 and b"Redirecting to login" in response.content, "Inactivated user gets redirected to login page"
 
       # Create a new user with unicode characters
       response = c.post('/useradmin/users/new', dict(

desktop/core/src/desktop/require_login_test.py

@@ -29,11 +29,13 @@
 @pytest.mark.django_db
 def test_require_login():
   c = Client()
-  # We're not logged in, so expect a redirection.
+  # We're not logged in, so expect a redirect (now via JavaScript in HTML)
 
   response = c.get('/profile')
-  assert isinstance(response, django.http.HttpResponseRedirect), "Expected redirect"
-  assert "/hue/accounts/login?next=/profile" == response["Location"]
+  # New behavior: Returns 200 with JavaScript redirect instead of HTTP 302
+  assert 200 == response.status_code
+  assert b'Redirecting to login' in response.content
+  assert b'/hue/accounts/login' in response.content
 
   # AllowAllBackend should let us in.
   c.login(request=Mock(), username="test", password="test")

desktop/core/src/desktop/tests.py

@@ -771,14 +771,12 @@ def test_ui_customizations():
   )
 
   try:
-    c = make_logged_in_client()
-    c.logout()
+    # Test LOGIN_SPLASH_HTML on login page when NOT logged in
+    c = Client()
     if not isinstance(custom_message, bytes):
       custom_message = custom_message.encode('utf-8')
     resp = c.get('/hue/accounts/login/', follow=False)
     assert custom_message in resp.content, resp
-    resp = c.get('/hue/about', follow=True)
-    assert custom_message in resp.content, resp
   finally:
     for old_conf in reset:
       old_conf()