Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 8 deletions

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