Ensure duplicate sections collapse

3 files changed, 33 insertions, 3 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index b12c41cadd3..1a5f8ecaa77 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -228,11 +228,11 @@ FactoryBot.define do
       end
     end
 
-    trait :trace_with_sections do
+    trait :trace_with_duplicate_sections do
       after(:create) do |build, evaluator|
         trace = File.binread(
           File.expand_path(
-            Rails.root.join('spec/fixtures/trace/trace_with_sections')))
+            Rails.root.join('spec/fixtures/trace/trace_with_duplicate_sections')))
 
         build.trace.set(trace)
       end
diff --git a/spec/features/projects/jobs/user_browses_job_spec.rb b/spec/features/projects/jobs/user_browses_job_spec.rb
index 63b698fb855..90a46c66a1c 100644
--- a/spec/features/projects/jobs/user_browses_job_spec.rb
+++ b/spec/features/projects/jobs/user_browses_job_spec.rb
@@ -35,7 +35,7 @@ describe 'User browses a job', :js do
   end
 
   context 'when job trace contains sections' do
-    let!(:build) { create(:ci_build, :success, :trace_with_sections, :coverage, pipeline: pipeline) }
+    let!(:build) { create(:ci_build, :success, :trace_with_duplicate_sections, :coverage, pipeline: pipeline) }
 
     it 'collapses a section' do
       wait_for_requests
diff --git a/spec/fixtures/trace/trace_with_duplicate_sections b/spec/fixtures/trace/trace_with_duplicate_sections
new file mode 100644
index 00000000000..7a894e80e38
--- /dev/null
+++ b/spec/fixtures/trace/trace_with_duplicate_sections
@@ -0,0 +1,30 @@
+Running with gitlab-runner dev (HEAD)
+  on kitsune minikube (a21b584f)
+WARNING: Namespace is empty, therefore assuming 'default'.
+Using Kubernetes namespace: default
+Using Kubernetes executor with image alpine:3.4 ...
+section_start:1506004954:prepare_script
Waiting for pod default/runner-a21b584f-project-1208199-concurrent-0sg03f to be running, status is Pending
+Running on runner-a21b584f-project-1208199-concurrent-0sg03f via kitsune.local...
+section_end:1506004957:prepare_script
section_start:1506004957:get_sources
Cloning repository...
+Cloning into '/nolith/ci-tests'...
+Checking out dddd7a6e as master...
+Skipping Git submodules setup
+section_end:1506004958:get_sources
section_start:1506004958:restore_cache
section_end:1506004958:restore_cache
section_start:1506004958:download_artifacts
section_end:1506004958:download_artifacts
section_start:1506004958:build_script
$ whoami
+root
+section_end:1506004959:build_script
section_start:1506004959:after_script
section_end:1506004959:after_script
section_start:1506004959:archive_cache
section_end:1506004959:archive_cache
section_start:1506004959:upload_artifacts
section_end:1506004959:upload_artifacts
Job succeeded
+
+Running with gitlab-runner dev (HEAD)
+  on kitsune minikube (a21b584f)
+WARNING: Namespace is empty, therefore assuming 'default'.
+Using Kubernetes namespace: default
+Using Kubernetes executor with image alpine:3.4 ...
+section_start:1506004954:prepare_script
Waiting for pod default/runner-a21b584f-project-1208199-concurrent-0sg03f to be running, status is Pending
+Running on runner-a21b584f-project-1208199-concurrent-0sg03f via kitsune.local...
+section_end:1506004957:prepare_script
section_start:1506004957:get_sources
Cloning repository...
+Cloning into '/nolith/ci-tests'...
+Checking out dddd7a6e as master...
+Skipping Git submodules setup
+section_end:1506004958:get_sources
section_start:1506004958:restore_cache
section_end:1506004958:restore_cache
section_start:1506004958:download_artifacts
section_end:1506004958:download_artifacts
section_start:1506004958:build_script
$ whoami
+root
+section_end:1506004959:build_script
section_start:1506004959:after_script
section_end:1506004959:after_script
section_start:1506004959:archive_cache
section_end:1506004959:archive_cache
section_start:1506004959:upload_artifacts
section_end:1506004959:upload_artifacts
Job succeeded
+