From e5c9ad8a476541dce2bb56e867a4ca92ca4f516a Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Tue, 9 Jun 2015 18:27:43 +0300
Subject: [PATCH 1/2] Tests update #2608

---
 spec/models/domain_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb
index 6bf183f9f..ae432cde2 100644
--- a/spec/models/domain_spec.rb
+++ b/spec/models/domain_spec.rb
@@ -248,7 +248,7 @@ describe Domain do
     d.valid?
     d.errors.full_messages.should match_array([
       "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
 
@@ -258,7 +258,7 @@ describe Domain do
     d.valid?
     d.errors.full_messages.should match_array([
       "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
 
@@ -274,7 +274,7 @@ describe Domain do
     d = Fabricate.build(:domain, name: "#{'ä' * 63}.ee")
     d.valid?
     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
 
@@ -283,7 +283,7 @@ describe Domain do
     d.valid?
     d.errors.full_messages.should match_array([
       "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
 
@@ -291,7 +291,7 @@ describe Domain do
     d = Fabricate.build(:domain, name: "#{'ä' * 63}.pri.ee")
     d.valid?
     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
 

From 30a8a4c8aa8e15f5c9d620c1317b9d6a7f8713ca Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Tue, 9 Jun 2015 18:44:39 +0300
Subject: [PATCH 2/2] One second sleep for epp error #2688

---
 app/controllers/epp_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index 1c8f25323..d5f88b8d0 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -93,6 +93,10 @@ class EppController < ApplicationController
 
     @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'
   end