Merge commit 'bee7c3267310548b985fc788bb9ebefc7d8694d7' into dinsic-release-v1.11.x

* commit 'bee7c3267310548b985fc788bb9ebefc7d8694d7':
  Fix the CAS login test (#826)

Author: anoadragon453

tests/12login/02cas.pl

@@ -161,7 +161,7 @@ sub wait_for_cas_request
                method   => "GET",
                full_uri => $login_uri,
                max_redirects => 0, # don't follow the redirect
-            )->followed_by( \&main::expect_http_302 ),
+            ),
          );
       })->then( sub {
          my ( $cas_validate_request, $ticket_response ) = @_;
@@ -175,19 +175,12 @@ sub wait_for_cas_request
                     $HS_URI,
                     "Service supplied to /cas/proxyValidate" );
 
-         my $redirect = $ticket_response->header( "Location" );
-         log_if_fail( "Redirect from /login/cas/ticket", $redirect);
-         assert_ok( $redirect =~ m#^https://client\?#,
-                    "Location returned by /login/cas/ticket did not match" );
-
-         # the original query param should have been preserved
-         my $redirect_uri = URI->new($redirect);
-         assert_eq( $redirect_uri->query_param( "p" ) // undef,
-                    "http://server",
-                    "Query param on redirect from /login/cas/ticket" );
+         assert_ok( $ticket_response =~ "loginToken=([^\"&]+)",
+                    "Login token provided in the /ticket response" );
+         my $login_token = $1;
 
-         # a 'loginToken' should be added.
-         my $login_token = $redirect_uri->query_param( "loginToken" );
+         log_if_fail( "Ticket response:", $ticket_response );
+         log_if_fail( "Login token:", $login_token );
 
          # step 7: the client uses the loginToken via the /login API.
          $http->do_request_json(