4 files changed, 131 insertions, 1 deletions
diff --git a/spec/controllers/settings/migrations_controller_spec.rb b/spec/controllers/settings/migrations_controller_spec.rb
new file mode 100644
index 000000000..a621bcf1c
--- /dev/null
+++ b/spec/controllers/settings/migrations_controller_spec.rb
@@ -0,0 +1,79 @@
+require 'rails_helper'
+
+describe Settings::MigrationsController do
+  render_views
+
+  shared_examples 'authenticate user' do
+    it 'redirects to sign_in page' do
+      is_expected.to redirect_to new_user_session_path
+    end
+  end
+
+  describe 'GET #show' do
+
+    context 'when user is not sign in' do
+      subject { get :show }
+
+      it_behaves_like 'authenticate user'
+    end
+
+    context 'when user is sign in' do
+      subject { get :show }
+
+      let(:user) { Fabricate(:user, account: account) }
+      let(:account) { Fabricate(:account, moved_to_account: moved_to_account) }
+      before { sign_in user, scope: :user }
+
+      context 'when user does not have moved to account' do
+        let(:moved_to_account) { nil }
+
+        it 'renders show page' do
+          is_expected.to have_http_status 200
+          is_expected.to render_template :show
+        end
+      end
+
+      context 'when user does not have moved to account' do
+        let(:moved_to_account) { Fabricate(:account) }
+
+        it 'renders show page' do
+          is_expected.to have_http_status 200
+          is_expected.to render_template :show
+        end
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+
+    context 'when user is not sign in' do
+      subject { put :update }
+
+      it_behaves_like 'authenticate user'
+    end
+
+    context 'when user is sign in' do
+      subject { put :update, params: { migration: { acct: acct } } }
+
+      let(:user) { Fabricate(:user) }
+      before { sign_in user, scope: :user }
+
+      context 'when migration account is changed' do
+        let(:acct) { Fabricate(:account) }
+
+        it 'updates moved to account' do
+          is_expected.to redirect_to settings_migration_path
+          expect(user.account.reload.moved_to_account_id).to eq acct.id
+        end
+      end
+
+      context 'when acct is a current account' do
+        let(:acct) { user.account }
+
+        it 'renders show' do
+          is_expected.to render_template :show
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index a88b11482..512b6e661 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -525,6 +525,37 @@ RSpec.describe Account, type: :model do
     end
   end
 
+  describe '#statuses_count' do
+    subject { Fabricate(:account) }
+
+    it 'counts statuses' do
+      Fabricate(:status, account: subject)
+      Fabricate(:status, account: subject)
+      expect(subject.statuses_count).to eq 2
+    end
+
+    it 'does not count direct statuses' do
+      Fabricate(:status, account: subject, visibility: :direct)
+      expect(subject.statuses_count).to eq 0
+    end
+
+    it 'is decremented when status is removed' do
+      status = Fabricate(:status, account: subject)
+      expect(subject.statuses_count).to eq 1
+      status.destroy
+      expect(subject.statuses_count).to eq 0
+    end
+
+    it 'is decremented when status is removed when account is not preloaded' do
+      status = Fabricate(:status, account: subject)
+      expect(subject.reload.statuses_count).to eq 1
+      clean_status = Status.find(status.id)
+      expect(clean_status.association(:account).loaded?).to be false
+      clean_status.destroy
+      expect(subject.reload.statuses_count).to eq 0
+    end
+  end
+
   describe '.following_map' do
     it 'returns an hash' do
       expect(Account.following_map([], 1)).to be_a Hash
diff --git a/spec/models/glitch/keyword_mute_spec.rb b/spec/models/glitch/keyword_mute_spec.rb
index 79225e3b9..443832ac7 100644
--- a/spec/models/glitch/keyword_mute_spec.rb
+++ b/spec/models/glitch/keyword_mute_spec.rb
@@ -79,12 +79,18 @@ RSpec.describe Glitch::KeywordMute, type: :model do
         expect(matcher.matches?('(hot take)')).to be_truthy
       end
 
-      it 'escapes metacharacters in keywords' do
+      it 'escapes metacharacters in whole-word keywords' do
         Glitch::KeywordMute.create!(account: alice, keyword: '(hot take)')
 
         expect(matcher.matches?('(hot take)')).to be_truthy
       end
 
+      it 'escapes metacharacters in non-whole-word keywords' do
+        Glitch::KeywordMute.create!(account: alice, keyword: '(-', whole_word: false)
+
+        expect(matcher.matches?('bad (-)')).to be_truthy
+      end
+
       it 'uses case-folding rules appropriate for more than just English' do
         Glitch::KeywordMute.create!(account: alice, keyword: 'großeltern')
 
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 03d1a94de..14233e824 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -175,6 +175,13 @@ RSpec.describe Status, type: :model do
 
       expect(subject.reblogs_count).to eq 2
     end
+
+    it 'is decremented when reblog is removed' do
+      reblog = Fabricate(:status, account: bob, reblog: subject)
+      expect(subject.reblogs_count).to eq 1
+      reblog.destroy
+      expect(subject.reblogs_count).to eq 0
+    end
   end
 
   describe '#favourites_count' do
@@ -184,6 +191,13 @@ RSpec.describe Status, type: :model do
 
       expect(subject.favourites_count).to eq 2
     end
+
+    it 'is decremented when favourite is removed' do
+      favourite = Fabricate(:favourite, account: bob, status: subject)
+      expect(subject.favourites_count).to eq 1
+      favourite.destroy
+      expect(subject.favourites_count).to eq 0
+    end
   end
 
   describe '#proper' do