Merge branch 'main' into eiriksm-patch-1

violinist-dev · Mar 22, 2024 · 16ef8bc · 16ef8bc
2 parents 20138b4 + b94a7ff
commit 16ef8bc
Show file tree

Hide file tree

Showing 14 changed files with 251 additions and 0 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -38,6 +38,8 @@ public function getDefaultConfig()
             'allow_update_indirect_with_direct' => 0,
             'automerge' => 0,
             'automerge_security' => 0,
+            'automerge_method' => 'merge',
+            'automerge_method_security' => 'merge',
             'labels' => [],
             'labels_security' => [],
         ];
@@ -114,6 +116,33 @@ public function shouldAutoMerge($is_security_update = false)
         return (bool) $this->config->automerge;
     }
 
+    public function getAutomergeMethod($is_security_update = false) : string
+    {
+        if (!$is_security_update) {
+            return $this->getAutoMergeMethodWithFallback('automerge_method');
+        }
+        // Otherwise, let's see if it's even set in config. Otherwise this
+        // should be set to the value (or fallback value) of the general
+        // automerge method.
+        if ($this->hasConfigForKey('automerge_method_security')) {
+            return $this->getAutoMergeMethodWithFallback('automerge_method_security');
+        }
+        return $this->getAutoMergeMethodWithFallback('automerge_method');
+    }
+
+    protected function getAutoMergeMethodWithFallback($automerge_property) : string
+    {
+        if (!in_array($this->config->{$automerge_property}, [
+            'merge',
+            'rebase',
+            'squash',
+        ])
+        ) {
+            return 'merge';
+        }
+        return $this->config->{$automerge_property};
+    }
+
     public function shouldAutoMergeSecurity()
     {
         return (bool) $this->config->automerge_security;

diff --git a/tests/UnitTest.php b/tests/UnitTest.php
@@ -286,6 +286,28 @@ public function testAutoMergeSecurity($filename, $expected_result)
         self::assertEquals($expected_result, $data->shouldAutoMerge(true));
     }
 
+    /**
+     * Test the automerge_method option.
+     *
+     * @dataProvider getAutoMergeMethod
+     */
+    public function testAutoMergeMethod($filename, $expected_result)
+    {
+        $data = $this->createDataFromFixture($filename);
+        self::assertEquals($expected_result, $data->getAutomergeMethod());
+    }
+
+    /**
+     * Test the automerge_method option.
+     *
+     * @dataProvider getAutoMergeMethodSecurity
+     */
+    public function testAutoMergeMethodSecurity($filename, $expected_result)
+    {
+        $data = $this->createDataFromFixture($filename);
+        self::assertEquals($expected_result, $data->getAutomergeMethod(true));
+    }
+
     /**
      * Test the security updates config option.
      *
@@ -423,6 +445,122 @@ public function getAutoMergeSecurity()
         ];
     }
 
+    public function getAutoMergeMethod()
+    {
+        return [
+            [
+                'empty.json',
+                'merge',
+            ],
+            [
+                'automerge_method.json',
+                'merge',
+            ],
+            [
+                'automerge_method2.json',
+                'merge',
+            ],
+            [
+                'automerge_method3.json',
+                'merge',
+            ],
+            [
+                'automerge_method4.json',
+                'squash',
+            ],
+            [
+                'automerge_method5.json',
+                'rebase',
+            ],
+            [
+                'automerge_method6.json',
+                'merge',
+            ],
+            [
+                'automerge_method_security.json',
+                'merge',
+            ],
+            [
+                'automerge_method_security2.json',
+                'merge',
+            ],
+            [
+                'automerge_method_security3.json',
+                'merge',
+            ],
+            [
+                'automerge_method_security4.json',
+                'merge',
+            ],
+            [
+                'automerge_method_security5.json',
+                'merge',
+            ],
+            [
+                'automerge_method_security6.json',
+                'merge',
+            ]
+        ];
+    }
+
+    public function getAutoMergeMethodSecurity()
+    {
+        return [
+            [
+                'empty.json',
+                'merge',
+            ],
+            [
+                'automerge_method.json',
+                'merge',
+            ],
+            [
+                'automerge_method2.json',
+                'merge',
+            ],
+            [
+                'automerge_method3.json',
+                'merge',
+            ],
+            [
+                'automerge_method4.json',
+                'squash',
+            ],
+            [
+                'automerge_method5.json',
+                'rebase',
+            ],
+            [
+                'automerge_method6.json',
+                'merge',
+            ],
+            [
+                'automerge_method_security.json',
+                'merge',
+            ],
+            [
+                'automerge_method_security2.json',
+                'merge',
+            ],
+            [
+                'automerge_method_security3.json',
+                'merge',
+            ],
+            [
+                'automerge_method_security4.json',
+                'squash',
+            ],
+            [
+                'automerge_method_security5.json',
+                'rebase',
+            ],
+            [
+                'automerge_method_security6.json',
+                'merge',
+            ]
+        ];
+    }
+
     public function getAlwaysUpdateAll()
     {
         return [

diff --git a/tests/fixtures/automerge_method.json b/tests/fixtures/automerge_method.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method": 1
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method2.json b/tests/fixtures/automerge_method2.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method": "something-else"
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method3.json b/tests/fixtures/automerge_method3.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method": ["not allow to be an array for sure"]
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method4.json b/tests/fixtures/automerge_method4.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method": "squash"
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method5.json b/tests/fixtures/automerge_method5.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method": "rebase"
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method6.json b/tests/fixtures/automerge_method6.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method": "merge"
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method_security.json b/tests/fixtures/automerge_method_security.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method_security": 1
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method_security2.json b/tests/fixtures/automerge_method_security2.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method_security": "something-else"
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method_security3.json b/tests/fixtures/automerge_method_security3.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method_security": ["not allow to be an array for sure"]
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method_security4.json b/tests/fixtures/automerge_method_security4.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method_security": "squash"
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method_security5.json b/tests/fixtures/automerge_method_security5.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method_security": "rebase"
+    }
+  }
+}
diff --git a/tests/fixtures/automerge_method_security6.json b/tests/fixtures/automerge_method_security6.json
@@ -0,0 +1,7 @@
+{
+  "extra": {
+    "violinist": {
+      "automerge_method_security": "merge"
+    }
+  }
+}