Issue #3078671 by alexpott, Simon Peacock, greg.1.anderson, vuil, jun…

…gle, rodrigoaguilera, sam-elayyoub, mmjvb, karolrybak, catch: Pin behat/mink and behat/mink-selenium2-driver to use resolvable release
drupal · Mar 13, 2020 · 789634d · 789634d
1 parent 40b016a
commit 789634d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 24 deletions.
diff --git a/tests/Drupal/Tests/Composer/ComposerTest.php b/tests/Drupal/Tests/Composer/ComposerTest.php
@@ -25,23 +25,4 @@ public function testEnsureComposerVersion() {
     }
   }
 
-  /**
-   * Verify that Composer::ensureBehatDriverVersions() detects a good version.
-   *
-   * @covers::ensureBehatDriverVersions
-   */
-  public function testEnsureBehatDriverVersions() {
-    // First call 'ensureBehatDriverVersions' test directly using Drupal's
-    // composer.lock. It should not fail.
-    chdir($this->root);
-    $this->assertNull(Composer::ensureBehatDriverVersions());
-
-    // Next, call 'ensureBehatDriverVersions' again, this time using a fixture
-    // with a known-bad version number.
-    $this->expectException(\RuntimeException::class);
-    $this->expectExceptionMessageRegExp('#^Drupal requires behat/mink-selenium2-driver:1.3.x-dev#');
-    chdir(__DIR__ . '/fixtures/ensureBehatDriverVersionsFixture');
-    $this->assertNull(Composer::ensureBehatDriverVersions());
-  }
-
 }
diff --git a/tests/Drupal/Tests/Composer/Generator/BuilderTest.php b/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
@@ -49,7 +49,7 @@ public function builderTestData() {
           'license' => 'GPL-2.0-or-later',
           'require' =>
           [
-            'behat/mink' => '1.8.0 | 1.7.1.1 | 1.7.x-dev',
+            'behat/mink' => '^1.8',
           ],
           'conflict' =>
           [
@@ -68,7 +68,7 @@ public function builderTestData() {
           'require' =>
           [
             'drupal/core' => Composer::drupalVersionBranch(),
-            'behat/mink' => '1.8.0 | 1.7.1.1 | 1.7.x-dev',
+            'behat/mink' => 'v1.8.0',
             'symfony/css-selector' => 'v4.3.5',
           ],
           'conflict' =>

diff --git a/tests/Drupal/Tests/Composer/Generator/Fixtures.php b/tests/Drupal/Tests/Composer/Generator/Fixtures.php
@@ -38,7 +38,7 @@ protected function composerJson() {
       ],
       'require-dev' =>
       [
-        'behat/mink' => '1.7.x-dev',
+        'behat/mink' => '^1.8',
       ],
     ];
   }
@@ -84,12 +84,12 @@ protected function composerLock() {
       [
         [
           'name' => 'behat/mink',
-          'version' => 'dev-master',
+          'version' => 'v1.8.0',
           'source' =>
           [
             'type' => 'git',
             'url' => 'https://github.com/minkphp/Mink.git',
-            'reference' => 'a534fe7dac9525e8e10ca68e737c3d7e5058ec83',
+            'reference' => 'e1772aabb6b654464264a6cc72158c8b3409d8bc',
           ],
         ],
         [