From 2c156e3c7bbade01c36eee18327f1ced6eebea79 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 17 Mar 2020 18:09:44 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/fixtures/api/schemas/entities/user.json       |   3 +-
 spec/fixtures/cobertura/coverage.xml               |  43 ++++
 spec/fixtures/cobertura/coverage.xml.gz            | Bin 0 -> 576 bytes
 spec/fixtures/cobertura/coverage_gocov_xml.xml     | 216 +++++++++++++++++++++
 spec/fixtures/cobertura/coverage_gocov_xml.xml.gz  | Bin 0 -> 1103 bytes
 .../cobertura/coverage_with_corrupted_data.xml     |  50 +++++
 .../cobertura/coverage_with_corrupted_data.xml.gz  | Bin 0 -> 571 bytes
 7 files changed, 311 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/cobertura/coverage.xml
 create mode 100644 spec/fixtures/cobertura/coverage.xml.gz
 create mode 100644 spec/fixtures/cobertura/coverage_gocov_xml.xml
 create mode 100644 spec/fixtures/cobertura/coverage_gocov_xml.xml.gz
 create mode 100644 spec/fixtures/cobertura/coverage_with_corrupted_data.xml
 create mode 100644 spec/fixtures/cobertura/coverage_with_corrupted_data.xml.gz

(limited to 'spec/fixtures')

diff --git a/spec/fixtures/api/schemas/entities/user.json b/spec/fixtures/api/schemas/entities/user.json
index 82d80b75cef..1e0c8885609 100644
--- a/spec/fixtures/api/schemas/entities/user.json
+++ b/spec/fixtures/api/schemas/entities/user.json
@@ -17,7 +17,8 @@
     "path": { "type": "string" },
     "name": { "type": "string" },
     "username": { "type": "string" },
-    "status_tooltip_html": { "$ref": "../types/nullable_string.json" }
+    "status_tooltip_html": { "$ref": "../types/nullable_string.json" },
+    "is_gitlab_employee": { "type": "boolean" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/cobertura/coverage.xml b/spec/fixtures/cobertura/coverage.xml
new file mode 100644
index 00000000000..01e8085b8d8
--- /dev/null
+++ b/spec/fixtures/cobertura/coverage.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?> 
+<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
+<!-- cobertura example file - generated by simplecov-cobertura - subset of gitlab-org/gitlab - manually modified -->
+<!-- Generated by simplecov-cobertura version 1.3.1 (https://github.com/dashingrocket/simplecov-cobertura) -->
+<coverage line-rate="0.5" branch-rate="0" lines-covered="73865" lines-valid="147397" branches-covered="0" branches-valid="0" complexity="0" version="0" timestamp="1577128350">
+  <sources>
+    <source>/tmp/projects/gitlab-ce/gitlab</source>
+  </sources>
+  <packages>
+    <package name="Controllers" line-rate="0.43" branch-rate="0" complexity="0">
+      <classes>
+        <class name="abuse_reports_controller" filename="app/controllers/abuse_reports_controller.rb" line-rate="0.3" branch-rate="0" complexity="0">
+          <methods/>
+          <lines>
+            <line number="3" branch="false" hits="1"/>
+            <line number="4" branch="false" hits="1"/>
+            <line number="6" branch="false" hits="1"/>
+            <line number="7" branch="false" hits="0"/>
+            <line number="8" branch="false" hits="0"/>
+            <line number="9" branch="false" hits="0"/>
+            <line number="12" branch="false" hits="1"/>
+            <line number="13" branch="false" hits="0"/>
+            <line number="14" branch="false" hits="0"/>
+            <line number="16" branch="false" hits="0"/>
+            <line number="17" branch="false" hits="0"/>
+            <line number="19" branch="false" hits="0"/>
+            <line number="20" branch="false" hits="0"/>
+            <line number="22" branch="false" hits="0"/>
+            <line number="26" branch="false" hits="1"/>
+            <line number="28" branch="false" hits="1"/>
+            <line number="29" branch="false" hits="0"/>
+            <line number="36" branch="false" hits="1"/>
+            <line number="37" branch="false" hits="0"/>
+            <line number="39" branch="false" hits="0"/>
+            <line number="40" branch="false" hits="0"/>
+            <line number="41" branch="false" hits="0"/>
+            <line number="42" branch="false" hits="0"/>
+          </lines>
+        </class>
+      </classes>
+    </package>
+  </packages>
+</coverage>
\ No newline at end of file
diff --git a/spec/fixtures/cobertura/coverage.xml.gz b/spec/fixtures/cobertura/coverage.xml.gz
new file mode 100644
index 00000000000..1a5a5f02ced
Binary files /dev/null and b/spec/fixtures/cobertura/coverage.xml.gz differ
diff --git a/spec/fixtures/cobertura/coverage_gocov_xml.xml b/spec/fixtures/cobertura/coverage_gocov_xml.xml
new file mode 100644
index 00000000000..c4da14efb40
--- /dev/null
+++ b/spec/fixtures/cobertura/coverage_gocov_xml.xml
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
+<!-- cobertura example file - generated by gocov-xml - subset of gitlab-org/gitaly -->
+<coverage line-rate="0.7966102" branch-rate="0" lines-covered="47" lines-valid="59" branches-covered="0" branches-valid="0" complexity="0" version="" timestamp="1577127162320">
+	<packages>
+		<package name="gitlab.com/gitlab-org/gitaly/auth" line-rate="0.7966102" branch-rate="0" complexity="0" line-count="59" line-hits="47">
+			<classes>
+				<class name="-" filename="auth/rpccredentials.go" line-rate="0.2" branch-rate="0" complexity="0" line-count="5" line-hits="1">
+					<methods>
+						<method name="RPCCredentials" signature="" line-rate="1" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="17" hits="1"></line>
+							</lines>
+						</method>
+						<method name="RPCCredentialsV2" signature="" line-rate="0" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="34" hits="0"></line>
+							</lines>
+						</method>
+						<method name="hmacToken" signature="" line-rate="0" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="52" hits="0"></line>
+								<line number="53" hits="0"></line>
+								<line number="55" hits="0"></line>
+							</lines>
+						</method>
+					</methods>
+					<lines>
+						<line number="17" hits="1"></line>
+						<line number="34" hits="0"></line>
+						<line number="52" hits="0"></line>
+						<line number="53" hits="0"></line>
+						<line number="55" hits="0"></line>
+					</lines>
+				</class>
+				<class name="rpcCredentials" filename="auth/rpccredentials.go" line-rate="0.5" branch-rate="0" complexity="0" line-count="2" line-hits="1">
+					<methods>
+						<method name="RequireTransportSecurity" signature="" line-rate="0" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="24" hits="0"></line>
+							</lines>
+						</method>
+						<method name="GetRequestMetadata" signature="" line-rate="1" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="27" hits="1"></line>
+							</lines>
+						</method>
+					</methods>
+					<lines>
+						<line number="24" hits="0"></line>
+						<line number="27" hits="1"></line>
+					</lines>
+				</class>
+				<class name="rpcCredentialsV2" filename="auth/rpccredentials.go" line-rate="0" branch-rate="0" complexity="0" line-count="3" line-hits="0">
+					<methods>
+						<method name="RequireTransportSecurity" signature="" line-rate="0" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="41" hits="0"></line>
+							</lines>
+						</method>
+						<method name="GetRequestMetadata" signature="" line-rate="0" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="44" hits="0"></line>
+							</lines>
+						</method>
+						<method name="hmacToken" signature="" line-rate="0" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="48" hits="0"></line>
+							</lines>
+						</method>
+					</methods>
+					<lines>
+						<line number="41" hits="0"></line>
+						<line number="44" hits="0"></line>
+						<line number="48" hits="0"></line>
+					</lines>
+				</class>
+				<class name="-" filename="auth/token.go" line-rate="0.9183673" branch-rate="0" complexity="0" line-count="49" line-hits="45">
+					<methods>
+						<method name="init" signature="" line-rate="1" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="38" hits="1"></line>
+							</lines>
+						</method>
+						<method name="CheckToken" signature="" line-rate="0.9285714" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="52" hits="1"></line>
+								<line number="53" hits="0"></line>
+								<line number="56" hits="1"></line>
+								<line number="57" hits="1"></line>
+								<line number="58" hits="1"></line>
+								<line number="61" hits="1"></line>
+								<line number="63" hits="1"></line>
+								<line number="64" hits="1"></line>
+								<line number="65" hits="1"></line>
+								<line number="68" hits="1"></line>
+								<line number="69" hits="1"></line>
+								<line number="72" hits="1"></line>
+								<line number="73" hits="1"></line>
+								<line number="77" hits="1"></line>
+							</lines>
+						</method>
+						<method name="tokensEqual" signature="" line-rate="1" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="81" hits="1"></line>
+							</lines>
+						</method>
+						<method name="ExtractAuthInfo" signature="" line-rate="0.90909094" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="86" hits="1"></line>
+								<line number="88" hits="1"></line>
+								<line number="89" hits="1"></line>
+								<line number="92" hits="1"></line>
+								<line number="96" hits="1"></line>
+								<line number="97" hits="1"></line>
+								<line number="100" hits="1"></line>
+								<line number="101" hits="1"></line>
+								<line number="102" hits="1"></line>
+								<line number="103" hits="0"></line>
+								<line number="106" hits="1"></line>
+							</lines>
+						</method>
+						<method name="countV2Error" signature="" line-rate="1" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="109" hits="1"></line>
+							</lines>
+						</method>
+						<method name="v2HmacInfoValid" signature="" line-rate="0.8888889" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="112" hits="1"></line>
+								<line number="113" hits="1"></line>
+								<line number="114" hits="1"></line>
+								<line number="115" hits="1"></line>
+								<line number="118" hits="1"></line>
+								<line number="119" hits="1"></line>
+								<line number="120" hits="0"></line>
+								<line number="121" hits="0"></line>
+								<line number="124" hits="1"></line>
+								<line number="125" hits="1"></line>
+								<line number="126" hits="1"></line>
+								<line number="128" hits="1"></line>
+								<line number="129" hits="1"></line>
+								<line number="130" hits="1"></line>
+								<line number="133" hits="1"></line>
+								<line number="134" hits="1"></line>
+								<line number="135" hits="1"></line>
+								<line number="138" hits="1"></line>
+							</lines>
+						</method>
+						<method name="hmacSign" signature="" line-rate="1" branch-rate="0" complexity="0" line-count="0" line-hits="0">
+							<lines>
+								<line number="142" hits="1"></line>
+								<line number="143" hits="1"></line>
+								<line number="145" hits="1"></line>
+							</lines>
+						</method>
+					</methods>
+					<lines>
+						<line number="38" hits="1"></line>
+						<line number="52" hits="1"></line>
+						<line number="53" hits="0"></line>
+						<line number="56" hits="1"></line>
+						<line number="57" hits="1"></line>
+						<line number="58" hits="1"></line>
+						<line number="61" hits="1"></line>
+						<line number="63" hits="1"></line>
+						<line number="64" hits="1"></line>
+						<line number="65" hits="1"></line>
+						<line number="68" hits="1"></line>
+						<line number="69" hits="1"></line>
+						<line number="72" hits="1"></line>
+						<line number="73" hits="1"></line>
+						<line number="77" hits="1"></line>
+						<line number="81" hits="1"></line>
+						<line number="86" hits="1"></line>
+						<line number="88" hits="1"></line>
+						<line number="89" hits="1"></line>
+						<line number="92" hits="1"></line>
+						<line number="96" hits="1"></line>
+						<line number="97" hits="1"></line>
+						<line number="100" hits="1"></line>
+						<line number="101" hits="1"></line>
+						<line number="102" hits="1"></line>
+						<line number="103" hits="0"></line>
+						<line number="106" hits="1"></line>
+						<line number="109" hits="1"></line>
+						<line number="112" hits="1"></line>
+						<line number="113" hits="1"></line>
+						<line number="114" hits="1"></line>
+						<line number="115" hits="1"></line>
+						<line number="118" hits="1"></line>
+						<line number="119" hits="1"></line>
+						<line number="120" hits="0"></line>
+						<line number="121" hits="0"></line>
+						<line number="124" hits="1"></line>
+						<line number="125" hits="1"></line>
+						<line number="126" hits="1"></line>
+						<line number="128" hits="1"></line>
+						<line number="129" hits="1"></line>
+						<line number="130" hits="1"></line>
+						<line number="133" hits="1"></line>
+						<line number="134" hits="1"></line>
+						<line number="135" hits="1"></line>
+						<line number="138" hits="1"></line>
+						<line number="142" hits="1"></line>
+						<line number="143" hits="1"></line>
+						<line number="145" hits="1"></line>
+					</lines>
+				</class>
+			</classes>
+		</package>
+	</packages>
+	<sources>
+		<source>/tmp/projects/gitlab-ce/gitaly/src/gitlab.com/gitlab-org/gitaly</source>
+	</sources>
+</coverage>
diff --git a/spec/fixtures/cobertura/coverage_gocov_xml.xml.gz b/spec/fixtures/cobertura/coverage_gocov_xml.xml.gz
new file mode 100644
index 00000000000..e51dc50c2ed
Binary files /dev/null and b/spec/fixtures/cobertura/coverage_gocov_xml.xml.gz differ
diff --git a/spec/fixtures/cobertura/coverage_with_corrupted_data.xml b/spec/fixtures/cobertura/coverage_with_corrupted_data.xml
new file mode 100644
index 00000000000..ab0973eba28
--- /dev/null
+++ b/spec/fixtures/cobertura/coverage_with_corrupted_data.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" ?>
+<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
+<!-- cobertura example file - generated by NYC - manually modified -->
+<coverage lines-valid="22" lines-covered="16" line-rate="0.7273000000000001" branches-valid="4" branches-covered="2" branch-rate="0.5" timestamp="1576756029756" complexity="0" version="0.1">
+  <sources>
+    <source>/tmp/projects/coverage-test</source>
+  </sources>
+  <packages>
+    <package name="coverage-test" line-rate="0.6842" branch-rate="0.5">
+      <classes>
+        <class name="index.js" filename="index.js" line-rate="0.6842" branch-rate="0.5">
+          <methods>
+            <method name="(anonymous_3)" hits="0" signature="()V">
+              <lines>
+                <line number="21" hits="0"/>
+              </lines>
+            </method>
+          </methods>
+          <lines>
+            <line number="21" hits="1" branch="false"/>
+            <line number="22" hits="0" branch="false"/>
+            <line number="25" hits="1" branch="true" condition-coverage="50% (1/2)"/>
+            <line number="26" hits="0" branch="false"/>
+            <line number="27" hits="0" branch="false"/>
+            <line number="28" hits="0" branch="false"/>
+            <line number="29" hits="0" branch="false"/>
+          </lines>
+        </class>
+      </classes>
+    </package>
+    <package name="coverage-test.lib.math" line-rate="1" branch-rate="1">
+      <classes>
+        <class name="add.js" filename="lib/math/add.js" line-rate="1" branch-rate="1">
+          <methods>
+            <method name="(anonymous_0)" hits="1" signature="()V">
+              <lines>
+                <line number="1" hits="1"/>
+              </lines>
+            </method>
+          </methods>
+          <lines>
+            <line null="test" hits="1" branch="false"/>
+            <line number="2" hits="1" branch="false"/>
+            <line number="3" hits="1" branch="false"/>
+          </lines>
+        </class>
+      </classes>
+    </package>
+  </packages>
+</coverage>
diff --git a/spec/fixtures/cobertura/coverage_with_corrupted_data.xml.gz b/spec/fixtures/cobertura/coverage_with_corrupted_data.xml.gz
new file mode 100644
index 00000000000..4d06c42ba0b
Binary files /dev/null and b/spec/fixtures/cobertura/coverage_with_corrupted_data.xml.gz differ
-- 
cgit v1.2.3