From 8c3898aa576643fb4238141ad94c2f5a6e1e74ad Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Mon, 9 Jul 2018 22:51:23 +0200
Subject: [PATCH] Update tests for replace conflicts

This reverts the test changes done in b4698568d2 to the original tests added
in 1425bb7fc3.
---
 ...-installed-when-installing-from-lock.test} | 12 +++---
 ...aced-packages-should-not-be-installed.test | 24 +++++++++++
 ...kages-wrong-version-install-from-lock.test | 41 -------------------
 3 files changed, 29 insertions(+), 48 deletions(-)
 rename tests/Composer/Test/Fixtures/installer/{replaced-packages-wrong-version-install.test => replaced-packages-should-not-be-installed-when-installing-from-lock.test} (85%)
 create mode 100644 tests/Composer/Test/Fixtures/installer/replaced-packages-should-not-be-installed.test
 delete mode 100644 tests/Composer/Test/Fixtures/installer/replaced-packages-wrong-version-install-from-lock.test

diff --git a/tests/Composer/Test/Fixtures/installer/replaced-packages-wrong-version-install.test b/tests/Composer/Test/Fixtures/installer/replaced-packages-should-not-be-installed-when-installing-from-lock.test
similarity index 85%
rename from tests/Composer/Test/Fixtures/installer/replaced-packages-wrong-version-install.test
rename to tests/Composer/Test/Fixtures/installer/replaced-packages-should-not-be-installed-when-installing-from-lock.test
index 8971f8069..947d96b28 100644
--- a/tests/Composer/Test/Fixtures/installer/replaced-packages-wrong-version-install.test
+++ b/tests/Composer/Test/Fixtures/installer/replaced-packages-should-not-be-installed-when-installing-from-lock.test
@@ -1,5 +1,5 @@
 --TEST--
-Requiring a replaced package in a version, that is not provided by the replacing package, should install correctly (although that is not a very smart idea)
+Requiring a replaced package in a version, that is not provided by the replacing package, should result in a conflict, when installing from lock
 --COMPOSER--
 {
     "repositories": [
@@ -17,9 +17,7 @@ Requiring a replaced package in a version, that is not provided by the replacing
         "foo/replaced": "2.0.0"
     }
 }
---RUN--
-install
---EXPECT-LOCK--
+--LOCK--
 {
     "packages": [
         { "name": "foo/original", "version": "1.0.0", "replace": {"foo/replaced": "1.0.0"}, "type": "library" },
@@ -34,8 +32,8 @@ install
     "platform": [],
     "platform-dev": []
 }
+--RUN--
+install
 --EXPECT-EXIT-CODE--
-0
+2
 --EXPECT--
-Installing foo/original (1.0.0)
-Installing foo/replaced (2.0.0)
diff --git a/tests/Composer/Test/Fixtures/installer/replaced-packages-should-not-be-installed.test b/tests/Composer/Test/Fixtures/installer/replaced-packages-should-not-be-installed.test
new file mode 100644
index 000000000..0d1ea7701
--- /dev/null
+++ b/tests/Composer/Test/Fixtures/installer/replaced-packages-should-not-be-installed.test
@@ -0,0 +1,24 @@
+--TEST--
+Requiring a replaced package in a version, that is not provided by the replacing package, should result in a conflict
+--COMPOSER--
+{
+    "repositories": [
+        {
+            "type": "package",
+            "package": [
+                { "name": "foo/original", "version": "1.0.0", "replace": {"foo/replaced": "1.0.0"} },
+                { "name": "foo/replaced", "version": "1.0.0" },
+                { "name": "foo/replaced", "version": "2.0.0" }
+            ]
+        }
+    ],
+    "require": {
+        "foo/original": "1.0.0",
+        "foo/replaced": "2.0.0"
+    }
+}
+--RUN--
+install
+--EXPECT-EXIT-CODE--
+2
+--EXPECT--
diff --git a/tests/Composer/Test/Fixtures/installer/replaced-packages-wrong-version-install-from-lock.test b/tests/Composer/Test/Fixtures/installer/replaced-packages-wrong-version-install-from-lock.test
deleted file mode 100644
index 2721772ae..000000000
--- a/tests/Composer/Test/Fixtures/installer/replaced-packages-wrong-version-install-from-lock.test
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-Requiring a replaced package in a version, that is not provided by the replacing package, should install correctly (although that is not a very smart idea) also when installing from lock
---COMPOSER--
-{
-    "repositories": [
-        {
-            "type": "package",
-            "package": [
-                { "name": "foo/original", "version": "1.0.0", "replace": {"foo/replaced": "1.0.0"} },
-                { "name": "foo/replaced", "version": "1.0.0" },
-                { "name": "foo/replaced", "version": "2.0.0" }
-            ]
-        }
-    ],
-    "require": {
-        "foo/original": "1.0.0",
-        "foo/replaced": "2.0.0"
-    }
-}
---LOCK--
-{
-    "packages": [
-        { "name": "foo/original", "version": "1.0.0", "replace": {"foo/replaced": "1.0.0"}, "type": "library" },
-        { "name": "foo/replaced", "version": "2.0.0", "type": "library" }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {},
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": []
-}
---RUN--
-install
---EXPECT-EXIT-CODE--
-0
---EXPECT--
-Installing foo/original (1.0.0)
-Installing foo/replaced (2.0.0)