Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-03-01 15:08:18 +00:00
parent 9c1fa86a6a
commit 2412ddf03d
3 changed files with 19 additions and 10 deletions

View file

@ -0,0 +1,5 @@
---
title: Fix fixtures for Error Tracking Web UI
merge_request: 26233
author: Takuya Noguchi
type: other

View file

@ -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' }

View file

@ -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