1 files changed, 10 insertions, 10 deletions

diff --git a/spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb b/spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb
index 2154a76d765..3913d29e086 100644
--- a/spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb
@@ -9,7 +9,7 @@ RSpec.shared_examples 'repository_storage_moves API' do |container_type|
     let(:repository_storage_move_id) { storage_move.id }
 
     def get_container_repository_storage_move
-      get api(url, user)
+      get api(url, user, admin_mode: user.admin?)
     end
 
     it 'returns a container repository storage move', :aggregate_failures do
@@ -39,7 +39,7 @@ RSpec.shared_examples 'repository_storage_moves API' do |container_type|
 
   shared_examples 'get container repository storage move list' do
     def get_container_repository_storage_moves
-      get api(url, user)
+      get api(url, user, admin_mode: user.admin?)
     end
 
     it 'returns container repository storage moves', :aggregate_failures do
@@ -70,7 +70,7 @@ RSpec.shared_examples 'repository_storage_moves API' do |container_type|
 
       get_container_repository_storage_moves
 
-      json_ids = json_response.map { |storage_move| storage_move['id'] }
+      json_ids = json_response.pluck('id')
       expect(json_ids).to eq([storage_move.id, storage_move_middle.id, storage_move_oldest.id])
     end
 
@@ -90,7 +90,7 @@ RSpec.shared_examples 'repository_storage_moves API' do |container_type|
       let(:container_id) { non_existing_record_id }
 
       it 'returns not found' do
-        get api(url, user)
+        get api(url, user, admin_mode: user.admin?)
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -108,7 +108,7 @@ RSpec.shared_examples 'repository_storage_moves API' do |container_type|
       let(:repository_storage_move_id) { storage_move.id }
 
       it 'returns not found' do
-        get api(url, user)
+        get api(url, user, admin_mode: user.admin?)
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -127,20 +127,20 @@ RSpec.shared_examples 'repository_storage_moves API' do |container_type|
     end
   end
 
-  describe "POST /#{container_type}/:id/repository_storage_moves" do
+  describe "POST /#{container_type}/:id/repository_storage_moves", :aggregate_failures do
     let(:container_id) { container.id }
     let(:url) { "/#{container_type}/#{container_id}/repository_storage_moves" }
     let(:destination_storage_name) { 'test_second_storage' }
 
     def create_container_repository_storage_move
-      post api(url, user), params: { destination_storage_name: destination_storage_name }
+      post api(url, user, admin_mode: user.admin?), 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 container repository storage move', :aggregate_failures do
+    it 'schedules a container repository storage move' do
       create_container_repository_storage_move
 
       storage_move = container.repository_storage_moves.last
@@ -158,7 +158,7 @@ RSpec.shared_examples 'repository_storage_moves API' do |container_type|
       it { expect { create_container_repository_storage_move }.to be_denied_for(:user) }
     end
 
-    context 'destination_storage_name is missing', :aggregate_failures do
+    context 'destination_storage_name is missing' do
       let(:destination_storage_name) { nil }
 
       it 'schedules a container repository storage move' do
@@ -192,7 +192,7 @@ RSpec.shared_examples 'repository_storage_moves API' do |container_type|
     let(:destination_storage_name) { 'test_second_storage' }
 
     def create_container_repository_storage_moves
-      post api(url, user), params: {
+      post api(url, user, admin_mode: user.admin?), params: {
         source_storage_name: source_storage_name,
         destination_storage_name: destination_storage_name
       }