Add latest changes from gitlab-org/gitlab@master

3 files changed, 30 insertions, 226 deletions

diff --git a/spec/requests/api/graphql/user/starred_projects_query_spec.rb b/spec/requests/api/graphql/user/starred_projects_query_spec.rb
index b098058a735..6cb02068f2a 100644
--- a/spec/requests/api/graphql/user/starred_projects_query_spec.rb
+++ b/spec/requests/api/graphql/user/starred_projects_query_spec.rb
@@ -17,7 +17,13 @@ RSpec.describe 'Getting starredProjects of the user' do
   let_it_be(:user, reload: true) { create(:user) }
 
   let(:user_fields) { 'starredProjects { nodes { id } }' }
-  let(:starred_projects) { graphql_data_at(:user, :starred_projects, :nodes) }
+  let(:current_user) { nil }
+
+  let(:starred_projects) do
+    post_graphql(query, current_user: current_user)
+
+    graphql_data_at(:user, :starred_projects, :nodes)
+  end
 
   before do
     project_b.add_reporter(user)
@@ -26,11 +32,13 @@ RSpec.describe 'Getting starredProjects of the user' do
     user.toggle_star(project_a)
     user.toggle_star(project_b)
     user.toggle_star(project_c)
-
-    post_graphql(query)
   end
 
-  it_behaves_like 'a working graphql query'
+  it_behaves_like 'a working graphql query' do
+    before do
+      post_graphql(query)
+    end
+  end
 
   it 'found only public project' do
     expect(starred_projects).to contain_exactly(
@@ -41,10 +49,6 @@ RSpec.describe 'Getting starredProjects of the user' do
   context 'the current user is the user' do
     let(:current_user) { user }
 
-    before do
-      post_graphql(query, current_user: current_user)
-    end
-
     it 'found all projects' do
       expect(starred_projects).to contain_exactly(
         a_hash_including('id' => global_id_of(project_a)),
@@ -56,11 +60,10 @@ RSpec.describe 'Getting starredProjects of the user' do
 
   context 'the current user is a member of a private project the user starred' do
     let_it_be(:other_user) { create(:user) }
+    let(:current_user) { other_user }
 
     before do
       project_b.add_reporter(other_user)
-
-      post_graphql(query, current_user: other_user)
     end
 
     it 'finds public and member projects' do
@@ -74,7 +77,6 @@ RSpec.describe 'Getting starredProjects of the user' do
   context 'the user has a private profile' do
     before do
       user.update!(private_profile: true)
-      post_graphql(query, current_user: current_user)
     end
 
     context 'the current user does not have access to view the private profile of the user' do
diff --git a/spec/requests/api/project_repository_storage_moves_spec.rb b/spec/requests/api/project_repository_storage_moves_spec.rb
index 15e69c2aa16..5e200312d1f 100644
--- a/spec/requests/api/project_repository_storage_moves_spec.rb
+++ b/spec/requests/api/project_repository_storage_moves_spec.rb
@@ -3,220 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe API::ProjectRepositoryStorageMoves do
-  include AccessMatchersForRequest
-
-  let_it_be(:user) { create(:admin) }
-  let_it_be(:project) { create(:project, :repository).tap { |project| project.track_project_repository } }
-  let_it_be(:storage_move) { create(:project_repository_storage_move, :scheduled, container: project) }
-
-  shared_examples 'get single project repository storage move' do
-    let(:project_repository_storage_move_id) { storage_move.id }
-
-    def get_project_repository_storage_move
-      get api(url, user)
-    end
-
-    it 'returns a project repository storage move' do
-      get_project_repository_storage_move
-
-      expect(response).to have_gitlab_http_status(:ok)
-      expect(response).to match_response_schema('public_api/v4/project_repository_storage_move')
-      expect(json_response['id']).to eq(storage_move.id)
-      expect(json_response['state']).to eq(storage_move.human_state_name)
-    end
-
-    context 'non-existent project repository storage move' do
-      let(:project_repository_storage_move_id) { non_existing_record_id }
-
-      it 'returns not found' do
-        get_project_repository_storage_move
-
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
-
-    describe 'permissions' do
-      it { expect { get_project_repository_storage_move }.to be_allowed_for(:admin) }
-      it { expect { get_project_repository_storage_move }.to be_denied_for(:user) }
-    end
-  end
-
-  shared_examples 'get project repository storage move list' do
-    def get_project_repository_storage_moves
-      get api(url, user)
-    end
-
-    it 'returns project repository storage moves' do
-      get_project_repository_storage_moves
-
-      expect(response).to have_gitlab_http_status(:ok)
-      expect(response).to include_pagination_headers
-      expect(response).to match_response_schema('public_api/v4/project_repository_storage_moves')
-      expect(json_response.size).to eq(1)
-      expect(json_response.first['id']).to eq(storage_move.id)
-      expect(json_response.first['state']).to eq(storage_move.human_state_name)
-    end
-
-    it 'avoids N+1 queries', :request_store do
-      # prevent `let` from polluting the control
-      get_project_repository_storage_moves
-
-      control = ActiveRecord::QueryRecorder.new { get_project_repository_storage_moves }
-
-      create(:project_repository_storage_move, :scheduled, container: project)
-
-      expect { get_project_repository_storage_moves }.not_to exceed_query_limit(control)
-    end
-
-    it 'returns the most recently created first' do
-      storage_move_oldest = create(:project_repository_storage_move, :scheduled, container: project, created_at: 2.days.ago)
-      storage_move_middle = create(:project_repository_storage_move, :scheduled, container: project, created_at: 1.day.ago)
-
-      get_project_repository_storage_moves
-
-      json_ids = json_response.map {|storage_move| storage_move['id'] }
-      expect(json_ids).to eq([
-        storage_move.id,
-        storage_move_middle.id,
-        storage_move_oldest.id
-      ])
-    end
-
-    describe 'permissions' do
-      it { expect { get_project_repository_storage_moves }.to be_allowed_for(:admin) }
-      it { expect { get_project_repository_storage_moves }.to be_denied_for(:user) }
-    end
-  end
-
-  describe 'GET /project_repository_storage_moves' do
-    it_behaves_like 'get project repository storage move list' do
-      let(:url) { '/project_repository_storage_moves' }
-    end
-  end
-
-  describe 'GET /project_repository_storage_moves/:repository_storage_move_id' do
-    it_behaves_like 'get single project repository storage move' do
-      let(:url) { "/project_repository_storage_moves/#{project_repository_storage_move_id}" }
-    end
-  end
-
-  describe 'GET /projects/:id/repository_storage_moves' do
-    it_behaves_like 'get project repository storage move list' do
-      let(:url) { "/projects/#{project.id}/repository_storage_moves" }
-    end
-  end
-
-  describe 'GET /projects/:id/repository_storage_moves/:repository_storage_move_id' do
-    it_behaves_like 'get single project repository storage move' do
-      let(:url) { "/projects/#{project.id}/repository_storage_moves/#{project_repository_storage_move_id}" }
-    end
-  end
-
-  describe 'POST /projects/:id/repository_storage_moves' do
-    let(:url) { "/projects/#{project.id}/repository_storage_moves" }
-    let(:destination_storage_name) { 'test_second_storage' }
-
-    def create_project_repository_storage_move
-      post api(url, user), params: { destination_storage_name: destination_storage_name }
-    end
-
-    before do
-      stub_storage_settings('test_second_storage' => { 'path' => 'tmp/tests/extra_storage' })
-    end
-
-    it 'schedules a project repository storage move' do
-      create_project_repository_storage_move
-
-      storage_move = project.repository_storage_moves.last
-
-      expect(response).to have_gitlab_http_status(:created)
-      expect(response).to match_response_schema('public_api/v4/project_repository_storage_move')
-      expect(json_response['id']).to eq(storage_move.id)
-      expect(json_response['state']).to eq('scheduled')
-      expect(json_response['source_storage_name']).to eq('default')
-      expect(json_response['destination_storage_name']).to eq(destination_storage_name)
-    end
-
-    describe 'permissions' do
-      it { expect { create_project_repository_storage_move }.to be_allowed_for(:admin) }
-      it { expect { create_project_repository_storage_move }.to be_denied_for(:user) }
-    end
-
-    context 'destination_storage_name is missing' do
-      let(:destination_storage_name) { nil }
-
-      it 'schedules a project repository storage move' do
-        create_project_repository_storage_move
-
-        storage_move = project.repository_storage_moves.last
-
-        expect(response).to have_gitlab_http_status(:created)
-        expect(response).to match_response_schema('public_api/v4/project_repository_storage_move')
-        expect(json_response['id']).to eq(storage_move.id)
-        expect(json_response['state']).to eq('scheduled')
-        expect(json_response['source_storage_name']).to eq('default')
-        expect(json_response['destination_storage_name']).to be_present
-      end
-    end
-  end
-
-  describe 'POST /project_repository_storage_moves' do
-    let(:source_storage_name) { 'default' }
-    let(:destination_storage_name) { 'test_second_storage' }
-
-    def create_project_repository_storage_moves
-      post api('/project_repository_storage_moves', user), params: {
-        source_storage_name: source_storage_name,
-        destination_storage_name: destination_storage_name
-      }
-    end
-
-    before do
-      stub_storage_settings('test_second_storage' => { 'path' => 'tmp/tests/extra_storage' })
-    end
-
-    it 'schedules the worker' do
-      expect(ProjectScheduleBulkRepositoryShardMovesWorker).to receive(:perform_async).with(source_storage_name, destination_storage_name)
-
-      create_project_repository_storage_moves
-
-      expect(response).to have_gitlab_http_status(:accepted)
-    end
-
-    context 'source_storage_name is invalid' do
-      let(:destination_storage_name) { 'not-a-real-storage' }
-
-      it 'gives an error' do
-        create_project_repository_storage_moves
-
-        expect(response).to have_gitlab_http_status(:bad_request)
-      end
-    end
-
-    context 'destination_storage_name is missing' do
-      let(:destination_storage_name) { nil }
-
-      it 'schedules the worker' do
-        expect(ProjectScheduleBulkRepositoryShardMovesWorker).to receive(:perform_async).with(source_storage_name, destination_storage_name)
-
-        create_project_repository_storage_moves
-
-        expect(response).to have_gitlab_http_status(:accepted)
-      end
-    end
-
-    context 'destination_storage_name is invalid' do
-      let(:destination_storage_name) { 'not-a-real-storage' }
-
-      it 'gives an error' do
-        create_project_repository_storage_moves
-
-        expect(response).to have_gitlab_http_status(:bad_request)
-      end
-    end
-
-    describe 'normal user' do
-      it { expect { create_project_repository_storage_moves }.to be_denied_for(:user) }
-    end
+  it_behaves_like 'repository_storage_moves API', 'projects' do
+    let_it_be(:container) { create(:project, :repository).tap { |project| project.track_project_repository } }
+    let_it_be(:storage_move) { create(:project_repository_storage_move, :scheduled, container: container) }
+    let(:repository_storage_move_factory) { :project_repository_storage_move }
+    let(:bulk_worker_klass) { ProjectScheduleBulkRepositoryShardMovesWorker }
   end
 end
diff --git a/spec/requests/api/snippet_repository_storage_moves_spec.rb b/spec/requests/api/snippet_repository_storage_moves_spec.rb
new file mode 100644
index 00000000000..edb92569823
--- /dev/null
+++ b/spec/requests/api/snippet_repository_storage_moves_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe API::SnippetRepositoryStorageMoves do
+  it_behaves_like 'repository_storage_moves API', 'snippets' do
+    let_it_be(:container) { create(:snippet, :repository).tap { |snippet| snippet.create_repository } }
+    let_it_be(:storage_move) { create(:snippet_repository_storage_move, :scheduled, container: container) }
+    let(:repository_storage_move_factory) { :snippet_repository_storage_move }
+    let(:bulk_worker_klass) { SnippetScheduleBulkRepositoryShardMovesWorker }
+  end
+end