Merge branch 'master' of github.com:domify/registry

This commit is contained in:
Martin Lensment 2015-06-09 17:52:06 +03:00
commit ffb1ab6521
8 changed files with 24 additions and 18 deletions

View file

@ -248,7 +248,7 @@ describe Domain do
d.valid?
d.errors.full_messages.should match_array([
"Domain name Domain name is invalid",
"Domain name Domain name is too long (maximum is 63 characters)"
"Puny label is too long (maximum is 63 characters)"
])
end
@ -258,7 +258,15 @@ describe Domain do
d.valid?
d.errors.full_messages.should match_array([
"Domain name Domain name is invalid",
"Domain name Domain name is too long (maximum is 63 characters)"
"Puny label is too long (maximum is 63 characters)"
])
end
it 'should be valid when name length is 63 characters' do
d = Fabricate.build(:domain,
name: "õäöüšžõäöüšžõäöüšžõäöüšžõäöüšžõäöüšžõäöüšžab123.pri.ee")
d.valid?
d.errors.full_messages.should match_array([
])
end
@ -266,7 +274,7 @@ describe Domain do
d = Fabricate.build(:domain, name: "#{'ä' * 63}.ee")
d.valid?
d.errors.full_messages.should == [
"Domain name Domain name is too long (maximum is 63 characters)"
"Puny label is too long (maximum is 63 characters)"
]
end
@ -275,7 +283,7 @@ describe Domain do
d.valid?
d.errors.full_messages.should match_array([
"Domain name Domain name is invalid",
"Domain name Domain name is too long (maximum is 63 characters)"
"Puny label is too long (maximum is 63 characters)"
])
end
@ -283,7 +291,7 @@ describe Domain do
d = Fabricate.build(:domain, name: "#{'ä' * 63}.pri.ee")
d.valid?
d.errors.full_messages.should match_array([
"Domain name Domain name is too long (maximum is 63 characters)"
"Puny label is too long (maximum is 63 characters)"
])
end