From dfe366152c3131b9f07067f61869f422e808eb3a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 28 May 2012 11:55:16 +0200
Subject: [PATCH] Add an update whitelist test for a dependency specified in
 composer.json

---
 .../update-whitelist-locked-require.test      | 36 +++++++++++++++++++
 .../Fixtures/installer/update-whitelist.test  |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 tests/Composer/Test/Fixtures/installer/update-whitelist-locked-require.test

diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-locked-require.test b/tests/Composer/Test/Fixtures/installer/update-whitelist-locked-require.test
new file mode 100644
index 000000000..f0cf96ee7
--- /dev/null
+++ b/tests/Composer/Test/Fixtures/installer/update-whitelist-locked-require.test
@@ -0,0 +1,36 @@
+--TEST--
+Update with a package whitelist only updates those packages and their dependencies if they are not present in composer.json
+--COMPOSER--
+{
+    "repositories": [
+        {
+            "type": "package",
+            "package": [
+                { "name": "whitelisted", "version": "1.1.0", "require": { "dependency": "1.1.0", "fixed-dependency": "1.*" } },
+                { "name": "whitelisted", "version": "1.0.0", "require": { "dependency": "1.0.0", "fixed-dependency": "1.*" } },
+                { "name": "dependency", "version": "1.1.0" },
+                { "name": "dependency", "version": "1.0.0" },
+                { "name": "fixed-dependency", "version": "1.1.0", "require": { "fixed-sub-dependency": "1.*" } },
+                { "name": "fixed-dependency", "version": "1.0.0", "require": { "fixed-sub-dependency": "1.*" } },
+                { "name": "fixed-sub-dependency", "version": "1.1.0" },
+                { "name": "fixed-sub-dependency", "version": "1.0.0" }
+            ]
+        }
+    ],
+    "require": {
+        "whitelisted": "1.*",
+        "fixed-dependency": "1.*"
+    }
+}
+--INSTALLED--
+[
+    { "name": "whitelisted", "version": "1.0.0", "require": { "dependency": "1.0.0", "fixed-dependency": "1.0.0" } },
+    { "name": "dependency", "version": "1.0.0" },
+    { "name": "fixed-dependency", "version": "1.0.0", "require": { "fixed-sub-dependency": "1.*" } },
+    { "name": "fixed-sub-dependency", "version": "1.0.0" }
+]
+--RUN--
+update whitelisted
+--EXPECT--
+Updating dependency (1.0.0) to dependency (1.1.0)
+Updating whitelisted (1.0.0) to whitelisted (1.1.0)
diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist.test b/tests/Composer/Test/Fixtures/installer/update-whitelist.test
index 0edf18ea5..3d7ca30af 100644
--- a/tests/Composer/Test/Fixtures/installer/update-whitelist.test
+++ b/tests/Composer/Test/Fixtures/installer/update-whitelist.test
@@ -1,5 +1,5 @@
 --TEST--
-Update with a package whitelist only updates those packages and their dependencies if they are not present in composer.json
+Update with a package whitelist only updates those packages and their dependencies listed as command arguments
 --COMPOSER--
 {
     "repositories": [