From 880886bbadde1da465a8c8298f939ed7d9ab0a63 Mon Sep 17 00:00:00 2001 From: realtin Date: Tue, 14 Jul 2015 17:08:54 +0200 Subject: [PATCH] refactor test to use let instead of instance variables --- spec/models/conversation_visibilities_spec.rb | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/spec/models/conversation_visibilities_spec.rb b/spec/models/conversation_visibilities_spec.rb index da15b8743..a8a0e2708 100644 --- a/spec/models/conversation_visibilities_spec.rb +++ b/spec/models/conversation_visibilities_spec.rb @@ -4,25 +4,22 @@ require 'spec_helper' -describe ConversationVisibility, :type => :model do - before do - @user1 = alice - @participant_ids = [@user1.contacts.first.person.id, @user1.person.id] - - @create_hash = { - :author => @user1.person, - :participant_ids => @participant_ids, - :subject => "cool stuff", - :messages_attributes => [ {:author => @user1.person, :text => 'hey'} ] +describe ConversationVisibility, type: :model do + let(:user1) { alice } + let(:participant_ids) { [user1.contacts.first.person.id, user1.person.id] } + let(:create_hash) do + { + author: user1.person, + participant_ids: participant_ids, + subject: 'cool stuff', + messages_attributes: [{ author: user1.person, text: 'hey' }] } - @conversation = Conversation.create(@create_hash) end + let(:conversation) { Conversation.create(create_hash) } it 'destroy conversation when no participant' do - @conversation.conversation_visibilities.each do |visibility| - visibility.destroy - end - - expect(Conversation).not_to exist(@conversation.id) + conversation.conversation_visibilities.each(&:destroy) + + expect(Conversation).not_to exist(conversation.id) end end