Merge branch 'master' into registry-790

# Conflicts:
#	app/models/domain_cron.rb
#	lib/tasks/dev.rake

test/integration/registrant/layout_test.rb

@@ -9,9 +9,16 @@ class RegistrantLayoutTest < ActionDispatch::IntegrationTest
     travel_to Time.zone.parse('2010-07-05')
   end
 
-  def test_has_link_to_rest_whois
+  def teardown
+    super
+
+    travel_back
+  end
+
+  def test_has_link_to_rest_whois_and_internet_ee
     visit registrant_domains_url
+
     assert(has_link?('Internet.ee', href: 'https://internet.ee'))
-    refute(has_link?('WHOIS', href: 'registrant/whois'))
+    assert(has_link?('WHOIS', href: 'https://whois.internet.ee'))
   end
 end

test/integration/registrar/invoices/new_invoice_payment_test.rb

@@ -4,10 +4,18 @@ class NewInvoicePaymentTest < ActionDispatch::IntegrationTest
   def setup
     super
 
+    @original_vat_prc = Setting.registry_vat_prc
+    Setting.registry_vat_prc = 0.2
     @user = users(:api_bestnames)
     login_as @user
   end
 
+  def teardown
+    super
+
+    Setting.registry_vat_prc = @original_vat_prc
+  end
+
   def create_invoice_and_visit_its_page
     visit registrar_invoices_path
     click_link_or_button 'Add deposit'