From 2412ddf03da787012161ea1e8a03787275f9cde9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sun, 1 Mar 2020 15:08:18 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- ...-better-spec-test-for-error-tracking-web-ui.yml | 5 +++++ .../features/error_tracking_shared_context.rb | 2 +- .../features/error_tracking_shared_example.rb | 22 +++++++++++++--------- 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml diff --git a/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml b/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml new file mode 100644 index 00000000000..6b6d479e815 --- /dev/null +++ b/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml @@ -0,0 +1,5 @@ +--- +title: Fix fixtures for Error Tracking Web UI +merge_request: 26233 +author: Takuya Noguchi +type: other 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 -- cgit v1.2.3