From a66fc5b2d9d83fff0535ed7f35fb187ac4870b30 Mon Sep 17 00:00:00 2001 From: Fabio Pitino Date: Fri, 17 May 2019 08:33:47 +0100 Subject: Revert code as changes were made to eslint gem Moved changes to https://github.com/eslint/eslint/pull/11683 --- lib/gitlab/ci/reports/test_case.rb | 2 +- spec/lib/gitlab/ci/parsers/test/junit_spec.rb | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/lib/gitlab/ci/reports/test_case.rb b/lib/gitlab/ci/reports/test_case.rb index 3e061a9b672..292e273a03a 100644 --- a/lib/gitlab/ci/reports/test_case.rb +++ b/lib/gitlab/ci/reports/test_case.rb @@ -14,7 +14,7 @@ module Gitlab def initialize(name:, classname:, execution_time:, status:, file: nil, system_output: nil, stack_trace: nil) @name = name - @classname = classname.present? ? classname : file + @classname = classname @file = file @execution_time = execution_time.to_f @status = status diff --git a/spec/lib/gitlab/ci/parsers/test/junit_spec.rb b/spec/lib/gitlab/ci/parsers/test/junit_spec.rb index e1ab3b2e367..a49402c7398 100644 --- a/spec/lib/gitlab/ci/parsers/test/junit_spec.rb +++ b/spec/lib/gitlab/ci/parsers/test/junit_spec.rb @@ -116,30 +116,6 @@ describe Gitlab::Ci::Parsers::Test::Junit do end end - context 'when there are two test cases without classname' do - let(:junit) do - <<-EOF.strip_heredoc - - - - - EOF - end - - it 'parses XML and adds test cases to a suite defaulting classname to file attribute' do - expect { subject }.not_to raise_error - - expect(test_cases[0].classname).to eq('./path/to/file1') - expect(test_cases[0].file).to eq('./path/to/file1') - expect(test_cases[0].name).to eq('sumTest1') - expect(test_cases[0].execution_time).to eq(0.01) - expect(test_cases[1].classname).to eq('./path/to/file2') - expect(test_cases[1].file).to eq('./path/to/file2') - expect(test_cases[1].name).to eq('sumTest2') - expect(test_cases[1].execution_time).to eq(0.02) - end - end - context 'when there are two test suites' do let(:junit) do <<-EOF.strip_heredoc -- cgit v1.2.1