Merge branch 'master' into improve-registrant-area

test/fixtures/contacts.yml

@@ -16,7 +16,7 @@ william: &william
   name: William
   email: william@inbox.test
   phone: '+555.555'
-  fax: +555.555
+  fax: '+666.6'
   ident: 1234
   ident_type: priv
   ident_country_code: US

test/fixtures/registrars.yml

@@ -40,13 +40,4 @@ complete:
   accounting_customer_code: US0001
   language: en
   vat_no: US12345
-  vat_rate: 0.05
-
-not_in_use:
-  name: any
-  reg_no: any
-  code: any
-  email: any@example.com
-  country_code: US
-  accounting_customer_code: any
-  language: en
+  vat_rate: 0.05

test/lib/auth_token/auth_token_creator_test.rb

@@ -8,7 +8,7 @@ class AuthTokenCreatorTest < ActiveSupport::TestCase
 
     @user = users(:registrant)
     time = Time.zone.parse('2010-07-05 00:30:00 +0000')
-    @random_bytes = SecureRandom.random_bytes(64)
+    @random_bytes = SecureRandom.random_bytes(32)
     @token_creator = AuthTokenCreator.new(@user, @random_bytes, time)
   end
 

test/support/task_test_case.rb

@@ -0,0 +1,12 @@
+class TaskTestCase < ActiveSupport::TestCase
+  setup do
+    # Rake tasks usually display some results, which mixes up with test results.
+    # This suppresses default stdout and makes Rails.env.test? checks unnecessary.
+    @original_stdout = $stdout
+    $stdout = File.open(File::NULL, 'w')
+  end
+
+  teardown do
+    $stdout = @original_stdout
+  end
+end

test/test_helper.rb

@@ -12,6 +12,7 @@ require 'capybara/rails'
 require 'capybara/minitest'
 require 'webmock/minitest'
 require 'support/rails5_assertions' # Remove once upgraded to Rails 5
+require 'support/task_test_case'
 
 Setting.address_processing = false
 Setting.registry_country_code = 'US'