Merge branch 'master' into registry-746

# Conflicts:
#	test/fixtures/contacts.yml

test/fixtures/contacts.yml

@@ -44,6 +44,17 @@ acme_ltd:
   code: acme-ltd-001
   auth_info: 720b3c
 
+jack:
+  name: Jack
+  email: jack@inbox.test
+  phone: '+555.555'
+  ident: 1234
+  ident_type: org
+  registrar: goodnames
+  ident_country_code: US
+  code: jack-001
+  auth_info: e2c440
+
 identical_to_william:
   name: William
   email: william@inbox.test

test/fixtures/domains.yml

@@ -28,6 +28,16 @@ library:
   period: 1
   period_unit: m
 
+metro:
+  name: metro.test
+  name_dirty: metro.test
+  registrar: goodnames
+  registrant: jack
+  transfer_code: 1071ad
+  valid_to: 2010-07-05
+  period: 1
+  period_unit: m
+
 invalid:
   name: invalid.test
   transfer_code: any

test/fixtures/nameservers.yml

@@ -0,0 +1,23 @@
+shop_ns1:
+  hostname: ns1.bestnames.test
+  ipv4:
+    - 192.0.2.1
+  ipv6:
+    - 2001:db8::1
+  domain: shop
+
+shop_ns2:
+  hostname: ns2.bestnames.test
+  ipv4:
+    - 192.0.2.2
+  ipv6:
+    - 2001:db8::2
+  domain: shop
+
+airport_ns1:
+  hostname: ns1.bestnames.test
+  domain: airport
+
+metro_ns1:
+  hostname: ns1.bestnames.test
+  domain: metro