diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 21:09:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 21:09:38 +0300 |
| commit | 028bb5dda7abc9ec76f21ae8e691825b4673f733 (patch) | |
| tree | a41741811452f928c6f650451c69fc18e46b62a4 /spec/features/error_tracking | |
| parent | 7f305b576b51c3503970ef224cf4b31e247a322d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/error_tracking')
| -rw-r--r-- | spec/features/error_tracking/user_filters_errors_by_status_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/error_tracking/user_sees_error_index_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/error_tracking/user_filters_errors_by_status_spec.rb b/spec/features/error_tracking/user_filters_errors_by_status_spec.rb index 51e29e2a5ec..4b5bc16c4db 100644 --- a/spec/features/error_tracking/user_filters_errors_by_status_spec.rb +++ b/spec/features/error_tracking/user_filters_errors_by_status_spec.rb @@ -6,7 +6,7 @@ describe 'When a user filters Sentry errors by status', :js, :use_clean_rails_me include_context 'sentry error tracking context feature' let_it_be(:issues_response_body) { fixture_file('sentry/issues_sample_response.json') } - let_it_be(:filtered_errors_by_status_response) { JSON.parse(issues_response_body).filter { |error| error['status'] == 'ignored' }.to_json } + let_it_be(:filtered_errors_by_status_response) { Gitlab::Json.parse(issues_response_body).filter { |error| error['status'] == 'ignored' }.to_json } let(:issues_api_url) { "#{sentry_api_urls.issues_url}?limit=20&query=is:unresolved" } let(:issues_api_url_filter) { "#{sentry_api_urls.issues_url}?limit=20&query=is:ignored" } let(:auth_token) {{ 'Authorization' => 'Bearer access_token_123' }} diff --git a/spec/features/error_tracking/user_sees_error_index_spec.rb b/spec/features/error_tracking/user_sees_error_index_spec.rb index 842e4a2e8b5..34a3a4b5a49 100644 --- a/spec/features/error_tracking/user_sees_error_index_spec.rb +++ b/spec/features/error_tracking/user_sees_error_index_spec.rb @@ -6,7 +6,7 @@ describe 'View error index page', :js, :use_clean_rails_memory_store_caching, :s include_context 'sentry error tracking context feature' let_it_be(:issues_response_body) { fixture_file('sentry/issues_sample_response.json') } - let_it_be(:issues_response) { JSON.parse(issues_response_body) } + let_it_be(:issues_response) { Gitlab::Json.parse(issues_response_body) } let(:issues_api_url) { "#{sentry_api_urls.issues_url}?limit=20&query=is:unresolved" } before do |