diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 03:09:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 03:09:04 +0300 |
commit | 27a18afc7dba4e09a5ec78e5c251c31216d7792a (patch) | |
tree | 5dcc015be79e00de4133a66defe10bf1463ff827 /spec | |
parent | 71c9d577ad563572050335dc261ba7673e3e566f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/task_lists_spec.rb | 18 | ||||
-rw-r--r-- | spec/fixtures/api/graphql/recursive-introspection.graphql | 46 | ||||
-rw-r--r-- | spec/fixtures/api/graphql/recursive-query-edges-node.graphql | 23 | ||||
-rw-r--r-- | spec/fixtures/api/graphql/recursive-query-nodes.graphql | 19 | ||||
-rw-r--r-- | spec/fixtures/api/graphql/recursive-query.graphql | 47 | ||||
-rw-r--r-- | spec/lib/gitlab/conflict/file_spec.rb | 146 | ||||
-rw-r--r-- | spec/lib/gitlab/git/conflict/parser_spec.rb | 148 | ||||
-rw-r--r-- | spec/models/clusters/platforms/kubernetes_spec.rb | 8 | ||||
-rw-r--r-- | spec/models/error_tracking/project_error_tracking_setting_spec.rb | 14 | ||||
-rw-r--r-- | spec/requests/api/graphql/gitlab_schema_spec.rb | 45 | ||||
-rw-r--r-- | spec/services/error_tracking/issue_details_service_spec.rb | 14 | ||||
-rw-r--r-- | spec/services/error_tracking/issue_update_service_spec.rb | 10 | ||||
-rw-r--r-- | spec/support/helpers/kubernetes_helpers.rb | 9 | ||||
-rw-r--r-- | spec/support/shared_contexts/sentry_error_tracking_shared_context.rb | 3 |
14 files changed, 261 insertions, 289 deletions
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb index 0d10f6aee3b..24a183017c9 100644 --- a/spec/features/task_lists_spec.rb +++ b/spec/features/task_lists_spec.rb @@ -240,28 +240,30 @@ describe 'Task Lists' do end shared_examples 'multiple tasks' do - it 'renders for description' do + it 'renders for description', :js do visit_merge_request(project, merge) + wait_for_requests expect(page).to have_selector('ul.task-list', count: 1) expect(page).to have_selector('li.task-list-item', count: 6) expect(page).to have_selector('ul input[checked]', count: 2) end - it 'contains the required selectors' do + it 'contains the required selectors', :js do visit_merge_request(project, merge) + wait_for_requests container = '.detail-page-description .description.js-task-list-container' expect(page).to have_selector(container) expect(page).to have_selector("#{container} .md .task-list .task-list-item .task-list-item-checkbox") - expect(page).to have_selector("#{container} .js-task-list-field") + expect(page).to have_selector("#{container} .js-task-list-field", visible: false) expect(page).to have_selector('form.js-issuable-update') - expect(page).to have_selector('a.btn-close') end it 'is only editable by author', :js do visit_merge_request(project, merge) + wait_for_requests expect(page).to have_selector('.js-task-list-container') expect(page).to have_selector('li.task-list-item.enabled', count: 6) @@ -269,6 +271,7 @@ describe 'Task Lists' do logout(:user) login_as(user2) visit current_path + wait_for_requests expect(page).not_to have_selector('.js-task-list-container') expect(page).to have_selector('li.task-list-item.enabled', count: 0) @@ -297,8 +300,9 @@ describe 'Task Lists' do describe 'single incomplete task' do let!(:merge) { create(:merge_request, :simple, description: singleIncompleteMarkdown, author: user, source_project: project) } - it 'renders for description' do + it 'renders for description', :js do visit_merge_request(project, merge) + wait_for_requests expect(page).to have_selector('ul.task-list', count: 1) expect(page).to have_selector('li.task-list-item', count: 1) @@ -315,8 +319,9 @@ describe 'Task Lists' do describe 'single complete task' do let!(:merge) { create(:merge_request, :simple, description: singleCompleteMarkdown, author: user, source_project: project) } - it 'renders for description' do + it 'renders for description', :js do visit_merge_request(project, merge) + wait_for_requests expect(page).to have_selector('ul.task-list', count: 1) expect(page).to have_selector('li.task-list-item', count: 1) @@ -325,6 +330,7 @@ describe 'Task Lists' do it 'provides a summary on MergeRequests#index' do visit project_merge_requests_path(project) + expect(page).to have_content("1 of 1 task completed") end end diff --git a/spec/fixtures/api/graphql/recursive-introspection.graphql b/spec/fixtures/api/graphql/recursive-introspection.graphql index db970bb14b6..8346fbdde74 100644 --- a/spec/fixtures/api/graphql/recursive-introspection.graphql +++ b/spec/fixtures/api/graphql/recursive-introspection.graphql @@ -2,51 +2,11 @@ query allSchemaTypes { __schema { types { fields { - type{ + type { fields { type { fields { - type { - fields { - type { - fields { - type { - fields { - type { - fields { - type { - fields { - type { - fields { - type { - fields { - type { - fields { - type { - fields { - type { - fields { - name - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } + name } } } @@ -54,4 +14,4 @@ query allSchemaTypes { } } } -}
\ No newline at end of file +} diff --git a/spec/fixtures/api/graphql/recursive-query-edges-node.graphql b/spec/fixtures/api/graphql/recursive-query-edges-node.graphql new file mode 100644 index 00000000000..de790b1a6c7 --- /dev/null +++ b/spec/fixtures/api/graphql/recursive-query-edges-node.graphql @@ -0,0 +1,23 @@ +{ + project(fullPath: "gitlab-org/gitlab") { + group { + projects { + edges { + node { + group { + projects { + edges { + node { + group { + description + } + } + } + } + } + } + } + } + } + } +} diff --git a/spec/fixtures/api/graphql/recursive-query-nodes.graphql b/spec/fixtures/api/graphql/recursive-query-nodes.graphql new file mode 100644 index 00000000000..c8d93f74f86 --- /dev/null +++ b/spec/fixtures/api/graphql/recursive-query-nodes.graphql @@ -0,0 +1,19 @@ +{ + project(fullPath: "gitlab-org/gitlab") { + group { + projects { + nodes { + group { + projects { + nodes { + group { + description + } + } + } + } + } + } + } + } +} diff --git a/spec/fixtures/api/graphql/recursive-query.graphql b/spec/fixtures/api/graphql/recursive-query.graphql deleted file mode 100644 index d1616c4de6e..00000000000 --- a/spec/fixtures/api/graphql/recursive-query.graphql +++ /dev/null @@ -1,47 +0,0 @@ -{ - project(fullPath: "gitlab-org/gitlab-ce") { - group { - projects { - edges { - node { - group { - projects { - edges { - node { - group { - projects { - edges { - node { - group { - projects { - edges { - node { - group { - projects { - edges { - node { - group { - description - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } -} diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb index 7ecc42ea497..966648bcc5a 100644 --- a/spec/lib/gitlab/conflict/file_spec.rb +++ b/spec/lib/gitlab/conflict/file_spec.rb @@ -153,79 +153,79 @@ describe Gitlab::Conflict::File do context 'with an example file' do let(:raw_conflict_content) do - <<FILE - # Ensure there is no match line header here - def username_regexp - default_regexp - end - -<<<<<<< files/ruby/regex.rb -def project_name_regexp - /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/ -end - -def name_regexp - /\A[a-zA-Z0-9_\-\. ]*\z/ -======= -def project_name_regex - %r{\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z} -end - -def name_regex - %r{\A[a-zA-Z0-9_\-\. ]*\z} ->>>>>>> files/ruby/regex.rb -end - -# Some extra lines -# To force a match line -# To be created - -def path_regexp - default_regexp -end - -<<<<<<< files/ruby/regex.rb -def archive_formats_regexp - /(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/ -======= -def archive_formats_regex - %r{(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)} ->>>>>>> files/ruby/regex.rb -end - -def git_reference_regexp - # Valid git ref regexp, see: - # https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html - %r{ - (?! - (?# doesn't begins with) - \/| (?# rule #6) - (?# doesn't contain) - .*(?: - [\/.]\.| (?# rule #1,3) - \/\/| (?# rule #6) - @\{| (?# rule #8) - \\ (?# rule #9) - ) - ) - [^\000-\040\177~^:?*\[]+ (?# rule #4-5) - (?# doesn't end with) - (?<!\.lock) (?# rule #1) - (?<![\/.]) (?# rule #6-7) - }x -end - -protected - -<<<<<<< files/ruby/regex.rb -def default_regexp - /\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/ -======= -def default_regex - %r{\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z} ->>>>>>> files/ruby/regex.rb -end -FILE + <<~FILE + # Ensure there is no match line header here + def username_regexp + default_regexp + end + + <<<<<<< files/ruby/regex.rb + def project_name_regexp + /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/ + end + + def name_regexp + /\A[a-zA-Z0-9_\-\. ]*\z/ + ======= + def project_name_regex + %r{\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z} + end + + def name_regex + %r{\A[a-zA-Z0-9_\-\. ]*\z} + >>>>>>> files/ruby/regex.rb + end + + # Some extra lines + # To force a match line + # To be created + + def path_regexp + default_regexp + end + + <<<<<<< files/ruby/regex.rb + def archive_formats_regexp + /(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/ + ======= + def archive_formats_regex + %r{(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)} + >>>>>>> files/ruby/regex.rb + end + + def git_reference_regexp + # Valid git ref regexp, see: + # https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html + %r{ + (?! + (?# doesn't begins with) + \/| (?# rule #6) + (?# doesn't contain) + .*(?: + [\/.]\.| (?# rule #1,3) + \/\/| (?# rule #6) + @\{| (?# rule #8) + \\ (?# rule #9) + ) + ) + [^\000-\040\177~^:?*\[]+ (?# rule #4-5) + (?# doesn't end with) + (?<!\.lock) (?# rule #1) + (?<![\/.]) (?# rule #6-7) + }x + end + + protected + + <<<<<<< files/ruby/regex.rb + def default_regexp + /\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/ + ======= + def default_regex + %r{\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z} + >>>>>>> files/ruby/regex.rb + end + FILE end let(:sections) { conflict_file.sections } diff --git a/spec/lib/gitlab/git/conflict/parser_spec.rb b/spec/lib/gitlab/git/conflict/parser_spec.rb index 600c870acd4..92ea44394b1 100644 --- a/spec/lib/gitlab/git/conflict/parser_spec.rb +++ b/spec/lib/gitlab/git/conflict/parser_spec.rb @@ -10,80 +10,80 @@ describe Gitlab::Git::Conflict::Parser do context 'when the file has valid conflicts' do let(:text) do - <<CONFLICT -module Gitlab - module Regexp - extend self - - def username_regexp - default_regexp - end - -<<<<<<< files/ruby/regex.rb - def project_name_regexp - /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/ - end - - def name_regexp - /\A[a-zA-Z0-9_\-\. ]*\z/ -======= - def project_name_regex - %r{\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z} - end - - def name_regex - %r{\A[a-zA-Z0-9_\-\. ]*\z} ->>>>>>> files/ruby/regex.rb - end - - def path_regexp - default_regexp - end - -<<<<<<< files/ruby/regex.rb - def archive_formats_regexp - /(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/ -======= - def archive_formats_regex - %r{(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)} ->>>>>>> files/ruby/regex.rb - end - - def git_reference_regexp - # Valid git ref regexp, see: - # https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html - %r{ - (?! - (?# doesn't begins with) - \/| (?# rule #6) - (?# doesn't contain) - .*(?: - [\/.]\.| (?# rule #1,3) - \/\/| (?# rule #6) - @\{| (?# rule #8) - \\ (?# rule #9) - ) - ) - [^\000-\040\177~^:?*\[]+ (?# rule #4-5) - (?# doesn't end with) - (?<!\.lock) (?# rule #1) - (?<![\/.]) (?# rule #6-7) - }x - end - - protected - -<<<<<<< files/ruby/regex.rb - def default_regexp - /\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/ -======= - def default_regex - %r{\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z} ->>>>>>> files/ruby/regex.rb - end - end -end -CONFLICT + <<~CONFLICT + module Gitlab + module Regexp + extend self + + def username_regexp + default_regexp + end + + <<<<<<< files/ruby/regex.rb + def project_name_regexp + /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/ + end + + def name_regexp + /\A[a-zA-Z0-9_\-\. ]*\z/ + ======= + def project_name_regex + %r{\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z} + end + + def name_regex + %r{\A[a-zA-Z0-9_\-\. ]*\z} + >>>>>>> files/ruby/regex.rb + end + + def path_regexp + default_regexp + end + + <<<<<<< files/ruby/regex.rb + def archive_formats_regexp + /(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/ + ======= + def archive_formats_regex + %r{(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)} + >>>>>>> files/ruby/regex.rb + end + + def git_reference_regexp + # Valid git ref regexp, see: + # https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html + %r{ + (?! + (?# doesn't begins with) + \/| (?# rule #6) + (?# doesn't contain) + .*(?: + [\/.]\.| (?# rule #1,3) + \/\/| (?# rule #6) + @\{| (?# rule #8) + \\ (?# rule #9) + ) + ) + [^\000-\040\177~^:?*\[]+ (?# rule #4-5) + (?# doesn't end with) + (?<!\.lock) (?# rule #1) + (?<![\/.]) (?# rule #6-7) + }x + end + + protected + + <<<<<<< files/ruby/regex.rb + def default_regexp + /\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/ + ======= + def default_regex + %r{\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z} + >>>>>>> files/ruby/regex.rb + end + end + end + CONFLICT end let(:lines) do diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb index 4271cf9f1b3..f0e6dd53664 100644 --- a/spec/models/clusters/platforms/kubernetes_spec.rb +++ b/spec/models/clusters/platforms/kubernetes_spec.rb @@ -361,8 +361,10 @@ describe Clusters::Platforms::Kubernetes do describe '#calculate_reactive_cache_for' do let(:service) { create(:cluster_platform_kubernetes, :configured) } - let(:pod) { kube_pod } - let(:namespace) { pod["metadata"]["namespace"] } + let(:expected_pod_cached_data) do + kube_pod.tap { |kp| kp['metadata'].delete('namespace') } + end + let(:namespace) { "project-namespace" } let(:environment) { instance_double(Environment, deployment_namespace: namespace) } subject { service.calculate_reactive_cache_for(environment) } @@ -381,7 +383,7 @@ describe Clusters::Platforms::Kubernetes do stub_kubeclient_deployments(namespace) end - it { is_expected.to include(pods: [pod]) } + it { is_expected.to include(pods: [expected_pod_cached_data]) } end context 'when kubernetes responds with 500s' do diff --git a/spec/models/error_tracking/project_error_tracking_setting_spec.rb b/spec/models/error_tracking/project_error_tracking_setting_spec.rb index 004e8a28c12..5b402e572c3 100644 --- a/spec/models/error_tracking/project_error_tracking_setting_spec.rb +++ b/spec/models/error_tracking/project_error_tracking_setting_spec.rb @@ -440,18 +440,4 @@ describe ErrorTracking::ProjectErrorTrackingSetting do end end end - - describe '#expire_issues_cache', :use_clean_rails_memory_store_caching do - it 'clears the cache' do - klass_key = subject.class.reactive_cache_key.call(subject).join(':') - key = "#{klass_key}:list_issues:some_suffix" - Rails.cache.write(key, 1) - - expect(Rails.cache.exist?(key)).to eq(true) - - subject.expire_issues_cache - - expect(Rails.cache.exist?(key)).to eq(false) - end - end end diff --git a/spec/requests/api/graphql/gitlab_schema_spec.rb b/spec/requests/api/graphql/gitlab_schema_spec.rb index 2cb8436662b..e10f0732852 100644 --- a/spec/requests/api/graphql/gitlab_schema_spec.rb +++ b/spec/requests/api/graphql/gitlab_schema_spec.rb @@ -67,24 +67,45 @@ describe 'GitlabSchema configurations' do end end - context 'a deep but simple recursive introspective query' do - it 'fails due to recursion' do - query = File.read(Rails.root.join('spec/fixtures/api/graphql/recursive-introspection.graphql')) + context 'failing queries' do + before do + allow(GitlabSchema).to receive(:max_query_recursion).and_return 1 + end - post_graphql(query, current_user: nil) + context 'a recursive introspective query' do + it 'fails due to recursion' do + query = File.read(Rails.root.join('spec/fixtures/api/graphql/recursive-introspection.graphql')) - expect_graphql_errors_to_include [/Recursive query/] + post_graphql(query, current_user: nil) + + expect_graphql_errors_to_include [/Recursive query/] + end end - end - context 'a deep recursive non-introspective query' do - it 'fails due to recursion, complexity and depth' do - allow(GitlabSchema).to receive(:max_query_complexity).and_return 1 - query = File.read(Rails.root.join('spec/fixtures/api/graphql/recursive-query.graphql')) + context 'a recursive non-introspective query' do + before do + allow(GitlabSchema).to receive(:max_query_complexity).and_return 1 + allow(GitlabSchema).to receive(:max_query_depth).and_return 1 + allow(GitlabSchema).to receive(:max_query_complexity).and_return 1 + end - post_graphql(query, current_user: nil) + shared_examples 'fails due to recursion, complexity and depth' do |fixture_file| + it 'fails due to recursion, complexity and depth' do + query = File.read(Rails.root.join(fixture_file)) + + post_graphql(query, current_user: nil) + + expect_graphql_errors_to_include [/Recursive query/, /exceeds max complexity/, /exceeds max depth/] + end + end - expect_graphql_errors_to_include [/Recursive query/, /exceeds max complexity/, /exceeds max depth/] + context 'using `nodes` notation' do + it_behaves_like 'fails due to recursion, complexity and depth', 'spec/fixtures/api/graphql/recursive-query-nodes.graphql' + end + + context 'using `edges -> node` notation' do + it_behaves_like 'fails due to recursion, complexity and depth', 'spec/fixtures/api/graphql/recursive-query-edges-node.graphql' + end end end end diff --git a/spec/services/error_tracking/issue_details_service_spec.rb b/spec/services/error_tracking/issue_details_service_spec.rb index 26bb3b44126..60d6172ef64 100644 --- a/spec/services/error_tracking/issue_details_service_spec.rb +++ b/spec/services/error_tracking/issue_details_service_spec.rb @@ -9,6 +9,7 @@ describe ErrorTracking::IssueDetailsService do context 'with authorized user' do context 'when issue_details returns a detailed error' do let(:detailed_error) { build(:detailed_error_tracking_error) } + let(:params) { { issue_id: detailed_error.id } } before do expect(error_tracking_setting) @@ -18,6 +19,19 @@ describe ErrorTracking::IssueDetailsService do it 'returns the detailed error' do expect(result).to eq(status: :success, issue: detailed_error) end + + it 'returns the gitlab_issue when the error has a sentry_issue' do + gitlab_issue = create(:issue, project: project) + create(:sentry_issue, issue: gitlab_issue, sentry_issue_identifier: detailed_error.id) + + expect(result[:issue].gitlab_issue).to include( + "http", "/#{project.full_path}/issues/#{gitlab_issue.iid}" + ) + end + + it 'returns the gitlab_issue path from sentry when the error has no sentry_issue' do + expect(result[:issue].gitlab_issue).to eq(detailed_error.gitlab_issue) + end end include_examples 'error tracking service data not ready', :issue_details diff --git a/spec/services/error_tracking/issue_update_service_spec.rb b/spec/services/error_tracking/issue_update_service_spec.rb index 4500c7c4f75..ad1dafe6ccc 100644 --- a/spec/services/error_tracking/issue_update_service_spec.rb +++ b/spec/services/error_tracking/issue_update_service_spec.rb @@ -40,16 +40,6 @@ describe ErrorTracking::IssueUpdateService do result end - it 'clears the reactive cache' do - allow(error_tracking_setting) - .to receive(:expire_issues_cache) - - result - - expect(error_tracking_setting) - .to have_received(:expire_issues_cache) - end - context 'related issue and resolving' do let(:issue) { create(:issue, project: project) } let(:sentry_issue) { create(:sentry_issue, issue: issue) } diff --git a/spec/support/helpers/kubernetes_helpers.rb b/spec/support/helpers/kubernetes_helpers.rb index 8e5042e2ad3..0d312575e91 100644 --- a/spec/support/helpers/kubernetes_helpers.rb +++ b/spec/support/helpers/kubernetes_helpers.rb @@ -494,7 +494,7 @@ module KubernetesHelpers "metadata" => { "name" => name, "namespace" => namespace, - "generate_name" => "generated-name-with-suffix", + "generateName" => "generated-name-with-suffix", "creationTimestamp" => "2016-11-25T19:55:19Z", "annotations" => { "app.gitlab.com/env" => environment_slug, @@ -520,7 +520,7 @@ module KubernetesHelpers "metadata" => { "name" => name, "namespace" => namespace, - "generate_name" => "generated-name-with-suffix", + "generateName" => "generated-name-with-suffix", "creationTimestamp" => "2016-11-25T19:55:19Z", "labels" => { "serving.knative.dev/service" => name @@ -551,10 +551,7 @@ module KubernetesHelpers }, "spec" => { "replicas" => 3 }, "status" => { - "observedGeneration" => 4, - "replicas" => 3, - "updatedReplicas" => 3, - "availableReplicas" => 3 + "observedGeneration" => 4 } } end diff --git a/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb b/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb index ba729f21e58..ee678580fb9 100644 --- a/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb +++ b/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb @@ -6,9 +6,10 @@ shared_context 'sentry error tracking context' do let(:sentry_url) { 'https://sentrytest.gitlab.com/api/0/projects/sentry-org/sentry-project' } let(:token) { 'test-token' } + let(:params) { {} } let(:result) { subject.execute } - subject { described_class.new(project, user) } + subject { described_class.new(project, user, params) } let(:error_tracking_setting) do create(:project_error_tracking_setting, api_url: sentry_url, token: token, project: project) |