Merge branch 'master' into refactor-messages

# Conflicts:
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-09-01 19:39:25 +03:00
commit 056c57530c
32 changed files with 730 additions and 148 deletions

View file

@ -299,50 +299,6 @@ RSpec.describe Domain do
@domain.registrant_update_confirmable?('123').should == false
end
end
context 'with versioning' do
it 'should not have one version' do
with_versioning do
@domain.versions.size.should == 0
@domain.name = 'new-test-name.ee'
@domain.save
@domain.errors.full_messages.should match_array([])
@domain.versions.size.should == 1
end
end
it 'should return api_creator when created by api user' do
with_versioning do
@user = create(:admin_user)
@api_user = create(:api_user)
@user.id.should == 1
@api_user.id.should == 2
::PaperTrail.whodunnit = '2-ApiUser: testuser'
@domain = create(:domain)
@domain.creator_str.should == '2-ApiUser: testuser'
@domain.creator.should == @api_user
@domain.creator.should_not == @user
end
end
it 'should return api_creator when created by api user' do
with_versioning do
@user = create(:admin_user, id: 1000)
@api_user = create(:api_user, id: 2000)
@user.id.should == 1000
@api_user.id.should == 2000
::PaperTrail.whodunnit = '1000-AdminUser: testuser'
@domain = create(:domain)
@domain.creator_str.should == '1000-AdminUser: testuser'
@domain.creator.should == @user
@domain.creator.should_not == @api_user
end
end
end
end
it 'validates domain name' do