diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-05 03:31:26 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-05 03:31:26 +0200 |
commit | 667ffafef8c8b7956cdd31b8f65d5e82778211d8 (patch) | |
tree | 7b846b51e3c91fb93aa379361dfe7a811bf5a01c | |
parent | 4c92f156645f62bd6170df1ce966374574e44ef1 (diff) |
Fix spec
-rw-r--r-- | config/locales/en.yml | 2 | ||||
-rw-r--r-- | spec/models/user_spec.rb | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 750af0b7a..742219df9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5,8 +5,8 @@ en: about_this: About this instance apps: Apps business_email: 'Business e-mail:' - contact: Contact closed_registrations: Registrations are currently closed on this instance. + contact: Contact description_headline: What is %{domain}? domain_count_after: other instances domain_count_before: Connected to diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 5575ba107..eb2a4aaea 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -45,8 +45,9 @@ RSpec.describe User, type: :model do expect(User.confirmed).to match_array([user_2]) end end + end - let(:account) { Fabricate(:account, username: 'alice') } + let(:account) { Fabricate(:account, username: 'alice') } let(:password) { 'abcd1234' } describe 'blacklist' do @@ -55,7 +56,7 @@ RSpec.describe User, type: :model do expect(user.valid?).to be_truthy end - + it 'should not allow a blacklisted user to be created' do user = User.new(email: 'foo@mvrht.com', account: account, password: password) |