Merge branch 'rspec' into registry-515

This commit is contained in:
Artur Beljajev 2017-05-14 19:37:59 +03:00
commit 2d3e2f70fb
2 changed files with 2 additions and 2 deletions

View file

@ -130,6 +130,7 @@ end
group :development, :test do
gem 'capybara'
gem 'rspec-rails', '~> 3.5'
gem 'factory_girl_rails'
gem 'fabrication', '2.13.2' # Replacement for fixtures
gem 'phantomjs-binaries'
gem 'phantomjs'
@ -158,7 +159,6 @@ end
group :test do
gem 'database_cleaner'
gem 'factory_girl_rails'
gem 'codeclimate-test-reporter', "~> 1.0.0"
gem 'simplecov'
gem 'webmock'

View file

@ -1,7 +1,7 @@
FactoryGirl.define do
factory :admin_user do
username 'test'
email 'test@test.com'
sequence(:email) { |n| "test#{n}@test.com" }
password 'a' * AdminUser.min_password_length
password_confirmation { password }
country_code 'de'