Allow project name, path etc start with number. Fixed specs

Dmitriy Zaporozhets
1 parent a36195bd
Showing 4 changed files with 11 additions and 10 deletions Show diff stats
app/models/project.rb
lib/gitlab/regex.rb
spec/models/commit_spec.rb
spec/models/project_spec.rb
@@ -73,11 +73,11 @@ class Project &lt; ActiveRecord::Base
   validates :description, length: { within: 0..2000 }
   validates :name, presence: true, length: { within: 0..255 },
             format: { with: Gitlab::Regex.project_name_regex,
-                      message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter should be first" }
+                      message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter or digit should be first" }
   validates :path, presence: true, length: { within: 0..255 },
             exclusion: { in: Gitlab::Blacklist.path },
             format: { with: Gitlab::Regex.path_regex,
-                      message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
+                      message: "only letters, digits & '_' '-' '.' allowed. Letter or digit should be first" }
   validates :issues_enabled, :wall_enabled, :merge_requests_enabled,
             :wiki_enabled, inclusion: { in: [true, false] }
   validates :issues_tracker_id, length: { within: 0..255 }
@@ -7,7 +7,7 @@ module Gitlab
     end
     def project_name_regex
-      /\A[a-zA-Z][a-zA-Z0-9_\-\. ]*\z/
+      /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/
     end
     def name_regex
@@ -21,7 +21,7 @@ module Gitlab
     protected
     def default_regex
-      /\A[a-zA-Z][a-zA-Z0-9_\-\.]*\z/
+      /\A[a-zA-Z0-9][a-zA-Z0-9_\-\.]*\z/
     end
   end
 end
@@ -9,11 +9,11 @@ describe Commit do
       commit.title.should == "--no commit message"
     end
-    it "truncates a message without a newline at 70 characters" do
+    it "truncates a message without a newline at 80 characters" do
       message = commit.safe_message * 10
       commit.stub(:safe_message).and_return(message)
-      commit.title.should == "#{message[0..69]}&hellip;"
+      commit.title.should == "#{message[0..79]}&hellip;"
     end
     it "truncates a message with a newline before 80 characters at the newline" do
@@ -27,7 +27,7 @@ describe Commit do
       message = (commit.safe_message * 10) + "\n"
       commit.stub(:safe_message).and_return(message)
-      commit.title.should == "#{message[0..69]}&hellip;"
+      commit.title.should == "#{message[0..79]}&hellip;"
     end
   end
@@ -68,9 +68,10 @@ describe Project do
     it { should ensure_length_of(:issues_tracker_id).is_within(0..255) }
     it "should not allow new projects beyond user limits" do
-      project.stub(:creator).and_return(double(can_create_project?: false, projects_limit: 1))
-      project.should_not be_valid
-      project.errors[:limit_reached].first.should match(/Your own projects limit is 1/)
+      project2 = build(:project)
+      project2.stub(:creator).and_return(double(can_create_project?: false, projects_limit: 0))
+      project2.should_not be_valid
+      project2.errors[:limit_reached].first.should match(/Your own projects limit is 0/)
     end
   end
	@@ -73,11 +73,11 @@ class Project < ActiveRecord::Base		@@ -73,11 +73,11 @@ class Project < ActiveRecord::Base
73	validates :description, length: { within: 0..2000 }	73	validates :description, length: { within: 0..2000 }
74	validates :name, presence: true, length: { within: 0..255 },	74	validates :name, presence: true, length: { within: 0..255 },
75	format: { with: Gitlab::Regex.project_name_regex,	75	format: { with: Gitlab::Regex.project_name_regex,
76	- message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter should be first" }	76	+ message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter or digit should be first" }
77	validates :path, presence: true, length: { within: 0..255 },	77	validates :path, presence: true, length: { within: 0..255 },
78	exclusion: { in: Gitlab::Blacklist.path },	78	exclusion: { in: Gitlab::Blacklist.path },
79	format: { with: Gitlab::Regex.path_regex,	79	format: { with: Gitlab::Regex.path_regex,
80	- message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }	80	+ message: "only letters, digits & '_' '-' '.' allowed. Letter or digit should be first" }
81	validates :issues_enabled, :wall_enabled, :merge_requests_enabled,	81	validates :issues_enabled, :wall_enabled, :merge_requests_enabled,
82	:wiki_enabled, inclusion: { in: [true, false] }	82	:wiki_enabled, inclusion: { in: [true, false] }
83	validates :issues_tracker_id, length: { within: 0..255 }	83	validates :issues_tracker_id, length: { within: 0..255 }
	@@ -7,7 +7,7 @@ module Gitlab		@@ -7,7 +7,7 @@ module Gitlab
7	end	7	end
8		8
9	def project_name_regex	9	def project_name_regex
10	- /\A[a-zA-Z][a-zA-Z0-9_\-\. ]*\z/	10	+ /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/
11	end	11	end
12		12
13	def name_regex	13	def name_regex
	@@ -21,7 +21,7 @@ module Gitlab		@@ -21,7 +21,7 @@ module Gitlab
21	protected	21	protected
22		22
23	def default_regex	23	def default_regex
24	- /\A[a-zA-Z][a-zA-Z0-9_\-\.]*\z/	24	+ /\A[a-zA-Z0-9][a-zA-Z0-9_\-\.]*\z/
25	end	25	end
26	end	26	end
27	end	27	end
	@@ -9,11 +9,11 @@ describe Commit do		@@ -9,11 +9,11 @@ describe Commit do
9	commit.title.should == "--no commit message"	9	commit.title.should == "--no commit message"
10	end	10	end
11		11
12	- it "truncates a message without a newline at 70 characters" do	12	+ it "truncates a message without a newline at 80 characters" do
13	message = commit.safe_message * 10	13	message = commit.safe_message * 10
14		14
15	commit.stub(:safe_message).and_return(message)	15	commit.stub(:safe_message).and_return(message)
16	- commit.title.should == "#{message[0..69]}…"	16	+ commit.title.should == "#{message[0..79]}…"
17	end	17	end
18		18
19	it "truncates a message with a newline before 80 characters at the newline" do	19	it "truncates a message with a newline before 80 characters at the newline" do
	@@ -27,7 +27,7 @@ describe Commit do		@@ -27,7 +27,7 @@ describe Commit do
27	message = (commit.safe_message * 10) + "\n"	27	message = (commit.safe_message * 10) + "\n"
28		28
29	commit.stub(:safe_message).and_return(message)	29	commit.stub(:safe_message).and_return(message)
30	- commit.title.should == "#{message[0..69]}…"	30	+ commit.title.should == "#{message[0..79]}…"
31	end	31	end
32	end	32	end
33		33