zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-03 16:32:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:domify/registry

Browse source 
Conflicts:
	CHANGELOG.md
	app/mailers/domain_mailer.rb
	app/models/domain.rb
	app/views/layouts/registrant/application.haml
	config/application-example.yml
	config/locales/en.yml
	config/routes.rb
	spec/mailers/domain_mailer_spec.rb
This commit is contained in:
Martin Lensment 2015-05-14 18:01:06 +03:00
commit 412ececd9c
13 changed files with 82 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/mailers/domain_mailer_spec.rb
View file

@ -31,6 +31,10 @@ describe DomainMailer do
@new_registrant = Fabricate(:registrant, email: 'test@example.org')
@domain = Fabricate(:domain, registrant: @registrant)
@domain.deliver_emails = true
<<<<<<< HEAD
=======
@domain.registrant_verification_token = '123'
>>>>>>> 0ddd2b6f32fa7e9abec8b2e7c88173585a78f3dd
@domain.registrant = @new_registrant
@mail = DomainMailer.registrant_updated(@domain)
end