]> cat aescling's git repositories - mastodon.git/commitdiff
Fix spec
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 5 Apr 2017 01:31:26 +0000 (03:31 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 5 Apr 2017 01:31:26 +0000 (03:31 +0200)
config/locales/en.yml
spec/models/user_spec.rb

index 750af0b7a2c20d45a9e16d6a6e91eb8007f845b7..742219df99f7d84056f935621a33b2db49b9f5c6 100644 (file)
@@ -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
index 5575ba107b8435b36b728ec7abc83e09a5d95041..eb2a4aaeaf82a5c1d9885e069e1014392c1c45a4 100644 (file)
@@ -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)