Add latest changes from gitlab-org/gitlab@master

spec/graphql/types/snippet_type_spec.rb

@@ -16,4 +16,47 @@ describe GitlabSchema.types['Snippet'] do
   describe 'authorizations' do
     it { expect(described_class).to require_graphql_authorizations(:read_snippet) }
   end
+
+  describe '#blob' do
+    let_it_be(:user) { create(:user) }
+    let(:query_blob) { subject.dig('data', 'snippets', 'edges')[0]['node']['blob'] }
+    let(:query) do
+      %(
+        {
+          snippets {
+            edges {
+              node {
+                blob {
+                  name
+                  path
+                }
+              }
+            }
+          }
+        }
+      )
+    end
+
+    subject { GitlabSchema.execute(query, context: { current_user: user }).as_json }
+
+    context 'when snippet has repository' do
+      let!(:snippet) { create(:personal_snippet, :repository, :public, author: user) }
+      let(:blob) { snippet.blobs.first }
+
+      it 'returns blob from the repository' do
+        expect(query_blob['name']).to eq blob.name
+        expect(query_blob['path']).to eq blob.path
+      end
+    end
+
+    context 'when snippet does not have a repository' do
+      let!(:snippet) { create(:personal_snippet, :public, author: user) }
+      let(:blob) { snippet.blob }
+
+      it 'returns SnippetBlob type' do
+        expect(query_blob['name']).to eq blob.name
+        expect(query_blob['path']).to eq blob.path
+      end
+    end
+  end
 end

spec/lib/gitlab/quick_actions/extractor_spec.rb

@@ -216,6 +216,22 @@ describe Gitlab::QuickActions::Extractor do
       expect(msg).to eq "hello\nworld\nthis is great? SHRUG"
     end
+    it 'extracts and performs multiple substitution commands' do
+      msg = %(hello\nworld\n/reopen\n/shrug this is great?\n/shrug meh)
+      msg, commands = extractor.extract_commands(msg)
+
+      expect(commands).to eq [['reopen'], ['shrug', 'this is great?'], %w(shrug meh)]
+      expect(msg).to eq "hello\nworld\nthis is great? SHRUG\nmeh SHRUG"
+    end
+
+    it 'does not extract substitution command in inline code' do
+      msg = %(hello\nworld\n/reopen\n`/tableflip this is great`?)
+      msg, commands = extractor.extract_commands(msg)
+
+      expect(commands).to eq [['reopen']]
+      expect(msg).to eq "hello\nworld\n`/tableflip this is great`?"
+    end
+
     it 'extracts and performs substitution commands case insensitive' do
       msg = %(hello\nworld\n/reOpen\n/sHRuG this is great?)
       msg, commands = extractor.extract_commands(msg)

spec/lib/gitlab/quick_actions/substitution_definition_spec.rb

@@ -7,6 +7,7 @@ describe Gitlab::QuickActions::SubstitutionDefinition do
     <<EOF
 Hello! Let's do this!
 /sub_name I like this stuff
+/sub_name second substitution
 EOF
   end
@@ -24,6 +25,7 @@ EOF
         expect(subject.perform_substitution(self, content)).to eq <<EOF
 Hello! Let's do this!
 I like this stuff foo
+/sub_name second substitution
 EOF
       end
     end

spec/models/concerns/blob_language_from_git_attributes_spec.rb

@@ -11,13 +11,20 @@ describe BlobLanguageFromGitAttributes do
     subject(:blob) { fake_blob(path: 'file.md') }
     it 'returns return value from gitattribute' do
-      expect(blob.project.repository).to receive(:gitattribute).with(blob.path, 'gitlab-language').and_return('erb?parent=json')
+      allow(blob.repository).to receive(:exists?).and_return(true)
+      expect(blob.repository).to receive(:gitattribute).with(blob.path, 'gitlab-language').and_return('erb?parent=json')
       expect(blob.language_from_gitattributes).to eq('erb?parent=json')
     end
-    it 'returns nil if project is absent' do
-      allow(blob).to receive(:project).and_return(nil)
+    it 'returns nil if repository is absent' do
+      allow(blob).to receive(:repository).and_return(nil)
+
+      expect(blob.language_from_gitattributes).to eq(nil)
+    end
+
+    it 'returns nil if repository does not exist' do
+      allow(blob.repository).to receive(:exists?).and_return(false)
       expect(blob.language_from_gitattributes).to eq(nil)
     end

spec/presenters/snippet_blob_presenter_spec.rb

@@ -76,18 +76,18 @@ describe SnippetBlobPresenter do
     context 'with ProjectSnippet' do
       let!(:project) { create(:project) }
-      let(:snippet) { build(:project_snippet, project: project, id: 1) }
+      let(:snippet) { create(:project_snippet, project: project) }
       it 'returns the raw path' do
-        expect(subject).to eq "/#{snippet.project.full_path}/snippets/1/raw"
+        expect(subject).to eq "/#{snippet.project.full_path}/snippets/#{snippet.id}/raw"
       end
     end
     context 'with PersonalSnippet' do
-      let(:snippet) { build(:personal_snippet, id: 1) }
+      let(:snippet) { create(:personal_snippet) }
       it 'returns the raw path' do
-        expect(subject).to eq "/snippets/1/raw"
+        expect(subject).to eq "/snippets/#{snippet.id}/raw"
       end
     end
   end

spec/presenters/snippet_presenter_spec.rb

@@ -143,4 +143,24 @@ describe SnippetPresenter do
       expect(subject).to be_truthy
     end
   end
+
+  describe '#blob' do
+    let(:snippet) { personal_snippet }
+
+    subject { presenter.blob }
+
+    context 'when snippet does not have a repository' do
+      it 'returns SnippetBlob' do
+        expect(subject).to eq snippet.blob
+      end
+    end
+
+    context 'when snippet has a repository' do
+      let(:snippet) { create(:snippet, :repository, author: user) }
+
+      it 'returns repository first blob' do
+        expect(subject).to eq snippet.blobs.first
+      end
+    end
+  end
 end

spec/requests/api/issues/put_projects_issues_spec.rb

@@ -4,8 +4,9 @@ require 'spec_helper'
 describe API::Issues do
   let_it_be(:user) { create(:user) }
+  let_it_be(:owner) { create(:owner) }
   let_it_be(:project, reload: true) do
-    create(:project, :public, creator_id: user.id, namespace: user.namespace)
+    create(:project, :public, creator_id: owner.id, namespace: owner.namespace)
   end
   let(:user2)             { create(:user) }
@@ -97,7 +98,7 @@ describe API::Issues do
           labels: 'label, label?, label&foo, ?, &'
         }
-      expect(response.status).to eq(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['labels']).to include 'label'
       expect(json_response['labels']).to include 'label?'
       expect(json_response['labels']).to include 'label&foo'
@@ -112,7 +113,7 @@ describe API::Issues do
           labels: ['label', 'label?', 'label&foo, ?, &']
         }
-      expect(response.status).to eq(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['labels']).to include 'label'
       expect(json_response['labels']).to include 'label?'
       expect(json_response['labels']).to include 'label&foo'
@@ -349,7 +350,7 @@ describe API::Issues do
     it 'allows special label names' do
       put api("/projects/#{project.id}/issues/#{issue.iid}", user),
         params: { labels: 'label:foo, label-bar,label_bar,label/bar,label?bar,label&bar,?,&' }
-      expect(response.status).to eq(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['labels']).to include 'label:foo'
       expect(json_response['labels']).to include 'label-bar'
       expect(json_response['labels']).to include 'label_bar'
@@ -363,7 +364,7 @@ describe API::Issues do
     it 'allows special label names with labels param as array' do
       put api("/projects/#{project.id}/issues/#{issue.iid}", user),
         params: { labels: ['label:foo', 'label-bar', 'label_bar', 'label/bar,label?bar,label&bar,?,&'] }
-      expect(response.status).to eq(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['labels']).to include 'label:foo'
       expect(json_response['labels']).to include 'label-bar'
       expect(json_response['labels']).to include 'label_bar'
@@ -400,15 +401,49 @@ describe API::Issues do
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['state']).to eq 'opened'
     end
-    context 'when an admin or owner makes the request' do
+  end
+  describe 'PUT /projects/:id/issues/:issue_iid to update updated_at param' do
+    context 'when reporter makes request' do
       it 'accepts the update date to be set' do
         update_time = 2.weeks.ago
+
         put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-          params: { labels: 'label3', state_event: 'close', updated_at: update_time }
+            params: { title: 'some new title', updated_at: update_time }
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response['title']).to include 'some new title'
+        expect(Time.parse(json_response['updated_at'])).not_to be_like_time(update_time)
+      end
+    end
+
+    context 'when admin or owner makes the request' do
+      it 'not allow to set null for updated_at' do
+        put api("/projects/#{project.id}/issues/#{issue.iid}", owner), params: { updated_at: nil }
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
+
+      it 'not allow to set blank for updated_at' do
+        put api("/projects/#{project.id}/issues/#{issue.iid}", owner), params: { updated_at: '' }
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
+
+      it 'not allow to set invalid format for updated_at' do
+        put api("/projects/#{project.id}/issues/#{issue.iid}", owner), params: { updated_at: 'invalid-format' }
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
+
+      it 'accepts the update date to be set' do
+        update_time = 2.weeks.ago
+        put api("/projects/#{project.id}/issues/#{issue.iid}", owner),
+            params: { title: 'some new title', updated_at: update_time }
         expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response['labels']).to include 'label3'
+        expect(json_response['title']).to include 'some new title'
+
         expect(Time.parse(json_response['updated_at'])).to be_like_time(update_time)
       end
     end

spec/support/shared_examples/lib/gitlab/import_export/project_tree_restorer_shared_examples.rb

@@ -30,7 +30,8 @@ RSpec.shared_examples 'restores project successfully' do |**results|
     expect(project.issues.size).to eq(results.fetch(:issues, 0))
   end
-  it 'does not set params that are excluded from import_export settings' do
+  # This test is quarantined because the use of magic number 999 causes failure on CI
+  it 'does not set params that are excluded from import_export settings', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/207932#note_293724442' do
     expect(project.import_type).to be_nil
     expect(project.creator_id).not_to eq 999
   end