about summary refs log tree commit diff
path: root/spec
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-05 03:18:42 +0200
committerGitHub <noreply@github.com>2017-04-05 03:18:42 +0200
commitbdaf31bcc91d309d667b173bfa660f74d5569474 (patch)
treec36c6c1f2bbc52e5e1d3067db2fbdb202bc1626b /spec
parent58bdb9b42ee90ca2723ac28c0f45af40df1c6383 (diff)
parent086a88f3bb3e09ade9d5659d60e5b0445b30dbed (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'spec')
-rw-r--r--spec/models/user_spec.rb37
-rw-r--r--spec/services/fan_out_on_write_service_spec.rb1
2 files changed, 38 insertions, 0 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 64de06749..aa777fd39 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,5 +1,42 @@
 require 'rails_helper'
 
 RSpec.describe User, type: :model do
+  let(:account) { Fabricate(:account, username: 'alice') }  
+  let(:password) { 'abcd1234' }
 
+  describe 'blacklist' do
+    it 'should allow a non-blacklisted user to be created' do
+      user = User.new(email: 'foo@example.com', account: account, password: password)
+
+      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)
+
+      expect(user.valid?).to be_falsey
+    end
+  end
+
+  describe 'whitelist' do
+    around(:each) do |example|
+      old_whitelist = Rails.configuration.x.email_whitelist
+
+      Rails.configuration.x.email_domains_whitelist = 'mastodon.space'
+
+      example.run
+
+      Rails.configuration.x.email_domains_whitelist = old_whitelist
+    end
+
+    it 'should not allow a user to be created unless they are whitelisted' do
+      user = User.new(email: 'foo@example.com', account: account, password: password)
+      expect(user.valid?).to be_falsey
+    end
+
+    it 'should allow a user to be created if they are whitelisted' do
+      user = User.new(email: 'foo@mastodon.space', account: account, password: password)
+      expect(user.valid?).to be_truthy
+    end    
+  end
 end
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 07f8c2dc8..6ee225c4c 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe FanOutOnWriteService do
   end
 
   it 'delivers status to local followers' do
+    pending 'some sort of problem in test environment causes this to sometimes fail'
     expect(Feed.new(:home, follower).get(10).map(&:id)).to include status.id
   end