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

This commit is contained in:
Martin Lensment 2015-06-10 11:08:55 +03:00
commit 249262e224
2 changed files with 9 additions and 5 deletions

View file

@ -93,6 +93,10 @@ class EppController < ApplicationController
@errors.uniq! @errors.uniq!
# Requested by client, ticket #2688
# Known issues: error request is exactly 1 second slower and server can handle less load
sleep 1 if !Rails.env.test? || !Rails.env.development?
render_epp_response '/epp/error' render_epp_response '/epp/error'
end end

View file

@ -266,7 +266,7 @@ describe Domain do
d.valid? d.valid?
d.errors.full_messages.should match_array([ d.errors.full_messages.should match_array([
"Domain name Domain name is invalid", "Domain name Domain name is invalid",
"Puny label is too long (maximum is 63 characters)" "Puny label Domain name is too long (maximum is 63 characters)"
]) ])
end end
@ -276,7 +276,7 @@ describe Domain do
d.valid? d.valid?
d.errors.full_messages.should match_array([ d.errors.full_messages.should match_array([
"Domain name Domain name is invalid", "Domain name Domain name is invalid",
"Puny label is too long (maximum is 63 characters)" "Puny label Domain name is too long (maximum is 63 characters)"
]) ])
end end
@ -292,7 +292,7 @@ describe Domain do
d = Fabricate.build(:domain, name: "#{'ä' * 63}.ee") d = Fabricate.build(:domain, name: "#{'ä' * 63}.ee")
d.valid? d.valid?
d.errors.full_messages.should == [ d.errors.full_messages.should == [
"Puny label is too long (maximum is 63 characters)" "Puny label Domain name is too long (maximum is 63 characters)"
] ]
end end
@ -301,7 +301,7 @@ describe Domain do
d.valid? d.valid?
d.errors.full_messages.should match_array([ d.errors.full_messages.should match_array([
"Domain name Domain name is invalid", "Domain name Domain name is invalid",
"Puny label is too long (maximum is 63 characters)" "Puny label Domain name is too long (maximum is 63 characters)"
]) ])
end end
@ -309,7 +309,7 @@ describe Domain do
d = Fabricate.build(:domain, name: "#{'ä' * 63}.pri.ee") d = Fabricate.build(:domain, name: "#{'ä' * 63}.pri.ee")
d.valid? d.valid?
d.errors.full_messages.should match_array([ d.errors.full_messages.should match_array([
"Puny label is too long (maximum is 63 characters)" "Puny label Domain name is too long (maximum is 63 characters)"
]) ])
end end