Merge "Update git plugin test cases"

jenkins_jobs/modules/publishers.py

@@ -4255,9 +4255,14 @@ def git(registry, xml_parent, data):
                  (default false)
 
 
-    Example:
+    Minimal Example:
 
-    .. literalinclude:: /../../tests/publishers/fixtures/git001.yaml
+    .. literalinclude:: /../../tests/publishers/fixtures/git-minimal.yaml
+       :language: yaml
+
+    Full Example:
+
+    .. literalinclude:: /../../tests/publishers/fixtures/git-full.yaml
        :language: yaml
     """
     mappings = [('push-merge', 'pushMerge', False),

tests/publishers/fixtures/git-full.xml

@@ -5,7 +5,7 @@
       <configVersion>2</configVersion>
       <pushMerge>true</pushMerge>
       <pushOnlyIfSuccess>false</pushOnlyIfSuccess>
-      <forcePush>false</forcePush>
+      <forcePush>true</forcePush>
       <tagsToPush>
         <hudson.plugins.git.GitPublisher_-TagToPush>
           <targetRepoName>tagremotename</targetRepoName>

tests/publishers/fixtures/git-full.yaml

@@ -2,6 +2,7 @@ publishers:
   - git:
       push-merge: true
       push-only-if-success: false
+      force-push: true
       tags:
           - tag:
               remote: tagremotename

tests/publishers/fixtures/git-minimal.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <publishers>
+    <hudson.plugins.git.GitPublisher>
+      <configVersion>2</configVersion>
+      <pushMerge>false</pushMerge>
+      <pushOnlyIfSuccess>true</pushOnlyIfSuccess>
+      <forcePush>false</forcePush>
+    </hudson.plugins.git.GitPublisher>
+  </publishers>
+</project>

tests/publishers/fixtures/git-minimal.yaml

@@ -0,0 +1,2 @@
+publishers:
+  - git