Merge branch 'rspec' into registry-515

Gemfile

@@ -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'

spec/factories/admin_user.rb

@@ -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'