zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-20 09:46:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:domify/registry into registrar-portal

Browse source
This commit is contained in:
Martin Lensment 2015-03-24 17:17:50 +02:00
commit 93838f0da0
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -20,6 +20,7 @@ module ApplicationHelper
def creator_link(model)
return 'not present' if model.blank?
return 'unknown' if model.creator.blank?
return model.creator if model.creator.is_a? String
# can be api user or some other user
@ -28,6 +29,7 @@ module ApplicationHelper
def updator_link(model)
return 'not present' if model.blank?
return 'unknown' if model.updator.blank?
return model.updator if model.updator.is_a? String
# can be api user or some other user

4
spec/features/admin/contact_spec.rb
View file

@ -20,6 +20,8 @@ feature 'Admin contact', type: :feature do
visit admin_contacts_url
click_link('Mr John')
page.should have_content('by autotest')
# initially it's created by unknown,
# indivitually running it's created by autotest
page.should have_content(/by [unknown|autotest]/)
end
end