Automatic merge of gitlab-org/gitlab-ce master

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'),

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

changelogs/unreleased/display-junit-classname-in-modal.yml

+---
+title: Display classname JUnit attribute in report modal
+merge_request: 28376
+author:
+type: added

qa/spec/spec_helper.rb

@@ -35,8 +35,10 @@ RSpec.configure do |config|
   # show exception that triggers a retry if verbose_retry is set to true
   config.display_try_failure_messages = true
 
-  config.around do |example|
-    retry_times = example.metadata.keys.include?(:quarantine) ? 1 : 2
-    example.run_with_retry retry: retry_times
+  if ENV['CI']
+    config.around do |example|
+      retry_times = example.metadata.keys.include?(:quarantine) ? 1 : 2
+      example.run_with_retry retry: retry_times
+    end
   end
 end

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"] }

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