zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 10:19:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Martin Lensment 2014-10-23 17:50:05 +03:00
commit a3b359a47b
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/robot
View file

@ -27,7 +27,7 @@ RAILS_ENV=test bundle exec rake db:seed
RAILS_ENV=test bundle exec rake assets:precompile RAILS_ENV=test bundle exec rake assets:precompile
echo "GIT_LAST_COMMITS" echo "GIT_LAST_COMMITS"
git log origin/master -n 10 --pretty=oneline | sed -r '/^.{40} Merge branch/d' | sed -r 's/^.{40}/Latest: /' git log --pretty='%s (%cn, %cr)' --abbrev-commit --graph --decorate -n 20 --no-color
echo "END_OF_GIT_LAST_COMMITS" echo "END_OF_GIT_LAST_COMMITS"
echo "RUBOCOP_RESULTS" echo "RUBOCOP_RESULTS"

18
db/seeds.rb
View file

@ -10,9 +10,9 @@ Country.where(name: 'Estonia', iso: 'EE').first_or_create!
Country.where(name: 'Latvia', iso: 'LV').first_or_create! Country.where(name: 'Latvia', iso: 'LV').first_or_create!
zone = Registrar.where( zone = Registrar.where(
name: 'Zone Media OÜ', name: 'Zonedata AS',
reg_no: '10577829', reg_no: '10300220',
address: 'Lõõtsa 2, Tallinna linn, Harju maakond, 11415', address: 'Pärnu mnt 2, Tallinna linn, Harju maakond, 11415',
country: Country.first country: Country.first
).first_or_create ).first_or_create
@ -24,9 +24,9 @@ EppUser.where(
).first_or_create ).first_or_create
elkdata = Registrar.where( elkdata = Registrar.where(
name: 'Elkdata OÜ', name: 'Elkservers OÜ',
reg_no: '10510593', reg_no: '10529229',
address: 'Tondi 51-10, 11316 Tallinn', address: 'Vabaduse pst 32, 11316 Tallinn',
country: Country.first country: Country.first
).first_or_create ).first_or_create
@ -40,7 +40,7 @@ EppUser.where(
User.where( User.where(
username: 'gitlab', username: 'gitlab',
password: '12345', password: '12345',
email: 'enquiries@gitlab.eu', email: 'info@gitlab.eu',
admin: true, admin: true,
identity_code: '37810013855', identity_code: '37810013855',
country: Country.where(name: 'Estonia').first country: Country.where(name: 'Estonia').first
@ -49,7 +49,7 @@ User.where(
User.where( User.where(
username: 'zone', username: 'zone',
password: '54321', password: '54321',
email: 'info-info@zone.ee', email: 'zone-info@example.ee',
admin: false, admin: false,
identity_code: '37810010085', identity_code: '37810010085',
registrar_id: zone.id, registrar_id: zone.id,
@ -59,7 +59,7 @@ User.where(
User.where( User.where(
username: 'elkdata', username: 'elkdata',
password: '32154', password: '32154',
email: 'info-info@elkdata.ee', email: 'elk-info@example.ee',
admin: false, admin: false,
identity_code: '37810010727', identity_code: '37810010727',
registrar_id: elkdata.id, registrar_id: elkdata.id,

2
spec/models/domain_spec.rb
View file

@ -14,7 +14,7 @@ describe Domain do
create_settings create_settings
end end
it 'validates domain name' do it 'validates domain name', skip: true do
d = Fabricate(:domain) d = Fabricate(:domain)
expect(d.name).to_not be_nil expect(d.name).to_not be_nil