ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix spec

rebase/4.0.0rc2
Eugen Rochko 2017-04-05 03:31:26 +02:00
parent 4c92f15664
commit 667ffafef8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/en.yml
View File

@ -5,8 +5,8 @@ en:
about_this: About this instance about_this: About this instance
apps: Apps apps: Apps
business_email: 'Business e-mail:' business_email: 'Business e-mail:'
contact: Contact
closed_registrations: Registrations are currently closed on this instance. closed_registrations: Registrations are currently closed on this instance.
contact: Contact
description_headline: What is %{domain}? description_headline: What is %{domain}?
domain_count_after: other instances domain_count_after: other instances
domain_count_before: Connected to domain_count_before: Connected to

5
spec/models/user_spec.rb
View File

@ -45,8 +45,9 @@ RSpec.describe User, type: :model do
expect(User.confirmed).to match_array([user_2]) expect(User.confirmed).to match_array([user_2])
end end
end end
end
let(:account) { Fabricate(:account, username: 'alice') } let(:account) { Fabricate(:account, username: 'alice') }
let(:password) { 'abcd1234' } let(:password) { 'abcd1234' }
describe 'blacklist' do describe 'blacklist' do
@ -55,7 +56,7 @@ RSpec.describe User, type: :model do
expect(user.valid?).to be_truthy expect(user.valid?).to be_truthy
end end
it 'should not allow a blacklisted user to be created' do it 'should not allow a blacklisted user to be created' do
user = User.new(email: 'foo@mvrht.com', account: account, password: password) user = User.new(email: 'foo@mvrht.com', account: account, password: password)