Merge branch 'master' into migrate-fabricators-to-factory-bot-factories

# Conflicts:
#	Gemfile
#	lib/tasks/dev.rake
#	spec/models/contact_spec.rb

spec/features/admin/contacts/list_spec.rb

@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+RSpec.feature 'Contact list', settings: false do
+  background do
+    sign_in_to_admin_area
+  end
+
+  it 'is visible' do
+    visit admin_contacts_path
+    expect(page).to have_css('.contacts')
+  end
+end

spec/features/registrar/contacts/list_spec.rb

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+RSpec.feature 'Contact list', settings: false do
+  given!(:registrar) { create(:registrar) }
+  given!(:contact) { create(:contact, registrar: registrar) }
+
+  background do
+    sign_in_to_registrar_area(user: create(:api_user_with_unlimited_balance, registrar: registrar))
+  end
+
+  it 'is visible' do
+    visit registrar_contacts_path
+    expect(page).to have_css('.contacts')
+  end
+end