diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:40:00 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:40:00 -0600 |
commit | 1ab12ba38ebd42be93b63b7cf0d3c6a81060b741 (patch) | |
tree | 3899389c63c16e33dd48fadb270d3259a7c15b67 /spec/models | |
parent | 6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25 (diff) | |
parent | 24cafd73a2b644025e9aeaadf4fed46dd3ecea4d (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/account_moderation_note_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/home_feed_spec.rb (renamed from spec/models/feed_spec.rb) | 4 | ||||
-rw-r--r-- | spec/models/list_account_spec.rb | 5 | ||||
-rw-r--r-- | spec/models/list_spec.rb | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/spec/models/account_moderation_note_spec.rb b/spec/models/account_moderation_note_spec.rb index c4be8c4af..16983b2e3 100644 --- a/spec/models/account_moderation_note_spec.rb +++ b/spec/models/account_moderation_note_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' RSpec.describe AccountModerationNote, type: :model do - pending "add some examples to (or delete) #{__FILE__}" + end diff --git a/spec/models/feed_spec.rb b/spec/models/home_feed_spec.rb index 8719369db..3acb997f1 100644 --- a/spec/models/feed_spec.rb +++ b/spec/models/home_feed_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' -RSpec.describe Feed, type: :model do +RSpec.describe HomeFeed, type: :model do let(:account) { Fabricate(:account) } - subject { described_class.new(:home, account) } + subject { described_class.new(account) } describe '#get' do before do diff --git a/spec/models/list_account_spec.rb b/spec/models/list_account_spec.rb new file mode 100644 index 000000000..a132e09b0 --- /dev/null +++ b/spec/models/list_account_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ListAccount, type: :model do + +end diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb new file mode 100644 index 000000000..c302482b4 --- /dev/null +++ b/spec/models/list_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe List, type: :model do + +end |