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

# Conflicts:
#	Gemfile
#	lib/tasks/dev.rake
#	spec/models/contact_spec.rb
This commit is contained in:
Artur Beljajev 2017-11-15 15:42:54 +02:00
commit be959a8471
59 changed files with 2505 additions and 480 deletions

View file

@ -10,6 +10,7 @@ require 'support/requests/epp_helpers'
require 'support/features/session_helpers'
require 'support/matchers/alias_attribute'
require 'support/matchers/epp/code'
require 'support/matchers/epp/have_result'
require 'support/capybara'
require 'support/devise'
@ -28,7 +29,8 @@ RSpec.configure do |config|
config.include AbstractController::Translation, type: :request
config.include AbstractController::Translation, type: :feature
config.include AbstractController::Translation, type: :mailer
config.include Requests::EPPHelpers, type: :request
config.include Requests::EPPHelpers, epp: true
config.include Matchers::EPP, epp: true
config.define_derived_metadata(file_path: %r[/spec/features/]) do |metadata|
metadata[:db] = true if metadata[:db].nil?