Fix failing tests due to updates on the return messages.

5 files changed, 10 insertions, 10 deletions

diff --git a/lib/api/deploy_keys.rb b/lib/api/deploy_keys.rb
index dd4b761feb2..06eb7756841 100644
--- a/lib/api/deploy_keys.rb
+++ b/lib/api/deploy_keys.rb
@@ -58,7 +58,7 @@ module API
         if key.valid? && user_project.deploy_keys << key
           present key, with: Entities::SSHKey
         else
-          render_api_error!("Failed to add key #{key.errors.messages}", 400)
+          render_validation_error!(key)
         end
       end
 
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 01496c39955..d2828b24c36 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -104,7 +104,7 @@ module API
 
         # Validate label names in advance
         if (errors = validate_label_params(params)).any?
-          render_api_error!("Unable to validate label: #{errors}"}, 400)
+          render_api_error!({ labels: errors }, 400)
         end
 
         issue = ::Issues::CreateService.new(user_project, current_user, attrs).execute
@@ -118,7 +118,7 @@ module API
 
           present issue, with: Entities::Issue
         else
-          render_api_error!("Unable to create issue #{issue.errors.messages}", 400)
+          render_validation_error!(issue)
         end
       end
 
@@ -142,7 +142,7 @@ module API
 
         # Validate label names in advance
         if (errors = validate_label_params(params)).any?
-          render_api_error!("Unable to validate label: #{errors}"}, 400)
+          render_api_error!({ labels: errors }, 400)
         end
 
         issue = ::Issues::UpdateService.new(user_project, current_user, attrs).execute(issue)
@@ -158,7 +158,7 @@ module API
 
           present issue, with: Entities::Issue
         else
-          render_api_error!("Unable to update issue #{issue.errors.messages}", 400)
+          render_validation_error!(issue)
         end
       end
 
diff --git a/lib/api/labels.rb b/lib/api/labels.rb
index e8ded662253..78ca58ad0d1 100644
--- a/lib/api/labels.rb
+++ b/lib/api/labels.rb
@@ -37,7 +37,7 @@ module API
         if label.valid?
           present label, with: Entities::Label
         else
-          render_api_error!("Unable to create label #{label.errors.messages}", 400)
+          render_validation_error!(label)
         end
       end
 
@@ -90,7 +90,7 @@ module API
         if label.update(attrs)
           present label, with: Entities::Label
         else
-          render_api_error!("Unable to create label #{label.errors.messages}", 400)
+          render_validation_error!(label)
         end
       end
     end
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 1a73c4943b8..81038d05f12 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -137,7 +137,7 @@ module API
 
         # Validate label names in advance
         if (errors = validate_label_params(params)).any?
-          render_api_error!("Unable to validate label: #{errors}"}, 400)
+          render_api_error!({ labels: errors }, 400)
         end
 
         merge_request = ::MergeRequests::UpdateService.new(user_project, current_user, attrs).execute(merge_request)
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index a5aade06cba..95f82463367 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -91,8 +91,8 @@ describe API::API, api: true  do
 
       it "should not create group, duplicate" do
         post api("/groups", admin), {name: "Duplicate Test", path: group2.path}
-        response.status.should == 422
-        response.message.should == "Unprocessable Entity"
+        response.status.should == 400
+        response.message.should == "Bad Request"
       end
 
       it "should return 400 bad request error if name not given" do