OPENEUROPA-1485: Fix code review comments.

behat.yml.dist

@@ -5,8 +5,8 @@ default:
         - %paths.base%/tests/features
       contexts:
         - Drupal\DrupalExtension\Context\MinkContext
+        - Drupal\DrupalExtension\Context\DrupalContext
         - Drupal\Tests\oe_authentication\Behat\AuthenticationContext
-        - Drupal\Tests\oe_authentication\Behat\DrupalContext
   extensions:
     Behat\MinkExtension:
       goutte: ~

composer.json

@@ -53,11 +53,6 @@
             "build/profiles/contrib/{$name}": ["type:drupal-profile"],
             "build/modules/contrib/{$name}": ["type:drupal-module"],
             "build/themes/contrib/{$name}": ["type:drupal-theme"]
-        },
-        "patches": {
-            "drupal/cas": {
-                "https://www.drupal.org/project/cas/issues/3020014": "https://www.drupal.org/files/issues/2018-12-12/3020014-2.patch"
-            }
         }
     },
     "config": {

tests/Behat/AuthenticationContext.php

@@ -35,4 +35,29 @@ public function setConfigProxyInitialize(): void {
     $this->setConfig('cas.settings', 'proxy.initialize', TRUE);
   }
 
+  /**
+   * Blocks a user given its username.
+   *
+   * @var string $username
+   *   The name of the user to be blocked.
+   *
+   * @When the user :username is blocked
+   *
+   * @throws \Exception
+   *   Thrown when the user with the given name does not exist.
+   */
+  public function blockUser(string $username): void {
+    $users = \Drupal::entityTypeManager()
+      ->getStorage('user')
+      ->loadByProperties([
+        'name' => $username,
+      ]);
+    /** @var \Drupal\user\Entity\User $user */
+    $user = $users ? reset($users) : FALSE;
+    if ($user) {
+      $user->block();
+      $user->save();
+    }
+  }
+
 }

tests/features/ecas-login.feature

@@ -36,28 +36,14 @@ Feature: Login through OE Authentication
     And I should see the link "Log in"
 
   Scenario: A blocked user should not be able to log in
+    Given the user "chucknorris" is blocked
     When I am on the homepage
-    And I click "Log in"
-    And I click "European Commission"
-
-    # Redirected to the mock server.
-    And I fill in "Username or e-mail address" with "texasranger@chuck_norris.com.eu"
-    And I fill in "Password" with "Qwerty098"
-    And I press the "Login!" button
-
-    # Redirected back to Drupal.
-    Then I should see "You have been logged in."
-    And I should see the link "My account"
-    And I should see the link "Log out"
-    And I should not see the link "Log in"
-
-    # After being blocked a user is logged out.
-    When the user "chucknorris" is blocked
-    And I reload the page
-    And I should see the link "Log in"
+    Then I should see the link "Log in"
     And I should not see the link "Log out"
 
     # When I try to log in again I will be denied access.
     When I click "Log in"
-    And I press "Proceed"
+    And I fill in "Username or e-mail address" with "texasranger@chuck_norris.com.eu"
+    And I fill in "Password" with "Qwerty098"
+    And I press the "Login!" button
     Then I should see "There was a problem logging in, please contact a site administrator."

tests/features/ecas-register.feature

@@ -9,4 +9,4 @@ Feature: Register through OE Authentication
     And I visit "/user/register"
 
     # Redirected to the Ecas mockup server.
-    Then I should see "Service Create an account"
+    Then I should see "Create an account"