diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /spec/lib/sentry | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'spec/lib/sentry')
-rw-r--r-- | spec/lib/sentry/client/event_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/sentry/client/issue_link_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/sentry/client/issue_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/sentry/client/projects_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/sentry/client/repo_spec.rb | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/spec/lib/sentry/client/event_spec.rb b/spec/lib/sentry/client/event_spec.rb index c8604d72ada..58891895bfa 100644 --- a/spec/lib/sentry/client/event_spec.rb +++ b/spec/lib/sentry/client/event_spec.rb @@ -18,7 +18,7 @@ describe Sentry::Client do describe '#issue_latest_event' do let(:sample_response) do Gitlab::Utils.deep_indifferent_access( - JSON.parse(fixture_file('sentry/issue_latest_event_sample_response.json')) + Gitlab::Json.parse(fixture_file('sentry/issue_latest_event_sample_response.json')) ) end let(:issue_id) { '1234' } diff --git a/spec/lib/sentry/client/issue_link_spec.rb b/spec/lib/sentry/client/issue_link_spec.rb index 3434e93365e..293937f6100 100644 --- a/spec/lib/sentry/client/issue_link_spec.rb +++ b/spec/lib/sentry/client/issue_link_spec.rb @@ -16,7 +16,7 @@ describe Sentry::Client::IssueLink do let(:sentry_issue_link_url) { "https://sentrytest.gitlab.com/api/0/groups/#{sentry_issue_id}/integrations/#{integration_id}/" } let(:integration_id) { 44444 } - let(:issue_link_sample_response) { JSON.parse(fixture_file('sentry/global_integration_link_sample_response.json')) } + let(:issue_link_sample_response) { Gitlab::Json.parse(fixture_file('sentry/global_integration_link_sample_response.json')) } let(:sentry_api_response) { issue_link_sample_response } let!(:sentry_api_request) { stub_sentry_request(sentry_issue_link_url, :put, body: sentry_api_response, status: 201) } @@ -42,7 +42,7 @@ describe Sentry::Client::IssueLink do let(:sentry_issue_link_url) { "https://sentrytest.gitlab.com/api/0/issues/#{sentry_issue_id}/plugins/gitlab/link/" } let(:integration_id) { nil } - let(:issue_link_sample_response) { JSON.parse(fixture_file('sentry/plugin_link_sample_response.json')) } + let(:issue_link_sample_response) { Gitlab::Json.parse(fixture_file('sentry/plugin_link_sample_response.json')) } let!(:sentry_api_request) { stub_sentry_request(sentry_issue_link_url, :post, body: sentry_api_response) } it_behaves_like 'calls sentry api' diff --git a/spec/lib/sentry/client/issue_spec.rb b/spec/lib/sentry/client/issue_spec.rb index 0f57d38d290..b683ad6d4a9 100644 --- a/spec/lib/sentry/client/issue_spec.rb +++ b/spec/lib/sentry/client/issue_spec.rb @@ -23,7 +23,7 @@ describe Sentry::Client::Issue do let(:issues_sample_response) do Gitlab::Utils.deep_indifferent_access( - JSON.parse(fixture_file('sentry/issues_sample_response.json')) + Gitlab::Json.parse(fixture_file('sentry/issues_sample_response.json')) ) end @@ -201,7 +201,7 @@ describe Sentry::Client::Issue do describe '#issue_details' do let(:issue_sample_response) do Gitlab::Utils.deep_indifferent_access( - JSON.parse(fixture_file('sentry/issue_sample_response.json')) + Gitlab::Json.parse(fixture_file('sentry/issue_sample_response.json')) ) end diff --git a/spec/lib/sentry/client/projects_spec.rb b/spec/lib/sentry/client/projects_spec.rb index 6183d4c5816..1b5bbb8f81a 100644 --- a/spec/lib/sentry/client/projects_spec.rb +++ b/spec/lib/sentry/client/projects_spec.rb @@ -10,7 +10,7 @@ describe Sentry::Client::Projects do let(:client) { Sentry::Client.new(sentry_url, token) } let(:projects_sample_response) do Gitlab::Utils.deep_indifferent_access( - JSON.parse(fixture_file('sentry/list_projects_sample_response.json')) + Gitlab::Json.parse(fixture_file('sentry/list_projects_sample_response.json')) ) end diff --git a/spec/lib/sentry/client/repo_spec.rb b/spec/lib/sentry/client/repo_spec.rb index 7bc2811ef03..524dca8dcf6 100644 --- a/spec/lib/sentry/client/repo_spec.rb +++ b/spec/lib/sentry/client/repo_spec.rb @@ -8,7 +8,7 @@ describe Sentry::Client::Repo do let(:sentry_url) { 'https://sentrytest.gitlab.com/api/0/projects/sentry-org/sentry-project' } let(:token) { 'test-token' } let(:client) { Sentry::Client.new(sentry_url, token) } - let(:repos_sample_response) { JSON.parse(fixture_file('sentry/repos_sample_response.json')) } + let(:repos_sample_response) { Gitlab::Json.parse(fixture_file('sentry/repos_sample_response.json')) } describe '#repos' do let(:organization_slug) { 'gitlab' } |