More feature tests

pinkeen · pinkeen · commit 0acea47aa21b · 2018-12-30T17:14:12.000+01:00
diff --git a/tests/Functional/BasicPatchingTest.php b/tests/Functional/BasicPatchingTest.php
@@ -4,37 +4,45 @@
 
 class BasicPatchingTest extends SandboxTestCase
 {
+    const PACKAGEA_PATCH1_APPLICATIONS = [
+        '/vendor/test/package-a/src/test.php' => 'patched-in-echo'
+    ];
+
+    const PACKAGEA_PATCH2_APPLICATIONS = [
+        '/vendor/test/package-a/src/test.php' => [
+            'layered-patch-line-1',
+            'layered-patch-line-2',
+            'layered-patch-line-3'
+        ]
+    ];
+
     public function testSimplePatchingDuringFirstInstallWorks()
     {
         $project = $this->getSandbox()->createProjectSandBox('test/project-template', 'dev-master', [
             'require' => [
                 'test/patchset'=> '~1.0',
-                'test/simple-package'=> 'dev-master',
+                'test/package-a'=> 'dev-master',
                 'creativestyle/composer-plugin-patchset'=> 'dev-master'
             ]
         ]);
 
         $run = $project->runComposerCommand('install');
 
-        $this->assertThatComposerRunHasAppliedPatches($run, [
-            '/vendor/test/simple-package/src/test.php' => 'patched-in-echo'
-        ]);
+        $this->assertThatComposerRunHasAppliedPatches($run, self::PACKAGEA_PATCH1_APPLICATIONS);
     }
 
     public function testPatchingPluginIsInstalledAndExecutedWhenPulledAsPatchsetDependency()
     {
         $project = $this->getSandbox()->createProjectSandBox('test/project-template', 'dev-master', [
             'require' => [
                 'test/patchset'=> '~1.0',
-                'test/simple-package'=> 'dev-master',
+                'test/package-a'=> 'dev-master',
             ]
         ]);
 
         $run = $project->runComposerCommand('install');
 
-        $this->assertThatComposerRunHasAppliedPatches($run, [
-            '/vendor/test/simple-package/src/test.php' => 'patched-in-echo'
-        ]);
+        $this->assertThatComposerRunHasAppliedPatches($run, self::PACKAGEA_PATCH1_APPLICATIONS);
     }
 
     public function testPatchesAreAppliedWhenPackageIsAddedToExistingProject()
@@ -50,10 +58,54 @@ public function testPatchesAreAppliedWhenPackageIsAddedToExistingProject()
         $this->assertThatComposerRunWasSuccessful($installRun);
 
         // At this point nothing to patch so no patches shall be applied
-        $requireRun = $project->runComposerCommand('require', 'test/simple-package', 'dev-master');
+        $requireRun = $project->runComposerCommand('require', 'test/package-a', 'dev-master');
 
-        $this->assertThatComposerRunHasAppliedPatches($requireRun, [
-            '/vendor/test/simple-package/src/test.php' => 'patched-in-echo'
+        $this->assertThatComposerRunHasAppliedPatches($requireRun, self::PACKAGEA_PATCH1_APPLICATIONS);
+    }
+
+    public function testThatPatchesAreNotReappliedOnUpdate()
+    {
+        $project = $this->getSandbox()->createProjectSandBox('test/project-template', 'dev-master', [
+            'require' => [
+                'test/patchset'=> '~1.0',
+                'test/package-a'=> 'dev-master',
+                'creativestyle/composer-plugin-patchset'=> 'dev-master'
+            ]
         ]);
+
+        $installRun = $project->runComposerCommand('install');
+
+        $this->assertThatComposerRunHasAppliedPatches($installRun, self::PACKAGEA_PATCH1_APPLICATIONS);
+
+        $updateRun = $project->runComposerCommand('update');
+
+        $this->assertContains('No patches to apply or clean', $updateRun->getFullOutput(), 'no patches were removed', true);
+        $this->assertNotContains('Applied patch', $updateRun->getFullOutput(), 'no patches were applied', true);
     }
+
+    public function testThatLayeredPatchesAreAppliedInCorrectOrder()
+    {
+        $project = $this->getSandbox()->createProjectSandBox('test/project-template', 'dev-master', [
+            'require' => [
+                'test/patchset-extra'=> '~1.0',
+                'test/package-a'=> 'dev-master',
+                'creativestyle/composer-plugin-patchset'=> 'dev-master'
+            ]
+        ]);
+
+        $installRun = $project->runComposerCommand('install');
+
+        $this->assertThatComposerRunHasAppliedPatches($installRun,
+            array_merge_recursive(
+                self::PACKAGEA_PATCH1_APPLICATIONS,
+                self::PACKAGEA_PATCH2_APPLICATIONS
+            )
+        );
+
+        $updateRun = $project->runComposerCommand('update');
+
+        $this->assertContains('No patches to apply or clean', $updateRun->getFullOutput(), 'no patches were removed', true);
+        $this->assertNotContains('Applied patch', $updateRun->getFullOutput(), 'no patches were applied', true);
+    }
+
 }
diff --git a/tests/Functional/Fixtures/packages/package-a/composer.json b/tests/Functional/Fixtures/packages/package-a/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "test/simple-package",
+    "name": "test/package-a",
     "type": "library",
     "version": "dev-master",
     "require": {}
diff --git a/tests/Functional/Fixtures/packages/package-a/src/test.php b/tests/Functional/Fixtures/packages/package-a/src/test.php
@@ -1,5 +1,5 @@
 <?php
 
 echo 'first-echo';
-echo 'last-echo;
+echo 'last-echo';
 
diff --git a/tests/Functional/Fixtures/packages/package-b/composer.json b/tests/Functional/Fixtures/packages/package-b/composer.json
@@ -0,0 +1,6 @@
+{
+    "name": "test/package-b",
+    "type": "library",
+    "version": "dev-master",
+    "require": {}
+}
diff --git a/tests/Functional/Fixtures/packages/package-b/src/test.php b/tests/Functional/Fixtures/packages/package-b/src/test.php
@@ -0,0 +1,5 @@
+<?php
+
+echo 'first-echo';
+echo 'last-echo';
+
diff --git a/tests/Functional/Fixtures/packages/patchset-extra/composer.json b/tests/Functional/Fixtures/packages/patchset-extra/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "test/patchset-extra",
+    "type": "patchset",
+    "version": "1.0",
+    "require": {
+        "creativestyle/composer-plugin-patchset": "dev-master"
+    },
+    "extra": {
+        "patchset": {
+            "test/package-a": [
+                {
+                    "description": "Patch in echo in the middle",
+                    "filename": "patches/package-a-patch-1.diff"
+                },
+                {
+                    "description": "Patch in echo at the end",
+                    "filename": "patches/package-a-patch-2.diff"
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/Functional/Fixtures/packages/patchset-extra/patches/package-a-patch-1.diff b/tests/Functional/Fixtures/packages/patchset-extra/patches/package-a-patch-1.diff
@@ -1,11 +1,9 @@
-diff --git a/src/test.php b/src/test.php
-index 3ef7f20..537fe08 100644
 --- a/src/test.php
 +++ b/src/test.php
 @@ -1,5 +1,6 @@
  <?php
  
  echo 'first-echo';
 +echo 'patched-in-echo';
- echo 'last-echo;
+ echo 'last-echo';
  
diff --git a/tests/Functional/Fixtures/packages/patchset-extra/patches/package-a-patch-2.diff b/tests/Functional/Fixtures/packages/patchset-extra/patches/package-a-patch-2.diff
@@ -0,0 +1,14 @@
+diff --git a/src/test.php b/src/test.php
+index 6cb2e72..255f36b 100644
+--- a/src/test.php
++++ b/src/test.php
+@@ -1,6 +1,9 @@
+ <?php
+ 
++echo 'layered-patch-line-1';
+ echo 'first-echo';
+ echo 'patched-in-echo';
++echo 'layered-patch-line-2';
+ echo 'last-echo';
++echo 'layered-patch-line-3';
+ 
diff --git a/tests/Functional/Fixtures/packages/patchset/v1.0/composer.json b/tests/Functional/Fixtures/packages/patchset/v1.0/composer.json
@@ -3,15 +3,14 @@
     "type": "patchset",
     "version": "1.0",
     "require": {
-        "creativestyle/composer-plugin-patchset": "*"
+        "creativestyle/composer-plugin-patchset": "dev-master"
     },
     "extra": {
         "patchset": {
-            "test/simple-package": [
+            "test/package-a": [
                 {
                     "description": "Patch in echo in the middle",
-                    "filename": "patches/simple-package-patch.diff",
-                    "version_constraint": "*"
+                    "filename": "patches/package-a-patch-1.diff"
                 }
             ]
         }
diff --git a/tests/Functional/Fixtures/packages/patchset/v1.0/patches/package-a-patch-1.diff b/tests/Functional/Fixtures/packages/patchset/v1.0/patches/package-a-patch-1.diff
@@ -0,0 +1,9 @@
+--- a/src/test.php
++++ b/src/test.php
+@@ -1,5 +1,6 @@
+ <?php
+ 
+ echo 'first-echo';
++echo 'patched-in-echo';
+ echo 'last-echo';
+ 
diff --git a/tests/Functional/SandboxTestCase.php b/tests/Functional/SandboxTestCase.php
@@ -57,16 +57,44 @@ protected function assertThatComposerRunWasSuccessful(ComposerRun $composerRun)
      *
      * @param ComposerRun $composerRun
      * @param array $expectedApplications
+     * @param array $forbiddenApplications
      */
     protected function assertThatComposerRunHasAppliedPatches(
         ComposerRun $composerRun,
-        array $expectedApplications
+        array $expectedApplications,
+        array $forbiddenApplications = []
     ) {
         $this->assertThatComposerRunWasSuccessful($composerRun);
 
-        foreach ($expectedApplications as $filePath => $expectedText) {
+        foreach ($expectedApplications as $filePath => $expectedTexts) {
             $this->assertTrue($composerRun->getProject()->hasFile($filePath), sprintf('file %s to be patched exists', $filePath));
-            $this->assertContains($expectedText, $composerRun->getProject()->getFileContents($filePath), sprintf('file `%s` has been patched - contains patched in string `%s`', $filePath, $expectedText));
+
+            if (!is_array($expectedTexts)) {
+                $expectedTexts = [$expectedTexts];
+            }
+
+            $fileContents = $composerRun->getProject()->getFileContents($filePath);
+
+            foreach ($expectedTexts as $expectedText) {
+                $this->assertContains($expectedText, $fileContents, sprintf('file `%s` has been patched - contains patched in string `%s`', $filePath, $expectedText));
+            }
+        }
+
+        foreach ($forbiddenApplications as $filePath => $forbiddenTexts) {
+            if (!$composerRun->getProject()->hasFile($filePath)) {
+                /* It's expected that the file might not exists if patch creates it */
+                continue;
+            }
+
+            if (!is_array($forbiddenTexts)) {
+                $forbiddenTexts = [$forbiddenTexts];
+            }
+
+            $fileContents = $composerRun->getProject()->getFileContents($filePath);
+
+            foreach ($forbiddenTexts as $forbiddenText) {
+                $this->assertNotContains($forbiddenText, $fileContents, sprintf('file `%s` has not been patched - does not contain patched in string `%s`', $filePath, $forbiddenText));
+            }
         }
     }
 
@@ -75,7 +103,7 @@ protected function assertThatComposerRunHasAppliedPatches(
      */
     public static function tearDownAfterClass()
     {
-//        static::$sandbox->cleanup();
+        static::$sandbox->cleanup();
         static::$sandbox = null;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "test/simple-package",`
	`2`	`+ "name": "test/package-a",`
`3`	`3`	`"type": "library",`
`4`	`4`	`"version": "dev-master",`
`5`	`5`	`"require": {}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<?php
++
 +echo 'first-echo';
 +echo 'last-echo';
++
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,14 @@`
`3`	`3`	`"type": "patchset",`
`4`	`4`	`"version": "1.0",`
`5`	`5`	`"require": {`
`6`		`- "creativestyle/composer-plugin-patchset": "*"`
	`6`	`+ "creativestyle/composer-plugin-patchset": "dev-master"`
`7`	`7`	`},`
`8`	`8`	`"extra": {`
`9`	`9`	`"patchset": {`
`10`		`- "test/simple-package": [`
	`10`	`+ "test/package-a": [`
`11`	`11`	`{`
`12`	`12`	`"description": "Patch in echo in the middle",`
`13`		`- "filename": "patches/simple-package-patch.diff",`
`14`		`- "version_constraint": "*"`
	`13`	`+ "filename": "patches/package-a-patch-1.diff"`
`15`	`14`	`}`
`16`	`15`	`]`
`17`	`16`	`}`