Add latest changes from gitlab-org/gitlab@master

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 }

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

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

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

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'))
-          post_graphql(query, current_user: nil)
-          expect_graphql_errors_to_include [/Recursive query/]
+      context 'failing queries' do
+        before do
+          allow(GitlabSchema).to receive(:max_query_recursion).and_return 1
+        end
+        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'))
+            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'))
-          post_graphql(query, current_user: nil)
-          expect_graphql_errors_to_include [/Recursive query/, /exceeds max complexity/, /exceeds max depth/]
+        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
+          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
+          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

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

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) }

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

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)