diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..cb50681 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.0.0-p247 diff --git a/Gemfile b/Gemfile index c6ff0c2..c29b170 100644 --- a/Gemfile +++ b/Gemfile @@ -38,6 +38,8 @@ gem 'dalli', '~> 2.6.2' gem 'json', '~> 1.8.0' gem 'active_scaffold', '~> 3.3.4.rc', github: 'activescaffold/active_scaffold' gem 'turbolinks', '~> 1.3.0' +gem 'faker','~> 1.2.0' +gem 'factory_girl_rails', '~> 4.2.1' # gem 'rails_admin', '~> 0.5.0' # gem 'jquery-cookie-rails', '~> 1.3.1' # gem 'foreigner', '~> 1.4.2 @@ -61,8 +63,6 @@ end group :test, :development do gem 'rspec-rails', '~> 2.14.0' - gem 'faker','~> 1.2.0' - gem 'factory_girl_rails', '~> 4.2.1' # gem 'sourcify', '~> 0.6.0.rc1' end diff --git a/db/seeds/development/domains.seeds.rb b/db/seeds/development/domains.seeds.rb index c7afc5c..c318ccc 100644 --- a/db/seeds/development/domains.seeds.rb +++ b/db/seeds/development/domains.seeds.rb @@ -3,14 +3,14 @@ after 'development:users' do entrydns_org = Domain.find_by_name(Settings.host_domains.first) User.all.each do |user| 20.times do - domain = Factory.build(:domain, :user => user) + domain = FactoryGirl.build(:domain, :user => user) domain.setup(FactoryGirl.generate(:email)) domain.save! domain.soa_record.update_serial! end 20.times do - Factory.create(:a, :user => user, :domain => entrydns_org) + FactoryGirl.create(:a, :user => user, :domain => entrydns_org) end end