From 6d775ddae4e561b9a932177fdaf5f6a4a16030a2 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Wed, 5 Nov 2014 13:58:51 +0100
Subject: [PATCH] Fix tests after change to regex validation message.
---
spec/requests/api/projects_spec.rb | 5 ++---
spec/requests/api/users_spec.rb | 6 ++----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index cb7a2705573..067935c82a6 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -209,9 +209,8 @@ describe API::API, api: true do
json_response['message']['path'].should == [
'can\'t be blank',
'is too short (minimum is 0 characters)',
- 'can contain only letters, digits, \'_\', \'-\' and \'.\'. It must '\
- 'start with letter, digit or \'_\', optionally preceeded by \'.\'. '\
- 'It must not end in \'.git\'.'
+ 'can contain only letters, digits, \'_\', \'-\' and \'.\'. ' \
+ 'Cannot start with \'-\' or end in \'.git\''
]
end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 3bb6191ed9f..a1a26d80a14 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -141,8 +141,7 @@ describe API::API, api: true do
should == ['must be greater than or equal to 0']
json_response['message']['username'].
should == ['can contain only letters, digits, '\
- '\'_\', \'-\' and \'.\'. It must start with letter, digit or '\
- '\'_\', optionally preceeded by \'.\'. It must not end in \'.git\'.']
+ '\'_\', \'-\' and \'.\'. Cannot start with \'-\' or end in \'.git\'']
end
it "shouldn't available for non admin users" do
@@ -285,8 +284,7 @@ describe API::API, api: true do
should == ['must be greater than or equal to 0']
json_response['message']['username'].
should == ['can contain only letters, digits, '\
- '\'_\', \'-\' and \'.\'. It must start with letter, digit or '\
- '\'_\', optionally preceeded by \'.\'. It must not end in \'.git\'.']
+ '\'_\', \'-\' and \'.\'. Cannot start with \'-\' or end in \'.git\'']
end
context "with existing user" do
--
GitLab