Merge branch 'master' into registry-251

# Conflicts:
#	doc/epp/README.md
#	lib/schemas/all-ee-1.1.xsd
#	lib/schemas/contact-ee-1.1.xsd
#	lib/schemas/epp-ee-1.0.xsd
#	spec/factories/api_user.rb
#	spec/rails_helper.rb
#	spec/support/requests/session_helpers.rb

doc/epp/README.md

@@ -19,19 +19,19 @@
 ## XML schemas
 
 ### Common
-* [all-ee-1.0.xsd](schemas/all-ee-1.0.xsd)
+* [domain-1.0.xsd](/lib/schemas/domain-1.0.xsd)
-* [contact-1.0.xsd](schemas/contact-1.0.xsd)
+* [contact-1.0.xsd](/lib/schemas/contact-1.0.xsd)
-* [domain-1.0.xsd](schemas/domain-1.0.xsd)
+* [epp-1.0.xsd](/lib/schemas/epp-1.0.xsd)
-* [epp-1.0.xsd](schemas/epp-1.0.xsd)
+* [eppcom-1.0.xsd](/lib/schemas/eppcom-1.0.xsd)
-* [eppcom-1.0.xsd](schemas/eppcom-1.0.xsd)
+* [host-1.0.xsd](/lib/schemas/host-1.0.xsd)
-* [host-1.0.xsd](schemas/host-1.0.xsd)
+* [keyrelay-1.0.xsd](/lib/schemas/keyrelay-1.0.xsd)
-* [keyrelay-1.0.xsd](schemas/keyrelay-1.0.xsd)
+* [secDNS-1.1.xsd](/lib/schemas/secDNS-1.1.xsd)
-* [secDNS-1.1.xsd](schemas/secDNS-1.1.xsd)
 
-### EIS-specific
+### .ee-specific
-*  [eis-1.0.xsd](schemas/eis-1.0.xsd)
+* [all-ee-1.0.xsd](/lib/schemas/all-ee-1.0.xsd)
-*  [domain-eis-1.0.xsd](schemas/domain-eis-1.0.xsd)
+* [domain-eis-1.0.xsd](/lib/schemas/domain-eis-1.0.xsd)
-*  [contact-eis-1.0.xsd](schemas/contact-eis-1.0.xsd)
+* [contact-eis-1.0.xsd](/lib/schemas/contact-eis-1.0.xsd)
+* [eis-1.0.xsd](/lib/schemas/eis-1.0.xsd)
 
 More info about The Extensible Provisioning Protocol (EPP):
 http://en.wikipedia.org/wiki/Extensible_Provisioning_Protocol

spec/models/admin_user_spec.rb

@@ -30,9 +30,13 @@ RSpec.describe AdminUser do
       @admin_user.valid?.should == true
       @admin_user.password = 'not confirmed'
       @admin_user.valid?
-      @admin_user.errors.full_messages.should match_array([
+      @admin_user.errors.full_messages.should match_array(["Password confirmation doesn't match Password"])
-        "Password confirmation doesn't match Password"
+    end
-      ])
+  end
+
+  describe '::min_password_length' do
+    it 'returns minimum password length' do
+      expect(described_class.min_password_length).to eq(8)
     end
   end
 

spec/rails_helper.rb

@@ -5,8 +5,8 @@ require 'rspec/rails'
 require 'capybara/poltergeist'
 require 'paper_trail/frameworks/rspec'
 require 'money-rails/test_helpers'
-require 'support/features/session_helpers'
 require 'support/requests/session_helpers'
+require 'support/features/session_helpers'
 
 if ENV['ROBOT']
   require 'simplecov'
@@ -25,8 +25,8 @@ ActiveRecord::Migration.maintain_test_schema!
 RSpec.configure do |config|
   config.include ActionView::TestCase::Behavior, type: :presenter
   config.include ActiveSupport::Testing::TimeHelpers
-  config.include Features::SessionHelpers, type: :feature
   config.include Requests::SessionHelpers, type: :request
+  config.include Features::SessionHelpers, type: :feature
   config.include AbstractController::Translation, type: :feature
 
   config.define_derived_metadata(file_path: %r[/spec/features/]) do |metadata|

spec/support/requests/session_helpers.rb

@@ -13,7 +13,7 @@ module Requests
             </options>
             <svcs>
               <objURI>https://epp.tld.ee/schema/domain-eis-1.0.xsd</objURI>
-              <objURI>https://epp.tld.ee/schema/contact-ee-1.1.xsd</objURI>
+              <objURI>https://epp.tld.ee/schema/contact-eis-1.0.xsd</objURI>
               <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
               <objURI>urn:ietf:params:xml:ns:keyrelay-1.0</objURI>
               <svcExtension>