Merge branch 'display-junit-classname-in-modal' into 'master'

Display classname JUnit attribute in report modal

See merge request gitlab-org/gitlab-ce!28376

6 files changed, 17 insertions, 0 deletions

diff --git a/app/assets/javascripts/reports/store/state.js b/app/assets/javascripts/reports/store/state.js
index 5484900276c..25f9f70d095 100644
--- a/app/assets/javascripts/reports/store/state.js
+++ b/app/assets/javascripts/reports/store/state.js
@@ -40,6 +40,11 @@ export default () => ({
         text: s__('Reports|Class'),
         type: fieldTypes.link,
       },
+      classname: {
+        value: null,
+        text: s__('Reports|Classname'),
+        type: fieldTypes.text,
+      },
       execution_time: {
         value: null,
         text: s__('Reports|Execution time'),
diff --git a/app/serializers/test_case_entity.rb b/app/serializers/test_case_entity.rb
index ec60055ba5b..5c915c1302c 100644
--- a/app/serializers/test_case_entity.rb
+++ b/app/serializers/test_case_entity.rb
@@ -3,6 +3,7 @@
 class TestCaseEntity < Grape::Entity
   expose :status
   expose :name
+  expose :classname
   expose :execution_time
   expose :system_output
   expose :stack_trace
diff --git a/changelogs/unreleased/display-junit-classname-in-modal.yml b/changelogs/unreleased/display-junit-classname-in-modal.yml
new file mode 100644
index 00000000000..c5140456e4e
--- /dev/null
+++ b/changelogs/unreleased/display-junit-classname-in-modal.yml
@@ -0,0 +1,5 @@
+---
+title: Display classname JUnit attribute in report modal
+merge_request: 28376
+author:
+type: added
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index b7aea0254a9..c20cae9665a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8068,6 +8068,9 @@ msgstr ""
 msgid "Reports|Class"
 msgstr ""
 
+msgid "Reports|Classname"
+msgstr ""
+
 msgid "Reports|Execution time"
 msgstr ""
 
diff --git a/spec/fixtures/api/schemas/entities/test_case.json b/spec/fixtures/api/schemas/entities/test_case.json
index c9ba1f3ad18..70f6edeeeb7 100644
--- a/spec/fixtures/api/schemas/entities/test_case.json
+++ b/spec/fixtures/api/schemas/entities/test_case.json
@@ -7,6 +7,7 @@
   "properties": {
     "status": { "type": "string" },
     "name": { "type": "string" },
+    "classname": { "type": "string" },
     "execution_time": { "type": "float" },
     "system_output": { "type": ["string", "null"] },
     "stack_trace":  { "type": ["string", "null"] }
diff --git a/spec/serializers/test_case_entity_spec.rb b/spec/serializers/test_case_entity_spec.rb
index a55910f98bb..986c9feb07b 100644
--- a/spec/serializers/test_case_entity_spec.rb
+++ b/spec/serializers/test_case_entity_spec.rb
@@ -14,6 +14,7 @@ describe TestCaseEntity do
       it 'contains correct test case details' do
         expect(subject[:status]).to eq('success')
         expect(subject[:name]).to eq('Test#sum when a is 1 and b is 3 returns summary')
+        expect(subject[:classname]).to eq('spec.test_spec')
         expect(subject[:execution_time]).to eq(1.11)
       end
     end
@@ -24,6 +25,7 @@ describe TestCaseEntity do
       it 'contains correct test case details' do
         expect(subject[:status]).to eq('failed')
         expect(subject[:name]).to eq('Test#sum when a is 2 and b is 2 returns summary')
+        expect(subject[:classname]).to eq('spec.test_spec')
         expect(subject[:execution_time]).to eq(2.22)
       end
     end