mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-26 22:36:21 +01:00
Merge branch 'fakenine-add_more_tests_to_models'
This commit is contained in:
commit
ccb6a658fd
3
Gemfile
3
Gemfile
@ -67,9 +67,10 @@ group :development, :test do
|
||||
end
|
||||
|
||||
group :test do
|
||||
gem 'faker'
|
||||
gem 'rspec-sidekiq'
|
||||
gem 'simplecov', require: false
|
||||
gem 'webmock'
|
||||
gem 'rspec-sidekiq'
|
||||
end
|
||||
|
||||
group :development do
|
||||
|
@ -149,6 +149,8 @@ GEM
|
||||
erubis (2.7.0)
|
||||
execjs (2.7.0)
|
||||
fabrication (2.15.2)
|
||||
faker (1.6.6)
|
||||
i18n (~> 0.5)
|
||||
fast_blank (1.0.0)
|
||||
font-awesome-rails (4.6.3.1)
|
||||
railties (>= 3.2, < 5.1)
|
||||
@ -470,6 +472,7 @@ DEPENDENCIES
|
||||
doorkeeper
|
||||
dotenv-rails
|
||||
fabrication
|
||||
faker
|
||||
fast_blank
|
||||
font-awesome-rails
|
||||
fuubar
|
||||
|
@ -3,9 +3,8 @@
|
||||
class Block < ApplicationRecord
|
||||
include Paginable
|
||||
|
||||
belongs_to :account
|
||||
belongs_to :target_account, class_name: 'Account'
|
||||
belongs_to :account, required: true
|
||||
belongs_to :target_account, class_name: 'Account', required: true
|
||||
|
||||
validates :account, :target_account, presence: true
|
||||
validates :account_id, uniqueness: { scope: :target_account_id }
|
||||
end
|
||||
|
@ -3,11 +3,14 @@
|
||||
class Follow < ApplicationRecord
|
||||
include Paginable
|
||||
|
||||
belongs_to :account, counter_cache: :following_count
|
||||
belongs_to :target_account, class_name: 'Account', counter_cache: :followers_count
|
||||
belongs_to :account, counter_cache: :following_count, required: true
|
||||
|
||||
belongs_to :target_account,
|
||||
class_name: 'Account',
|
||||
counter_cache: :followers_count,
|
||||
required: true
|
||||
|
||||
has_one :notification, as: :activity, dependent: :destroy
|
||||
|
||||
validates :account, :target_account, presence: true
|
||||
validates :account_id, uniqueness: { scope: :target_account_id }
|
||||
end
|
||||
|
@ -3,12 +3,11 @@
|
||||
class FollowRequest < ApplicationRecord
|
||||
include Paginable
|
||||
|
||||
belongs_to :account
|
||||
belongs_to :target_account, class_name: 'Account'
|
||||
belongs_to :account, required: true
|
||||
belongs_to :target_account, class_name: 'Account', required: true
|
||||
|
||||
has_one :notification, as: :activity, dependent: :destroy
|
||||
|
||||
validates :account, :target_account, presence: true
|
||||
validates :account_id, uniqueness: { scope: :target_account_id }
|
||||
|
||||
def authorize!
|
||||
|
@ -1,11 +1,10 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Mention < ApplicationRecord
|
||||
belongs_to :account, inverse_of: :mentions
|
||||
belongs_to :status
|
||||
belongs_to :account, inverse_of: :mentions, required: true
|
||||
belongs_to :status, required: true
|
||||
|
||||
has_one :notification, as: :activity, dependent: :destroy
|
||||
|
||||
validates :account, :status, presence: true
|
||||
validates :account, uniqueness: { scope: :status }
|
||||
end
|
||||
|
@ -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
|
||||
|
@ -1,3 +1,3 @@
|
||||
Fabricator(:account) do
|
||||
username "alice"
|
||||
username { Faker::Internet.user_name(nil, %w(_)) }
|
||||
end
|
||||
|
@ -1,3 +1,4 @@
|
||||
Fabricator(:block) do
|
||||
|
||||
account
|
||||
target_account { Fabricate(:account) }
|
||||
end
|
||||
|
@ -1,3 +1,4 @@
|
||||
Fabricator(:follow) do
|
||||
|
||||
account
|
||||
target_account { Fabricate(:account) }
|
||||
end
|
||||
|
@ -1,3 +1,4 @@
|
||||
Fabricator(:follow_request) do
|
||||
|
||||
account
|
||||
target_account { Fabricate(:account) }
|
||||
end
|
||||
|
4
spec/fabricators/mention_fabricator.rb
Normal file
4
spec/fabricators/mention_fabricator.rb
Normal file
@ -0,0 +1,4 @@
|
||||
Fabricator(:mention) do
|
||||
account
|
||||
status
|
||||
end
|
@ -1,6 +1,6 @@
|
||||
Fabricator(:user) do
|
||||
account
|
||||
email "alice@example.com"
|
||||
email { Faker::Internet.email }
|
||||
password "123456789"
|
||||
confirmed_at { Time.now }
|
||||
end
|
||||
|
@ -209,4 +209,73 @@ RSpec.describe Account, type: :model do
|
||||
expect(subject.match('Check this out https://medium.com/@alice/some-article#.abcdef123')).to be_nil
|
||||
end
|
||||
end
|
||||
|
||||
describe 'validations' do
|
||||
it 'has a valid fabricator' do
|
||||
account = Fabricate.build(:account)
|
||||
account.valid?
|
||||
expect(account).to be_valid
|
||||
end
|
||||
|
||||
it 'is invalid without a username' do
|
||||
account = Fabricate.build(:account, username: nil)
|
||||
account.valid?
|
||||
expect(account).to model_have_error_on_field(:username)
|
||||
end
|
||||
|
||||
it 'is invalid if the username already exists' do
|
||||
account_1 = Fabricate(:account, username: 'the_doctor')
|
||||
account_2 = Fabricate.build(:account, username: 'the_doctor')
|
||||
account_2.valid?
|
||||
expect(account_2).to model_have_error_on_field(:username)
|
||||
end
|
||||
|
||||
context 'when is local' do
|
||||
it 'is invalid if the username doesn\'t only contains letters, numbers and underscores' do
|
||||
account = Fabricate.build(:account, username: 'the-doctor')
|
||||
account.valid?
|
||||
expect(account).to model_have_error_on_field(:username)
|
||||
end
|
||||
|
||||
it 'is invalid if the username is longer then 30 characters' do
|
||||
account = Fabricate.build(:account, username: Faker::Lorem.characters(31))
|
||||
account.valid?
|
||||
expect(account).to model_have_error_on_field(:username)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'scopes' do
|
||||
describe 'remote' do
|
||||
it 'returns an array of accounts who have a domain' do
|
||||
account_1 = Fabricate(:account, domain: nil)
|
||||
account_2 = Fabricate(:account, domain: 'example.com')
|
||||
expect(Account.remote).to match_array([account_2])
|
||||
end
|
||||
end
|
||||
|
||||
describe 'local' do
|
||||
it 'returns an array of accounts who do not have a domain' do
|
||||
account_1 = Fabricate(:account, domain: nil)
|
||||
account_2 = Fabricate(:account, domain: 'example.com')
|
||||
expect(Account.local).to match_array([account_1])
|
||||
end
|
||||
end
|
||||
|
||||
describe 'silenced' do
|
||||
it 'returns an array of accounts who are silenced' do
|
||||
account_1 = Fabricate(:account, silenced: true)
|
||||
account_2 = Fabricate(:account, silenced: false)
|
||||
expect(Account.silenced).to match_array([account_1])
|
||||
end
|
||||
end
|
||||
|
||||
describe 'suspended' do
|
||||
it 'returns an array of accounts who are suspended' do
|
||||
account_1 = Fabricate(:account, suspended: true)
|
||||
account_2 = Fabricate(:account, suspended: false)
|
||||
expect(Account.suspended).to match_array([account_1])
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,5 +1,22 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Block, type: :model do
|
||||
describe 'validations' do
|
||||
it 'has a valid fabricator' do
|
||||
block = Fabricate.build(:block)
|
||||
expect(block).to be_valid
|
||||
end
|
||||
|
||||
it 'is invalid without an account' do
|
||||
block = Fabricate.build(:block, account: nil)
|
||||
block.valid?
|
||||
expect(block).to model_have_error_on_field(:account)
|
||||
end
|
||||
|
||||
it 'is invalid without a target_account' do
|
||||
block = Fabricate.build(:block, target_account: nil)
|
||||
block.valid?
|
||||
expect(block).to model_have_error_on_field(:target_account)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,5 +1,23 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe DomainBlock, type: :model do
|
||||
describe 'validations' do
|
||||
it 'has a valid fabricator' do
|
||||
domain_block = Fabricate.build(:domain_block)
|
||||
expect(domain_block).to be_valid
|
||||
end
|
||||
|
||||
it 'is invalid without a domain' do
|
||||
domain_block = Fabricate.build(:domain_block, domain: nil)
|
||||
domain_block.valid?
|
||||
expect(domain_block).to model_have_error_on_field(:domain)
|
||||
end
|
||||
|
||||
it 'is invalid if the domain already exists' do
|
||||
domain_block_1 = Fabricate(:domain_block, domain: 'dalek.com')
|
||||
domain_block_2 = Fabricate.build(:domain_block, domain: 'dalek.com')
|
||||
domain_block_2.valid?
|
||||
expect(domain_block_2).to model_have_error_on_field(:domain)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -3,4 +3,23 @@ require 'rails_helper'
|
||||
RSpec.describe FollowRequest, type: :model do
|
||||
describe '#authorize!'
|
||||
describe '#reject!'
|
||||
|
||||
describe 'validations' do
|
||||
it 'has a valid fabricator' do
|
||||
follow_request = Fabricate.build(:follow_request)
|
||||
expect(follow_request).to be_valid
|
||||
end
|
||||
|
||||
it 'is invalid without an account' do
|
||||
follow_request = Fabricate.build(:follow_request, account: nil)
|
||||
follow_request.valid?
|
||||
expect(follow_request).to model_have_error_on_field(:account)
|
||||
end
|
||||
|
||||
it 'is invalid without a target account' do
|
||||
follow_request = Fabricate.build(:follow_request, target_account: nil)
|
||||
follow_request.valid?
|
||||
expect(follow_request).to model_have_error_on_field(:target_account)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -5,4 +5,23 @@ RSpec.describe Follow, type: :model do
|
||||
let(:bob) { Fabricate(:account, username: 'bob') }
|
||||
|
||||
subject { Follow.new(account: alice, target_account: bob) }
|
||||
|
||||
describe 'validations' do
|
||||
it 'has a valid fabricator' do
|
||||
follow = Fabricate.build(:follow)
|
||||
expect(follow).to be_valid
|
||||
end
|
||||
|
||||
it 'is invalid without an account' do
|
||||
follow = Fabricate.build(:follow, account: nil)
|
||||
follow.valid?
|
||||
expect(follow).to model_have_error_on_field(:account)
|
||||
end
|
||||
|
||||
it 'is invalid without a target_account' do
|
||||
follow = Fabricate.build(:follow, target_account: nil)
|
||||
follow.valid?
|
||||
expect(follow).to model_have_error_on_field(:target_account)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,5 +1,22 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Mention, type: :model do
|
||||
describe 'validations' do
|
||||
it 'has a valid fabricator' do
|
||||
mention = Fabricate.build(:mention)
|
||||
expect(mention).to be_valid
|
||||
end
|
||||
|
||||
it 'is invalid without an account' do
|
||||
mention = Fabricate.build(:mention, account: nil)
|
||||
mention.valid?
|
||||
expect(mention).to model_have_error_on_field(:account)
|
||||
end
|
||||
|
||||
it 'is invalid without a status' do
|
||||
mention = Fabricate.build(:mention, status: nil)
|
||||
mention.valid?
|
||||
expect(mention).to model_have_error_on_field(:status)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,7 +1,53 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe User, type: :model do
|
||||
let(:account) { Fabricate(:account, username: 'alice') }
|
||||
describe 'validations' do
|
||||
it 'is invalid without an account' do
|
||||
user = Fabricate.build(:user, account: nil)
|
||||
user.valid?
|
||||
expect(user).to model_have_error_on_field(:account)
|
||||
end
|
||||
|
||||
it 'is invalid without a valid locale' do
|
||||
user = Fabricate.build(:user, locale: 'toto')
|
||||
user.valid?
|
||||
expect(user).to model_have_error_on_field(:locale)
|
||||
end
|
||||
|
||||
it 'is invalid without a valid email' do
|
||||
user = Fabricate.build(:user, email: 'john@')
|
||||
user.valid?
|
||||
expect(user).to model_have_error_on_field(:email)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'scopes' do
|
||||
describe 'recent' do
|
||||
it 'returns an array of recent users ordered by id' do
|
||||
user_1 = Fabricate(:user)
|
||||
user_2 = Fabricate(:user)
|
||||
expect(User.recent).to match_array([user_2, user_1])
|
||||
end
|
||||
end
|
||||
|
||||
describe 'admins' do
|
||||
it 'returns an array of users who are admin' do
|
||||
user_1 = Fabricate(:user, admin: false)
|
||||
user_2 = Fabricate(:user, admin: true)
|
||||
expect(User.admins).to match_array([user_2])
|
||||
end
|
||||
end
|
||||
|
||||
describe 'confirmed' do
|
||||
it 'returns an array of users who are confirmed' do
|
||||
user_1 = Fabricate(:user, confirmed_at: nil)
|
||||
user_2 = Fabricate(:user, confirmed_at: Time.now)
|
||||
expect(User.confirmed).to match_array([user_2])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
let(:account) { Fabricate(:account, username: 'alice') }
|
||||
let(:password) { 'abcd1234' }
|
||||
|
||||
describe 'blacklist' do
|
||||
@ -10,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)
|
||||
|
||||
@ -37,6 +83,6 @@ RSpec.describe User, type: :model do
|
||||
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
|
||||
end
|
||||
|
@ -8,6 +8,8 @@ require 'rspec/rails'
|
||||
require 'webmock/rspec'
|
||||
require 'paperclip/matchers'
|
||||
|
||||
Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
|
||||
|
||||
ActiveRecord::Migration.maintain_test_schema!
|
||||
WebMock.disable_net_connect!(allow: 'localhost:7575')
|
||||
Sidekiq::Testing.inline!
|
||||
|
15
spec/support/matchers/model/model_have_error_on_field.rb
Normal file
15
spec/support/matchers/model/model_have_error_on_field.rb
Normal file
@ -0,0 +1,15 @@
|
||||
RSpec::Matchers.define :model_have_error_on_field do |expected|
|
||||
match do |record|
|
||||
if record.errors.empty?
|
||||
record.valid?
|
||||
end
|
||||
|
||||
record.errors.has_key?(expected)
|
||||
end
|
||||
|
||||
failure_message do |record|
|
||||
keys = record.errors.keys
|
||||
|
||||
"expect record.errors(#{keys}) to include #{expected}"
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user