From 209b51c4f0c8dccec3e1c5701f3c14a1c3765ebc Mon Sep 17 00:00:00 2001
From: Dong Ma <winterma.dong@gmail.com>
Date: Fri, 23 Jun 2017 22:06:07 +0800
Subject: [PATCH] Update git plugin test cases

Change-Id: I235e3c88a31ba618c8c4ecd075251954528a9f3a
---
 jenkins_jobs/modules/publishers.py                    |  9 +++++++--
 .../publishers/fixtures/{git001.xml => git-full.xml}  |  2 +-
 .../fixtures/{git001.yaml => git-full.yaml}           |  1 +
 tests/publishers/fixtures/git-minimal.xml             | 11 +++++++++++
 tests/publishers/fixtures/git-minimal.yaml            |  2 ++
 5 files changed, 22 insertions(+), 3 deletions(-)
 rename tests/publishers/fixtures/{git001.xml => git-full.xml} (97%)
 rename tests/publishers/fixtures/{git001.yaml => git-full.yaml} (96%)
 create mode 100644 tests/publishers/fixtures/git-minimal.xml
 create mode 100644 tests/publishers/fixtures/git-minimal.yaml

diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py
index b8a085d09..3d90cc09c 100644
--- a/jenkins_jobs/modules/publishers.py
+++ b/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),
diff --git a/tests/publishers/fixtures/git001.xml b/tests/publishers/fixtures/git-full.xml
similarity index 97%
rename from tests/publishers/fixtures/git001.xml
rename to tests/publishers/fixtures/git-full.xml
index a7b692f59..3a78ee6d5 100644
--- a/tests/publishers/fixtures/git001.xml
+++ b/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>
diff --git a/tests/publishers/fixtures/git001.yaml b/tests/publishers/fixtures/git-full.yaml
similarity index 96%
rename from tests/publishers/fixtures/git001.yaml
rename to tests/publishers/fixtures/git-full.yaml
index 6cf6820fe..90258e8d4 100644
--- a/tests/publishers/fixtures/git001.yaml
+++ b/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
diff --git a/tests/publishers/fixtures/git-minimal.xml b/tests/publishers/fixtures/git-minimal.xml
new file mode 100644
index 000000000..90f0cf683
--- /dev/null
+++ b/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>
diff --git a/tests/publishers/fixtures/git-minimal.yaml b/tests/publishers/fixtures/git-minimal.yaml
new file mode 100644
index 000000000..0d5128992
--- /dev/null
+++ b/tests/publishers/fixtures/git-minimal.yaml
@@ -0,0 +1,2 @@
+publishers:
+  - git