Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 10 deletions

diff --git a/spec/support/shared_contexts/features/error_tracking_shared_context.rb b/spec/support/shared_contexts/features/error_tracking_shared_context.rb
index 48356373c26..cbd33dd109b 100644
--- a/spec/support/shared_contexts/features/error_tracking_shared_context.rb
+++ b/spec/support/shared_contexts/features/error_tracking_shared_context.rb
@@ -13,7 +13,7 @@ shared_context 'sentry error tracking context feature' do
   let(:issue_id) { issue_response['id'] }
   let(:issue_seen) { 1.year.ago.utc }
   let(:formatted_issue_seen) { issue_seen.strftime("%Y-%m-%d %-l:%M:%S%p %Z") }
-  let(:date_received) { 1.month.ago.utc }
+  let(:date_received) { 32.days.ago.utc }
 
   before do
     request_headers = { 'Authorization' => 'Bearer access_token_123', 'Content-Type' => 'application/json' }
diff --git a/spec/support/shared_examples/features/error_tracking_shared_example.rb b/spec/support/shared_examples/features/error_tracking_shared_example.rb
index edc1f42f646..922d2627bce 100644
--- a/spec/support/shared_examples/features/error_tracking_shared_example.rb
+++ b/spec/support/shared_examples/features/error_tracking_shared_example.rb
@@ -50,17 +50,21 @@ end
 
 shared_examples 'error tracking show page' do
   it 'renders the error details' do
+    content = page.find(".content")
+    nav = page.find("nav.breadcrumbs")
+    header = page.find(".error-details-header")
+
     release_short_version = issue_response['firstRelease']['shortVersion']
 
-    expect(page).to have_content('1 month ago by raven.scripts.runner in main')
-    expect(page).to have_content(issue_response['metadata']['title'])
-    expect(page).to have_content('level: error')
-    expect(page).to have_content('Error Details')
-    expect(page).to have_content('GitLab Issue: https://gitlab.com/gitlab-org/gitlab/issues/1')
-    expect(page).to have_content("Sentry event: https://sentrytest.gitlab.com/sentry-org/sentry-project/issues/#{issue_id}")
-    expect(page).to have_content("First seen: 1 year ago (#{formatted_issue_seen}) Release: #{release_short_version}")
-    expect(page).to have_content('Events: 1')
-    expect(page).to have_content('Users: 0')
+    expect(header).to have_content('1 month ago by raven.scripts.runner in main')
+    expect(content).to have_content(issue_response['metadata']['title'])
+    expect(content).to have_content('level: error')
+    expect(nav).to have_content('Error Details')
+    expect(content).to have_content('GitLab Issue: https://gitlab.com/gitlab-org/gitlab/issues/1')
+    expect(content).to have_content("Sentry event: https://sentrytest.gitlab.com/sentry-org/sentry-project/issues/#{issue_id}")
+    expect(content).to have_content("First seen: 1 year ago (#{formatted_issue_seen}) Release: #{release_short_version}")
+    expect(content).to have_content('Events: 1')
+    expect(content).to have_content('Users: 0')
   end
 
   it 'renders the stack trace heading' do