Add latest changes from gitlab-org/gitlab@master

12 files changed, 25 insertions, 27 deletions

diff --git a/spec/controllers/autocomplete_controller_spec.rb b/spec/controllers/autocomplete_controller_spec.rb
index f3d4234a558..7b1e9748268 100644
--- a/spec/controllers/autocomplete_controller_spec.rb
+++ b/spec/controllers/autocomplete_controller_spec.rb
@@ -192,9 +192,9 @@ describe AutocompleteController do
         end
 
         it 'rejects non existent user ids' do
-          get(:users, params: { author_id: 99999 })
+          get(:users, params: { author_id: non_existing_record_id })
 
-          expect(json_response.collect { |u| u['id'] }).not_to include(99999)
+          expect(json_response.collect { |u| u['id'] }).not_to include(non_existing_record_id)
         end
       end
 
diff --git a/spec/controllers/boards/issues_controller_spec.rb b/spec/controllers/boards/issues_controller_spec.rb
index c57ad937712..8639b76ef0f 100644
--- a/spec/controllers/boards/issues_controller_spec.rb
+++ b/spec/controllers/boards/issues_controller_spec.rb
@@ -26,7 +26,7 @@ describe Boards::IssuesController do
 
     context 'with invalid board id' do
       it 'returns a not found 404 response' do
-        list_issues user: user, board: 999, list: list2
+        list_issues user: user, board: non_existing_record_id, list: list2
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -123,7 +123,7 @@ describe Boards::IssuesController do
 
       context 'with invalid list id' do
         it 'returns a not found 404 response' do
-          list_issues user: user, board: board, list: 999
+          list_issues user: user, board: board, list: non_existing_record_id
 
           expect(response).to have_gitlab_http_status(:not_found)
         end
@@ -441,7 +441,7 @@ describe Boards::IssuesController do
 
       context 'with invalid board id' do
         it 'returns a not found 404 response' do
-          create_issue user: user, board: 999, list: list1, title: 'New issue'
+          create_issue user: user, board: non_existing_record_id, list: list1, title: 'New issue'
 
           expect(response).to have_gitlab_http_status(:not_found)
         end
@@ -449,7 +449,7 @@ describe Boards::IssuesController do
 
       context 'with invalid list id' do
         it 'returns a not found 404 response' do
-          create_issue user: user, board: board, list: 999, title: 'New issue'
+          create_issue user: user, board: board, list: non_existing_record_id, title: 'New issue'
 
           expect(response).to have_gitlab_http_status(:not_found)
         end
@@ -512,13 +512,13 @@ describe Boards::IssuesController do
       end
 
       it 'returns a not found 404 response for invalid board id' do
-        move user: user, board: 999, issue: issue, from_list_id: list1.id, to_list_id: list2.id
+        move user: user, board: non_existing_record_id, issue: issue, from_list_id: list1.id, to_list_id: list2.id
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
 
       it 'returns a not found 404 response for invalid issue id' do
-        move user: user, board: board, issue: double(id: 999), from_list_id: list1.id, to_list_id: list2.id
+        move user: user, board: board, issue: double(id: non_existing_record_id), from_list_id: list1.id, to_list_id: list2.id
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
diff --git a/spec/controllers/boards/lists_controller_spec.rb b/spec/controllers/boards/lists_controller_spec.rb
index 3886388bcf4..d0b34b55c36 100644
--- a/spec/controllers/boards/lists_controller_spec.rb
+++ b/spec/controllers/boards/lists_controller_spec.rb
@@ -154,7 +154,7 @@ describe Boards::ListsController do
 
     context 'with invalid list id' do
       it 'returns a not found 404 response' do
-        move user: user, board: board, list: 999, position: 1
+        move user: user, board: board, list: non_existing_record_id, position: 1
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -246,7 +246,7 @@ describe Boards::ListsController do
 
     context 'with invalid list id' do
       it 'returns a not found 404 response' do
-        remove_board_list user: user, board: board, list: 999
+        remove_board_list user: user, board: board, list: non_existing_record_id
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
diff --git a/spec/controllers/dashboard/todos_controller_spec.rb b/spec/controllers/dashboard/todos_controller_spec.rb
index cea0ea75e5d..004eef1873e 100644
--- a/spec/controllers/dashboard/todos_controller_spec.rb
+++ b/spec/controllers/dashboard/todos_controller_spec.rb
@@ -24,7 +24,7 @@ describe Dashboard::TodosController do
       end
 
       it 'renders 404 when given project does not exists' do
-        get :index, params: { project_id: 999 }
+        get :index, params: { project_id: non_existing_record_id }
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 6c63b220322..3b035eea7d5 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -176,7 +176,7 @@ describe Projects::EnvironmentsController do
     context 'with invalid id' do
       it 'responds with a status code 404' do
         params = environment_params
-        params[:id] = 12345
+        params[:id] = non_existing_record_id
         get :show, params: params
 
         expect(response).to have_gitlab_http_status(:not_found)
diff --git a/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb b/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb
index 75e1c817baa..27d49147e99 100644
--- a/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb
+++ b/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb
@@ -12,7 +12,7 @@ describe Projects::ErrorTracking::StackTracesController do
   end
 
   describe 'GET #index' do
-    let(:issue_id) { 1234 }
+    let(:issue_id) { non_existing_record_id }
     let(:issue_stack_trace_service) { spy(:issue_stack_trace_service) }
 
     subject(:get_stack_trace) do
diff --git a/spec/controllers/projects/error_tracking_controller_spec.rb b/spec/controllers/projects/error_tracking_controller_spec.rb
index 22826938de2..6be979418ad 100644
--- a/spec/controllers/projects/error_tracking_controller_spec.rb
+++ b/spec/controllers/projects/error_tracking_controller_spec.rb
@@ -182,7 +182,7 @@ describe Projects::ErrorTrackingController do
   end
 
   describe 'GET #issue_details' do
-    let_it_be(:issue_id) { 1234 }
+    let_it_be(:issue_id) { non_existing_record_id }
 
     let(:issue_details_service) { spy(:issue_details_service) }
 
@@ -279,7 +279,7 @@ describe Projects::ErrorTrackingController do
   end
 
   describe 'PUT #update' do
-    let(:issue_id) { 1234 }
+    let(:issue_id) { non_existing_record_id }
     let(:issue_update_service) { spy(:issue_update_service) }
     let(:permitted_params) do
       ActionController::Parameters.new(
@@ -301,7 +301,7 @@ describe Projects::ErrorTrackingController do
       context 'update result is successful' do
         before do
           expect(issue_update_service).to receive(:execute)
-            .and_return(status: :success, updated: true, closed_issue_iid: 1234)
+            .and_return(status: :success, updated: true, closed_issue_iid: non_existing_record_iid)
 
           update_issue
         end
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 094b50322d1..1fda9d63bbe 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -338,13 +338,13 @@ describe Projects::IssuesController do
 
       context 'with invalid params' do
         it 'returns a unprocessable entity 422 response for invalid move ids' do
-          reorder_issue(issue1, move_after_id: 99, move_before_id: 999)
+          reorder_issue(issue1, move_after_id: 99, move_before_id: non_existing_record_id)
 
           expect(response).to have_gitlab_http_status(:unprocessable_entity)
         end
 
         it 'returns a not found 404 response for invalid issue id' do
-          reorder_issue(object_double(issue1, iid: 999),
+          reorder_issue(object_double(issue1, iid: non_existing_record_iid),
             move_after_id: issue2.id,
             move_before_id: issue3.id)
 
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb
index 65f57deff1b..0071e6c8a19 100644
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
@@ -132,7 +132,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
 
       context 'when job does not exist' do
         before do
-          get_show(id: 1234)
+          get_show(id: non_existing_record_id)
         end
 
         it 'renders not_found' do
@@ -1146,7 +1146,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
 
     context 'when job does not exist' do
       it 'renders not_found' do
-        get_terminal(id: 1234)
+        get_terminal(id: non_existing_record_id)
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -1191,7 +1191,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
 
       context 'and invalid id' do
         it 'returns 404' do
-          get_terminal_websocket(id: 1234)
+          get_terminal_websocket(id: non_existing_record_id)
 
           expect(response).to have_gitlab_http_status(:not_found)
         end
diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
index a220c1bff95..3d9193e3e33 100644
--- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
@@ -8,11 +8,9 @@ describe Projects::MergeRequests::DiffsController do
   shared_examples '404 for unexistent diffable' do
     context 'when diffable does not exists' do
       it 'returns 404' do
-        unexistent_diff_id = 9999
+        go(diff_id: non_existing_record_id)
 
-        go(diff_id: unexistent_diff_id)
-
-        expect(MergeRequestDiff.find_by(id: unexistent_diff_id)).to be_nil
+        expect(MergeRequestDiff.find_by(id: non_existing_record_id)).to be_nil
         expect(response).to have_gitlab_http_status(:not_found)
       end
     end
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index 7c00af7b945..39594ff287d 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -585,7 +585,7 @@ describe Projects::NotesController do
 
       context 'when a noteable is not found' do
         it 'returns 404 status' do
-          request_params[:target_id] = 9999
+          request_params[:target_id] = non_existing_record_id
           post :create, params: request_params.merge(format: :json)
 
           expect(response).to have_gitlab_http_status(:not_found)
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index f42d0560e80..309a8226226 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -76,7 +76,7 @@ describe UploadsController do
         end
 
         it "returns 404 status when object not found" do
-          post :create, params: { model: model, id: 9999 }, format: :json
+          post :create, params: { model: model, id: non_existing_record_id }, format: :json
 
           expect(response).to have_gitlab_http_status(:not_found)
         end