Fix specs style

spec/models/account_spec.rb

@@ -204,16 +204,19 @@ RSpec.describe Account do
 
     context 'for usual account' do
       subject { create :usual_account }
+
       specify { expect(result).to equal true }
     end
 
     context 'for personal account' do
       subject { create :personal_account }
+
       specify { expect(result).to equal true }
     end
 
     context 'for superuser account' do
       subject { create :superuser_account }
+
       specify { expect(result).to equal false }
     end
   end

spec/models/person_spec.rb

@@ -101,6 +101,24 @@ RSpec.describe Person do
   end
 
   describe '#current_relationship' do
+    before do
+      create :supporter_relationship,
+             person: subject,
+             from_date: 4.days.ago
+    end
+
+    let! :expected_relationship do
+      create :supporter_relationship,
+             person: subject,
+             from_date: 2.days.ago
+    end
+
+    before do
+      create :supporter_relationship,
+             person: subject,
+             from_date: 6.days.ago
+    end
+
     it do
       is_expected.to \
         have_one(:current_relationship)
@@ -110,26 +128,8 @@ RSpec.describe Person do
         .order(from_date: :desc)
     end
 
-    let! :relationship_2 do
-      create :supporter_relationship,
-             person: subject,
-             from_date: 4.days.ago
-    end
-
-    let! :relationship_3 do
-      create :supporter_relationship,
-             person: subject,
-             from_date: 2.days.ago
-    end
-
-    let! :relationship_1 do
-      create :supporter_relationship,
-             person: subject,
-             from_date: 6.days.ago
-    end
-
     specify do
-      expect(subject.current_relationship).to eq relationship_3
+      expect(subject.current_relationship).to eq expected_relationship
     end
   end
 

spec/models/session_spec.rb

@@ -38,20 +38,27 @@ RSpec.describe Session do
 
     context 'when it was set to nil' do
       subject { build :some_session, user_agent: nil }
+
       before { subject.validate }
+
       specify { expect(subject.user_agent).to eq nil }
     end
 
     context 'when it was set to blank' do
       subject { build :some_session, user_agent: ' ' * rand(1..3) }
+
       before { subject.validate }
+
       specify { expect(subject.user_agent).to eq nil }
     end
 
     context 'when it has leading spaces' do
       subject { build :some_session, user_agent: user_agent }
+
       let(:user_agent) { "   #{Faker::Internet.user_agent}" }
+
       before { subject.validate }
+
       specify { expect(subject.user_agent).to eq user_agent.strip }
     end
   end

spec/requests/settings/contacts/destroy_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe 'DELETE /settings/contacts/:id' do
   end
 
   context 'when contact does not belong to current account' do
-    let!(:contact) { create :some_contact }
+    let(:contact) { create :some_contact }
 
     before { make_request }
 

spec/requests/staff/sidekiq/show_spec.rb

@@ -3,15 +3,16 @@
 require 'rails_helper'
 
 RSpec.describe 'GET /staff/sidekiq' do
+  let!(:valid_new_user_session_url) { new_user_session_url }
+
   before do
-    @new_user_session_url = new_user_session_url
     sign_in current_account.user if current_account&.user
     get '/staff/sidekiq'
   end
 
   for_account_types nil do
     specify do
-      expect(response).to redirect_to @new_user_session_url
+      expect(response).to redirect_to valid_new_user_session_url
     end
   end
 

spec/requests/users/destroy_spec.rb

@@ -11,11 +11,13 @@ RSpec.describe 'DELETE /users' do
     sign_in current_account.user if current_account&.user
   end
 
-  for_account_types nil do
+  for_account_types nil, :usual, :superuser do
     specify do
       expect { make_request }.not_to change(User, :count)
     end
+  end
 
+  for_account_types nil do
     context 'after request' do
       before { make_request }
 
@@ -26,10 +28,6 @@ RSpec.describe 'DELETE /users' do
   end
 
   for_account_types :usual, :superuser do
-    specify do
-      expect { make_request }.not_to change(User, :count)
-    end
-
     context 'after request' do
       before { make_request }